Skip to content

Commit cde2fcf

Browse files
author
Alexander Furer
committed
fixes #224 + make errorprone happy
1 parent 5c51ff4 commit cde2fcf

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/NotSpringBeanInterceptor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import io.grpc.ServerCall;
55
import io.grpc.ServerCallHandler;
66
import io.grpc.ServerInterceptor;
7-
import lombok.extern.slf4j.Slf4j;
87

9-
@Slf4j
108
public class NotSpringBeanInterceptor implements ServerInterceptor {
119

1210
@Override

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/SecuredGreeterService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.grpc.examples.GreeterOuterClass;
55
import io.grpc.examples.SecuredGreeterGrpc;
66
import io.grpc.stub.StreamObserver;
7-
import lombok.extern.slf4j.Slf4j;
87
import org.lognet.springboot.grpc.GRpcService;
98
import org.lognet.springboot.grpc.security.GrpcSecurity;
109
import org.springframework.security.access.annotation.Secured;
@@ -13,7 +12,7 @@
1312

1413
import java.util.Optional;
1514

16-
@Slf4j
15+
1716
@GRpcService(interceptors = { LogInterceptor.class })
1817
@Secured("SCOPE_profile")
1918
public class SecuredGreeterService extends SecuredGreeterGrpc.SecuredGreeterImplBase{

grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ java.util.Optional.ofNullable(grpcSpringBoot.getGrpcSpringBootStarterVersion().g
77
}
88
}
99

10+
def grpcDeps = ["grpc-netty-shaded","grpc-netty","grpc-services"]
1011

1112
configurations.all {
1213
resolutionStrategy.eachDependency { details ->
13-
if ("io.grpc".equalsIgnoreCase(details.requested.group)) {
14-
details.useVersion grpcSpringBoot.grpcVersion.get()
14+
if ("io.grpc".equalsIgnoreCase(details.requested.group) &&
15+
grpcDeps.contains(details.requested.name.toLowerCase())) {
16+
details.useVersion grpcSpringBoot.grpcVersion.get()
1517
}
1618
}
19+
1720
}
1821

1922

@@ -42,7 +45,7 @@ protobuf {
4245
all().each { task ->
4346
task.builtins {
4447
java {
45-
48+
option "annotate_code"
4649
}
4750
}
4851
task.plugins {

0 commit comments

Comments
 (0)