Skip to content

Commit a492780

Browse files
author
Alexander Furer
committed
fixes #108
1 parent e70228d commit a492780

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/GrpcServerTestBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import io.grpc.examples.GreeterGrpc;
77
import io.grpc.examples.GreeterOuterClass;
88
import io.grpc.inprocess.InProcessChannelBuilder;
9-
import io.grpc.netty.GrpcSslContexts;
10-
import io.grpc.netty.NettyChannelBuilder;
9+
import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
10+
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
1111
import org.junit.After;
1212
import org.junit.Before;
1313
import org.junit.Test;

grpc-spring-boot-starter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ signing {
120120

121121

122122
dependencies {
123-
compile "io.grpc:grpc-netty:${grpcVersion}"
123+
compile "io.grpc:grpc-netty-shaded:${grpcVersion}"
124124
compile "io.grpc:grpc-services:${grpcVersion}"
125125
compile(group: 'org.springframework.boot', name: 'spring-boot-starter')
126126
compile 'io.netty:netty-tcnative-boringssl-static:2.0.25.Final'

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/GRpcAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public GRpcServerRunner grpcServerRunner(@Qualifier("grpcInternalConfigurator")
4444
@Bean
4545
@ConditionalOnExpression("#{environment.getProperty('grpc.inProcessServerName','')!=''}")
4646
public GRpcServerRunner grpcInprocessServerRunner(@Qualifier("grpcInternalConfigurator") Consumer<ServerBuilder<?>> configurator){
47+
4748
return new GRpcServerRunner(configurator, InProcessServerBuilder.forName(grpcServerProperties.getInProcessServerName()));
4849
}
4950

0 commit comments

Comments
 (0)