Skip to content

Commit fbaaeec

Browse files
onobconobc
committed
Add back in grpc-secure and grpc-reactive samples.
Signed-off-by: onobc <chris.bono@gmail.com>
1 parent 25e2faa commit fbaaeec

File tree

16 files changed

+109
-95
lines changed

16 files changed

+109
-95
lines changed

‎samples/grpc-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</scm>
3030
<properties>
3131
<java.version>17</java.version>
32-
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
32+
<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
3333
<protobuf-java.version>4.32.1</protobuf-java.version>
3434
<grpc.version>1.76.0</grpc.version>
3535
<maven.version>3.9.4</maven.version>

‎samples/grpc-reactive/build.gradle‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
plugins {
2-
id 'java'
3-
id 'org.springframework.boot' version '3.5.5'
4-
id 'io.spring.dependency-management' version '1.1.6'
5-
id 'org.graalvm.buildtools.native' version '0.10.3'
6-
id 'com.google.protobuf' version '0.9.4'
2+
id 'java'
3+
id 'org.springframework.boot' version '4.0.0-RC1'
4+
id 'io.spring.dependency-management' version '1.1.7'
5+
id 'org.graalvm.buildtools.native' version '0.10.3'
6+
id 'com.google.protobuf' version '0.9.4'
77
}
88

99
group = 'com.example'
1010
version = '1.0.0-SNAPSHOT'
1111

1212
java {
13-
toolchain {
14-
languageVersion = JavaLanguageVersion.of(17)
15-
}
13+
toolchain {
14+
languageVersion = JavaLanguageVersion.of(17)
15+
}
1616
}
1717

1818
repositories {
@@ -30,13 +30,15 @@ dependencyManagement {
3030
dependencies {
3131
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
3232
implementation 'org.springframework.boot:spring-boot-starter-actuator'
33-
implementation 'io.grpc:grpc-services'
33+
implementation 'com.salesforce.servicelibs:reactor-grpc-stub:1.2.4'
34+
implementation 'io.projectreactor:reactor-core'
35+
3436
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
35-
implementation 'io.projectreactor:reactor-core'
36-
implementation 'com.salesforce.servicelibs:reactor-grpc-stub:1.2.4'
37-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
38-
testImplementation 'org.springframework.grpc:spring-grpc-test'
37+
38+
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
39+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3940
testImplementation 'io.projectreactor:reactor-test'
41+
4042
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
4143
testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64"
4244
}

‎samples/grpc-reactive/pom.xml‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.5.5</version>
9+
<version>4.0.0-SNAPSHOT</version>
1010
<relativePath /> <!-- lookup parent from repository -->
1111
</parent>
1212
<groupId>org.springframework.grpc</groupId>
@@ -30,7 +30,7 @@
3030
<properties>
3131
<java.version>17</java.version>
3232
<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
33-
<protobuf-java.version>4.31.1</protobuf-java.version>
33+
<protobuf-java.version>4.32.1</protobuf-java.version>
3434
<grpc.version>1.76.0</grpc.version>
3535
</properties>
3636
<dependencyManagement>
@@ -49,35 +49,14 @@
4949
<groupId>org.springframework.grpc</groupId>
5050
<artifactId>spring-grpc-spring-boot-starter</artifactId>
5151
</dependency>
52-
<dependency>
53-
<groupId>io.grpc</groupId>
54-
<artifactId>grpc-services</artifactId>
55-
</dependency>
5652
<dependency>
5753
<groupId>org.springframework.boot</groupId>
5854
<artifactId>spring-boot-starter-actuator</artifactId>
5955
</dependency>
60-
61-
<dependency>
62-
<!-- for testing unix domain sockets -->
63-
<groupId>io.netty</groupId>
64-
<artifactId>netty-transport-native-epoll</artifactId>
65-
<classifier>linux-x86_64</classifier>
66-
<scope>test</scope>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.grpc</groupId>
70-
<artifactId>spring-grpc-test</artifactId>
71-
<scope>test</scope>
72-
</dependency>
7356
<dependency>
7457
<groupId>io.projectreactor</groupId>
7558
<artifactId>reactor-core</artifactId>
7659
</dependency>
77-
<dependency>
78-
<groupId>io.projectreactor</groupId>
79-
<artifactId>reactor-test</artifactId>
80-
</dependency>
8160
<dependency>
8261
<groupId>com.salesforce.servicelibs</groupId>
8362
<artifactId>reactor-grpc-stub</artifactId>
@@ -89,6 +68,34 @@
8968
<version>1.3.2</version>
9069
<scope>provided</scope>
9170
</dependency>
71+
72+
<dependency>
73+
<groupId>org.springframework.grpc</groupId>
74+
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.springframework.boot</groupId>
79+
<artifactId>spring-boot-starter-test</artifactId>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>io.grpc</groupId>
84+
<artifactId>grpc-inprocess</artifactId>
85+
<scope>test</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>io.projectreactor</groupId>
89+
<artifactId>reactor-test</artifactId>
90+
<scope>test</scope>
91+
</dependency>
92+
<dependency>
93+
<!-- for testing unix domain sockets -->
94+
<groupId>io.netty</groupId>
95+
<artifactId>netty-transport-native-epoll</artifactId>
96+
<classifier>linux-x86_64</classifier>
97+
<scope>test</scope>
98+
</dependency>
9299
</dependencies>
93100

94101
<build>

‎samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.grpc.Status;
1111

1212
@SpringBootApplication
13-
public class GrpcServerApplication {
13+
class GrpcServerApplication {
1414

1515
private static Log log = LogFactory.getLog(GrpcServerApplication.class);
1616

‎samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import reactor.core.publisher.Mono;
1414

1515
@Service
16-
public class GrpcServerService extends ReactorSimpleGrpc.SimpleImplBase {
16+
class GrpcServerService extends ReactorSimpleGrpc.SimpleImplBase {
1717

1818
private static Log log = LogFactory.getLog(GrpcServerService.class);
1919

@@ -41,4 +41,4 @@ public Flux<HelloReply> streamHello(Mono<HelloRequest> request) {
4141
});
4242
}
4343

44-
}
44+
}

‎samples/grpc-reactive/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import org.junit.jupiter.api.Test;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.boot.builder.SpringApplicationBuilder;
8+
import org.springframework.boot.grpc.test.autoconfigure.AutoConfigureInProcessTransport;
89
import org.springframework.boot.test.context.SpringBootTest;
910
import org.springframework.boot.test.context.TestConfiguration;
1011
import org.springframework.grpc.client.ImportGrpcClients;
1112
import org.springframework.grpc.sample.proto.HelloReply;
1213
import org.springframework.grpc.sample.proto.HelloRequest;
1314
import org.springframework.grpc.sample.proto.ReactorSimpleGrpc;
1415
import org.springframework.grpc.sample.proto.ReactorSimpleGrpc.ReactorSimpleStub;
15-
import org.springframework.grpc.test.AutoConfigureInProcessTransport;
1616
import org.springframework.test.annotation.DirtiesContext;
1717

1818
import reactor.core.publisher.Mono;

‎samples/grpc-secure/build.gradle‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
plugins {
2-
id 'java'
3-
id 'org.springframework.boot' version '3.5.5'
4-
id 'io.spring.dependency-management' version '1.1.6'
5-
id 'org.graalvm.buildtools.native' version '0.10.3'
6-
id 'com.google.protobuf' version '0.9.4'
2+
id 'java'
3+
id 'org.springframework.boot' version '4.0.0-RC1'
4+
id 'io.spring.dependency-management' version '1.1.7'
5+
id 'org.graalvm.buildtools.native' version '0.10.3'
6+
id 'com.google.protobuf' version '0.9.4'
77
}
88

99
group = 'com.example'
1010
version = '1.0.0-SNAPSHOT'
1111

1212
java {
13-
toolchain {
14-
languageVersion = JavaLanguageVersion.of(17)
15-
}
13+
toolchain {
14+
languageVersion = JavaLanguageVersion.of(17)
15+
}
1616
}
1717

1818
repositories {
19-
mavenCentral()
20-
maven { url 'https://repo.spring.io/milestone' }
21-
maven { url 'https://repo.spring.io/snapshot' }
19+
mavenCentral()
20+
maven { url 'https://repo.spring.io/milestone' }
21+
maven { url 'https://repo.spring.io/snapshot' }
2222
}
2323

2424
dependencyManagement {
25-
imports {
26-
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:1.0.0-SNAPSHOT'
27-
}
25+
imports {
26+
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:1.0.0-SNAPSHOT'
27+
}
2828
}
2929

3030
dependencies {
3131
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
3232
implementation 'org.springframework.boot:spring-boot-starter-security'
33-
implementation 'io.grpc:grpc-services'
34-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
35-
testImplementation 'org.springframework.grpc:spring-grpc-test'
36-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
33+
34+
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
35+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
36+
37+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3738
}
3839

3940
test {

‎samples/grpc-secure/pom.xml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.5.5</version>
9+
<version>4.0.0-SNAPSHOT</version>
1010
<relativePath /> <!-- lookup parent from repository -->
1111
</parent>
1212
<groupId>org.springframework.grpc</groupId>
@@ -30,7 +30,7 @@
3030
<properties>
3131
<java.version>17</java.version>
3232
<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
33-
<protobuf-java.version>4.31.1</protobuf-java.version>
33+
<protobuf-java.version>4.32.1</protobuf-java.version>
3434
<grpc.version>1.76.0</grpc.version>
3535
</properties>
3636
<dependencyManagement>
@@ -53,18 +53,15 @@
5353
<groupId>org.springframework.boot</groupId>
5454
<artifactId>spring-boot-starter-security</artifactId>
5555
</dependency>
56-
<dependency>
57-
<groupId>io.grpc</groupId>
58-
<artifactId>grpc-services</artifactId>
59-
</dependency>
60-
<dependency>
61-
<groupId>io.projectreactor.netty</groupId>
62-
<artifactId>reactor-netty-core</artifactId>
63-
</dependency>
6456

6557
<dependency>
6658
<groupId>org.springframework.grpc</groupId>
67-
<artifactId>spring-grpc-test</artifactId>
59+
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
60+
<scope>test</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.springframework.boot</groupId>
64+
<artifactId>spring-boot-starter-test</artifactId>
6865
<scope>test</scope>
6966
</dependency>
7067
</dependencies>

‎samples/grpc-secure/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.grpc.server.GlobalServerInterceptor;
99
import org.springframework.grpc.server.security.GrpcSecurity;
10+
import org.springframework.security.config.annotation.authentication.configuration.EnableGlobalAuthentication;
1011
import org.springframework.security.core.userdetails.User;
1112
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
1213

1314
import io.grpc.Metadata;
1415
import io.grpc.ServerInterceptor;
1516

1617
@SpringBootApplication
17-
public class GrpcServerApplication {
18+
@EnableGlobalAuthentication
19+
class GrpcServerApplication {
1820

1921
public static final Metadata.Key<String> USER_KEY = Metadata.Key.of("X-USER", Metadata.ASCII_STRING_MARSHALLER);
2022

@@ -23,15 +25,15 @@ public static void main(String[] args) {
2325
}
2426

2527
@Bean
26-
public InMemoryUserDetailsManager inMemoryUserDetailsManager() {
28+
InMemoryUserDetailsManager inMemoryUserDetailsManager() {
2729
return new InMemoryUserDetailsManager(
2830
User.withUsername("user").password("{noop}user").authorities("ROLE_USER").build(),
2931
User.withUsername("admin").password("{noop}admin").authorities("ROLE_ADMIN").build());
3032
}
3133

3234
@Bean
3335
@GlobalServerInterceptor
34-
public ServerInterceptor securityInterceptor(GrpcSecurity security) throws Exception {
36+
ServerInterceptor securityInterceptor(GrpcSecurity security) throws Exception {
3537
return security
3638
.authorizeRequests(requests -> requests.methods("Simple/StreamHello")
3739
.hasAuthority("ROLE_ADMIN")

‎samples/grpc-secure/src/main/java/org/springframework/grpc/sample/GrpcServerService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.grpc.stub.StreamObserver;
1111

1212
@Service
13-
public class GrpcServerService extends SimpleGrpc.SimpleImplBase {
13+
class GrpcServerService extends SimpleGrpc.SimpleImplBase {
1414

1515
private static Log log = LogFactory.getLog(GrpcServerService.class);
1616

@@ -47,4 +47,4 @@ public void streamHello(HelloRequest req, StreamObserver<HelloReply> responseObs
4747
responseObserver.onCompleted();
4848
}
4949

50-
}
50+
}

0 commit comments

Comments
 (0)