Add back in grpc-oauth2 sample

Signed-off-by: onobc <chris.bono@gmail.com>

Author: onobc

samples/grpc-oauth2/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.5.5'
-    id 'io.spring.dependency-management' version '1.1.6'
+    id 'org.springframework.boot' version '4.0.0-RC1'
+    id 'io.spring.dependency-management' version '1.1.7'
     id 'org.graalvm.buildtools.native' version '0.10.3'
     id 'com.google.protobuf' version '0.9.4'
 }
@@ -34,12 +34,12 @@ dependencyManagement {
 dependencies {
     implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'io.grpc:grpc-services'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.grpc:spring-grpc-test'
-    testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.0.4'
+
+	testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+	testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-SNAPSHOT'
+
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

samples/grpc-oauth2/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.5</version>
+		<version>4.0.0-RC1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
-		<protobuf-java.version>4.31.1</protobuf-java.version>
+		<protobuf-java.version>4.32.1</protobuf-java.version>
 		<grpc.version>1.76.0</grpc.version>
 	</properties>
 	<dependencyManagement>
@@ -53,25 +53,26 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>io.grpc</groupId>
-			<artifactId>grpc-services</artifactId>
+			<groupId>org.springframework.grpc</groupId>
+			<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
+			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-oauth2-client</artifactId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.grpc</groupId>
-			<artifactId>spring-grpc-test</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-oauth2-client</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.experimental.boot</groupId>
 			<artifactId>spring-boot-testjars-maven</artifactId>
-			<version>0.0.4</version>
+			<version>0.4.0.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

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

@@ -15,7 +15,7 @@
 
 @SpringBootApplication
 @Import(AuthenticationConfiguration.class)
-public class GrpcServerApplication {
+class GrpcServerApplication {
 
 	public static final Metadata.Key<String> USER_KEY = Metadata.Key.of("X-USER", Metadata.ASCII_STRING_MARSHALLER);
 
@@ -39,4 +39,4 @@ AuthenticationProcessInterceptor jwtSecurityFilterChain(GrpcSecurity grpc) throw
 			.build();
 	}
 
-}
+}

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

@@ -10,7 +10,7 @@
 import io.grpc.stub.StreamObserver;
 
 @Service
-public class GrpcServerService extends SimpleGrpc.SimpleImplBase {
+class GrpcServerService extends SimpleGrpc.SimpleImplBase {
 
 	private static Log log = LogFactory.getLog(GrpcServerService.class);
 
@@ -45,4 +45,4 @@ public void streamHello(HelloRequest req, StreamObserver<HelloReply> responseObs
 		responseObserver.onCompleted();
 	}
 
-}
+}

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

@@ -1,7 +1,7 @@
 package org.springframework.grpc.sample;
 
-import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -123,8 +123,8 @@ static class ExtraConfiguration {
 		static CommonsExecWebServerFactoryBean authServer() {
 			return CommonsExecWebServerFactoryBean.builder()
 				.useGenericSpringBootMain()
-				.classpath(classpath -> classpath.entries(new MavenClasspathEntry(
-						"org.springframework.boot:spring-boot-starter-oauth2-authorization-server:3.5.5")));
+				.classpath(classpath -> classpath
+					.entries(MavenClasspathEntry.springBootStarter("oauth2-authorization-server")));
 		}
 
 		@Bean

samples/pom.xml

@@ -16,11 +16,11 @@
 	<name>Parent Demo</name>
 
 	<modules>
-		<module>grpc-server</module>
 		<module>grpc-client</module>
-<!--		<module>grpc-secure</module>-->
-<!--		<module>grpc-oauth2</module>-->
+		<module>grpc-oauth2</module>
 <!--		<module>grpc-reactive</module>-->
+<!--		<module>grpc-secure</module>-->
+		<module>grpc-server</module>
 <!--		<module>grpc-server-kotlin</module>-->
 <!--		<module>grpc-server-netty-shaded</module>-->
 <!--		<module>grpc-tomcat</module>-->