From 8b2bfc587724f5bae864079be18f2b41d62137ce Mon Sep 17 00:00:00 2001 From: onobc Date: Mon, 10 Nov 2025 13:45:08 -0600 Subject: [PATCH 1/3] Remove redundant items from pom.xml This commit removes the redundant scm and url elements from the child pom.xml as they are already contained in the parent pom.xml. Signed-off-by: onobc --- spring-grpc-client-spring-boot-autoconfigure/pom.xml | 7 ------- spring-grpc-core/pom.xml | 9 --------- spring-grpc-server-spring-boot-autoconfigure/pom.xml | 7 ------- spring-grpc-spring-boot-starter/pom.xml | 7 ------- spring-grpc-test-spring-boot-autoconfigure/pom.xml | 8 -------- 5 files changed, 38 deletions(-) diff --git a/spring-grpc-client-spring-boot-autoconfigure/pom.xml b/spring-grpc-client-spring-boot-autoconfigure/pom.xml index 2f8eb12e..6bacf34d 100644 --- a/spring-grpc-client-spring-boot-autoconfigure/pom.xml +++ b/spring-grpc-client-spring-boot-autoconfigure/pom.xml @@ -12,13 +12,6 @@ jar Spring gRPC Client Auto Configuration Spring gRPC Client Auto Configuration - https://github.com/spring-projects/spring-grpc - - - https://github.com/spring-projects/spring-grpc - git://github.com/spring-projects/spring-grpc.git - git@github.com:spring-projects/spring-grpc.git - diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml index 464f8e65..9002fbf2 100644 --- a/spring-grpc-core/pom.xml +++ b/spring-grpc-core/pom.xml @@ -12,15 +12,6 @@ jar Spring gRPC Core Core module for gRPC programming - https://github.com/spring-projects/spring-grpc - - - https://github.com/spring-projects/spring-grpc - git://github.com/spring-projects/spring-grpc.git - - git@github.com:spring-projects/spring-grpc.git - - diff --git a/spring-grpc-server-spring-boot-autoconfigure/pom.xml b/spring-grpc-server-spring-boot-autoconfigure/pom.xml index 780be95f..1b83f877 100644 --- a/spring-grpc-server-spring-boot-autoconfigure/pom.xml +++ b/spring-grpc-server-spring-boot-autoconfigure/pom.xml @@ -12,13 +12,6 @@ jar Spring gRPC Server Auto Configuration Spring gRPC Server Auto Configuration - https://github.com/spring-projects/spring-grpc - - - https://github.com/spring-projects/spring-grpc - git://github.com/spring-projects/spring-grpc.git - git@github.com:spring-projects/spring-grpc.git - diff --git a/spring-grpc-spring-boot-starter/pom.xml b/spring-grpc-spring-boot-starter/pom.xml index 39b97deb..1b4407ca 100644 --- a/spring-grpc-spring-boot-starter/pom.xml +++ b/spring-grpc-spring-boot-starter/pom.xml @@ -12,13 +12,6 @@ jar Spring gRPC Client and Server (Netty) Spring Boot Starter Spring gRPC Client and Server (Netty) Spring Boot Starter - https://github.com/spring-projects/spring-grpc - - - https://github.com/spring-projects/spring-grpc - git://github.com/spring-projects/spring-grpc.git - git@github.com:spring-projects/spring-grpc.git - diff --git a/spring-grpc-test-spring-boot-autoconfigure/pom.xml b/spring-grpc-test-spring-boot-autoconfigure/pom.xml index 247a7ce3..f965b412 100644 --- a/spring-grpc-test-spring-boot-autoconfigure/pom.xml +++ b/spring-grpc-test-spring-boot-autoconfigure/pom.xml @@ -12,14 +12,6 @@ jar Spring gRPC Test Auto Configuration Spring gRPC Test Auto Configuration - https://github.com/spring-projects/spring-grpc - - - https://github.com/spring-projects/spring-grpc - git://github.com/spring-projects/spring-grpc.git - git@github.com:spring-projects/spring-grpc.git - - From f15c0a4b5f519d19e430708509b22e0428034b7a Mon Sep 17 00:00:00 2001 From: onobc Date: Mon, 10 Nov 2025 13:50:13 -0600 Subject: [PATCH 2/3] Add spring-grpc-test module. This commit adds the Spring gRPC testing module back into the repo. It is effectively a Spring Boot starter that includes Spring Boot Test Starter, Spring gRPC Test Autoconfigure, and gRPC in-process dependency. Signed-off-by: onobc --- pom.xml | 1 + samples/grpc-client/build.gradle | 4 +-- samples/grpc-client/pom.xml | 12 +------ samples/grpc-oauth2/build.gradle | 3 +- samples/grpc-oauth2/pom.xml | 7 +--- samples/grpc-reactive/build.gradle | 4 +-- samples/grpc-reactive/pom.xml | 12 +------ samples/grpc-secure/build.gradle | 3 +- samples/grpc-secure/pom.xml | 7 +--- samples/grpc-server-kotlin/build.gradle | 3 +- samples/grpc-server-kotlin/pom.xml | 7 +--- samples/grpc-server-netty-shaded/build.gradle | 3 +- samples/grpc-server-netty-shaded/pom.xml | 7 +--- samples/grpc-server/build.gradle | 4 +-- samples/grpc-server/pom.xml | 12 +------ samples/grpc-tomcat-secure/build.gradle | 3 +- samples/grpc-tomcat-secure/pom.xml | 7 +--- samples/grpc-tomcat/build.gradle | 3 +- samples/grpc-tomcat/pom.xml | 7 +--- samples/grpc-webflux-secure/build.gradle | 3 +- samples/grpc-webflux-secure/pom.xml | 7 +--- samples/grpc-webflux/build.gradle | 3 +- samples/grpc-webflux/pom.xml | 7 +--- spring-grpc-dependencies/pom.xml | 5 +++ spring-grpc-test/pom.xml | 33 +++++++++++++++++++ 25 files changed, 61 insertions(+), 106 deletions(-) create mode 100644 spring-grpc-test/pom.xml diff --git a/pom.xml b/pom.xml index 08ba075d..b0d99b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ spring-grpc-server-spring-boot-starter spring-grpc-server-web-spring-boot-starter spring-grpc-spring-boot-starter + spring-grpc-test spring-grpc-test-spring-boot-autoconfigure diff --git a/samples/grpc-client/build.gradle b/samples/grpc-client/build.gradle index d508540d..dfce5694 100644 --- a/samples/grpc-client/build.gradle +++ b/samples/grpc-client/build.gradle @@ -30,11 +30,9 @@ dependencyManagement { dependencies { implementation 'org.springframework.grpc:spring-grpc-client-spring-boot-starter' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testImplementation 'org.springframework.boot:spring-boot-web-server' testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1' - testImplementation 'io.grpc:grpc-inprocess' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml index 8630b90e..f9fdccee 100644 --- a/samples/grpc-client/pom.xml +++ b/samples/grpc-client/pom.xml @@ -55,12 +55,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test @@ -74,11 +69,6 @@ 0.4.0.0-RC1 test - - io.grpc - grpc-inprocess - test - diff --git a/samples/grpc-oauth2/build.gradle b/samples/grpc-oauth2/build.gradle index dcb57ae3..eaf24674 100644 --- a/samples/grpc-oauth2/build.gradle +++ b/samples/grpc-oauth2/build.gradle @@ -36,8 +36,7 @@ dependencies { implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testImplementation 'org.springframework.boot:spring-boot-starter-oauth2-client' testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1' diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml index b71ad6a1..3cd67b7b 100644 --- a/samples/grpc-oauth2/pom.xml +++ b/samples/grpc-oauth2/pom.xml @@ -56,12 +56,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-reactive/build.gradle b/samples/grpc-reactive/build.gradle index cc2c2379..2058359f 100644 --- a/samples/grpc-reactive/build.gradle +++ b/samples/grpc-reactive/build.gradle @@ -35,9 +35,7 @@ dependencies { compileOnly 'javax.annotation:javax.annotation-api:1.3.2' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'io.grpc:grpc-inprocess' + testImplementation 'org.springframework.grpc:spring-grpc-test' testImplementation 'io.projectreactor:reactor-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml index d6d38138..101e5b95 100644 --- a/samples/grpc-reactive/pom.xml +++ b/samples/grpc-reactive/pom.xml @@ -72,17 +72,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test - test - - - io.grpc - grpc-inprocess + spring-grpc-test test diff --git a/samples/grpc-secure/build.gradle b/samples/grpc-secure/build.gradle index a5d83968..b2d3fe79 100644 --- a/samples/grpc-secure/build.gradle +++ b/samples/grpc-secure/build.gradle @@ -32,8 +32,7 @@ dependencies { implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-security' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml index 1c53fb60..9a2d2296 100644 --- a/samples/grpc-secure/pom.xml +++ b/samples/grpc-secure/pom.xml @@ -56,12 +56,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-server-kotlin/build.gradle b/samples/grpc-server-kotlin/build.gradle index b6cd85b6..d64dad29 100644 --- a/samples/grpc-server-kotlin/build.gradle +++ b/samples/grpc-server-kotlin/build.gradle @@ -39,8 +39,7 @@ dependencies { implementation "io.grpc:grpc-kotlin-stub:${kotlinStubVersion}" implementation("io.micrometer:context-propagation") - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64" testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml index 0a193a72..da25b9c7 100644 --- a/samples/grpc-server-kotlin/pom.xml +++ b/samples/grpc-server-kotlin/pom.xml @@ -71,12 +71,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle index ae57205d..de1152b5 100644 --- a/samples/grpc-server-netty-shaded/build.gradle +++ b/samples/grpc-server-netty-shaded/build.gradle @@ -37,8 +37,7 @@ dependencies { } } - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml index 60160b48..91eb7786 100644 --- a/samples/grpc-server-netty-shaded/pom.xml +++ b/samples/grpc-server-netty-shaded/pom.xml @@ -49,12 +49,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle index 65cd56d3..e8f4cbaf 100644 --- a/samples/grpc-server/build.gradle +++ b/samples/grpc-server/build.gradle @@ -32,9 +32,7 @@ dependencies { implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-actuator' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'io.grpc:grpc-inprocess' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64" testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml index 0a5f3d94..a16f2a26 100644 --- a/samples/grpc-server/pom.xml +++ b/samples/grpc-server/pom.xml @@ -57,17 +57,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test - test - - - io.grpc - grpc-inprocess + spring-grpc-test test diff --git a/samples/grpc-tomcat-secure/build.gradle b/samples/grpc-tomcat-secure/build.gradle index 93142108..0a907e73 100644 --- a/samples/grpc-tomcat-secure/build.gradle +++ b/samples/grpc-tomcat-secure/build.gradle @@ -32,8 +32,7 @@ dependencies { implementation 'org.springframework.grpc:spring-grpc-server-web-spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml index 1dead422..0448167a 100644 --- a/samples/grpc-tomcat-secure/pom.xml +++ b/samples/grpc-tomcat-secure/pom.xml @@ -56,12 +56,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-tomcat/build.gradle b/samples/grpc-tomcat/build.gradle index ab0a40bc..a0cc82f1 100644 --- a/samples/grpc-tomcat/build.gradle +++ b/samples/grpc-tomcat/build.gradle @@ -33,8 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-tracing-bridge-otel' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml index 8fdd3475..fdbf6802 100644 --- a/samples/grpc-tomcat/pom.xml +++ b/samples/grpc-tomcat/pom.xml @@ -60,12 +60,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-webflux-secure/build.gradle b/samples/grpc-webflux-secure/build.gradle index 4145bc6a..4fcee7da 100644 --- a/samples/grpc-webflux-secure/build.gradle +++ b/samples/grpc-webflux-secure/build.gradle @@ -38,8 +38,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - 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.4.0.0-RC1' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/samples/grpc-webflux-secure/pom.xml b/samples/grpc-webflux-secure/pom.xml index 70a7e8d9..a8d5c3a5 100644 --- a/samples/grpc-webflux-secure/pom.xml +++ b/samples/grpc-webflux-secure/pom.xml @@ -64,12 +64,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/samples/grpc-webflux/build.gradle b/samples/grpc-webflux/build.gradle index 0b6f7a8f..81bd0c7c 100644 --- a/samples/grpc-webflux/build.gradle +++ b/samples/grpc-webflux/build.gradle @@ -32,8 +32,7 @@ dependencies { implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-webflux' - testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml index a18a702b..80a7f532 100644 --- a/samples/grpc-webflux/pom.xml +++ b/samples/grpc-webflux/pom.xml @@ -56,12 +56,7 @@ org.springframework.grpc - spring-grpc-test-spring-boot-autoconfigure - test - - - org.springframework.boot - spring-boot-starter-test + spring-grpc-test test diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml index 4049148d..233754b9 100644 --- a/spring-grpc-dependencies/pom.xml +++ b/spring-grpc-dependencies/pom.xml @@ -96,6 +96,11 @@ spring-grpc-spring-boot-starter ${project.version} + + org.springframework.grpc + spring-grpc-test + ${project.version} + org.springframework.grpc spring-grpc-test-spring-boot-autoconfigure diff --git a/spring-grpc-test/pom.xml b/spring-grpc-test/pom.xml new file mode 100644 index 00000000..4b5eec20 --- /dev/null +++ b/spring-grpc-test/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + org.springframework.grpc + spring-grpc + 1.0.0-SNAPSHOT + + spring-grpc-test + jar + Spring gRPC Test Starter + Spring gRPC Test Spring Boot Starter + + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + + + org.springframework.grpc + spring-grpc-test-spring-boot-autoconfigure + + + io.grpc + grpc-inprocess + + + + + From 934af0a810cabafd1ddb906fb2a96393ef05a78b Mon Sep 17 00:00:00 2001 From: onobc Date: Tue, 11 Nov 2025 19:14:03 -0600 Subject: [PATCH 3/3] Rename the inprocess test property This renames the test property back to `spring.grpc.test.inprocess` from `spring.test.grpc.inprocess`. Signed-off-by: onobc --- .../test/autoconfigure/AutoConfigureInProcessTransport.java | 2 +- .../test/autoconfigure/InProcessTestAutoConfiguration.java | 2 +- .../InProcessTransportContextCustomizerFactory.java | 2 +- .../autoconfigure/InProcessTestAutoConfigurationTests.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/AutoConfigureInProcessTransport.java b/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/AutoConfigureInProcessTransport.java index 02ac487b..a22dc72d 100644 --- a/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/AutoConfigureInProcessTransport.java +++ b/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/AutoConfigureInProcessTransport.java @@ -41,7 +41,7 @@ @Documented @Inherited @ImportAutoConfiguration -@PropertyMapping("spring.test.grpc.inprocess") +@PropertyMapping("spring.grpc.test.inprocess") public @interface AutoConfigureInProcessTransport { /** diff --git a/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfiguration.java b/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfiguration.java index f70bd70f..da072ef1 100644 --- a/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfiguration.java +++ b/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfiguration.java @@ -63,7 +63,7 @@ @AutoConfiguration(before = { GrpcServerFactoryAutoConfiguration.class, GrpcClientAutoConfiguration.class }) @ConditionalOnClass({ InProcessServerBuilder.class, InProcessChannelBuilder.class, InProcessGrpcServerFactory.class, InProcessGrpcChannelFactory.class }) -@ConditionalOnBooleanProperty("spring.test.grpc.inprocess.enabled") +@ConditionalOnBooleanProperty("spring.grpc.test.inprocess.enabled") public final class InProcessTestAutoConfiguration { private final String address = InProcessServerBuilder.generateName(); diff --git a/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTransportContextCustomizerFactory.java b/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTransportContextCustomizerFactory.java index 412a3841..eaef9435 100644 --- a/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTransportContextCustomizerFactory.java +++ b/spring-grpc-test-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTransportContextCustomizerFactory.java @@ -39,7 +39,7 @@ */ class InProcessTransportContextCustomizerFactory implements ContextCustomizerFactory { - static final String ENABLED_PROPERTY = "spring.test.grpc.inprocess.enabled"; + static final String ENABLED_PROPERTY = "spring.grpc.test.inprocess.enabled"; @Override public ContextCustomizer createContextCustomizer(Class testClass, diff --git a/spring-grpc-test-spring-boot-autoconfigure/src/test/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfigurationTests.java b/spring-grpc-test-spring-boot-autoconfigure/src/test/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfigurationTests.java index 2d19099a..47c83142 100644 --- a/spring-grpc-test-spring-boot-autoconfigure/src/test/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfigurationTests.java +++ b/spring-grpc-test-spring-boot-autoconfigure/src/test/java/org/springframework/boot/grpc/test/autoconfigure/InProcessTestAutoConfigurationTests.java @@ -62,7 +62,7 @@ private ApplicationContextRunner contextRunner() { @Test void whenTestInProcessEnabledPropIsSetToTrueDoesAutoConfigureBeans() { this.contextRunner() - .withPropertyValues("spring.test.grpc.inprocess.enabled=true", "spring.grpc.server.inprocess.name=foo", + .withPropertyValues("spring.grpc.test.inprocess.enabled=true", "spring.grpc.server.inprocess.name=foo", "spring.grpc.server.port=0") .run((context) -> { assertThat(context).getBeans(GrpcServerFactory.class) @@ -87,7 +87,7 @@ void whenTestInProcessEnabledPropIsNotSetDoesNotAutoConfigureBeans() { @Test void whenTestInProcessEnabledPropIsSetToFalseDoesNotAutoConfigureBeans() { this.contextRunner() - .withPropertyValues("spring.test.grpc.inprocess.enabled=false", "spring.grpc.server.inprocess.name=foo", + .withPropertyValues("spring.grpc.test.inprocess.enabled=false", "spring.grpc.server.inprocess.name=foo", "spring.grpc.server.port=0") .run((context) -> { assertThat(context).getBeans(GrpcServerFactory.class)