stubrunner. -> spring.cloud.contract.stubrunner. property migration

marcingrzejszczak · marcingrzejszczak · commit c5bf7ec163a0 · 2025-10-01T16:57:57.000+02:00
Signed-off-by: Marcin Grzejszczak &lt;marcin@grzejszczak.pl&gt;
diff --git a/consumer_kotlin_ftw/src/test/resources/application-gradle.yaml b/consumer_kotlin_ftw/src/test/resources/application-gradle.yaml
@@ -1,3 +1,3 @@
-stubrunner:
+spring.cloud.contract.stubrunner:
   stubs-mode: local
   stubs.ids: 'com.example:producer-kotlin-ftw-gradle:+:stubs:6569'
diff --git a/consumer_with_discovery/src/test/resources/application.yaml b/consumer_with_discovery/src/test/resources/application.yaml
@@ -1,4 +1,4 @@
-stubrunner:
+spring.cloud.contract.stubrunner:
   idsToServiceIds:
     
     beer-api-producer: somenameforproducer
diff --git a/consumer_with_restdocs/src/test/java/com/example/BeerControllerClasspathTest.java b/consumer_with_restdocs/src/test/java/com/example/BeerControllerClasspathTest.java
@@ -32,7 +32,7 @@ public class BeerControllerClasspathTest extends AbstractTest {
 	@Autowired MockMvc mockMvc;
 	@Autowired BeerController beerController;
 
-	@Value("${stubrunner.runningstubs.beer-api-producer-restdocs.port}") int producerPort;
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.beer-api-producer-restdocs.port}") int producerPort;
 
 	@BeforeEach
 	public void setupPort() {
diff --git a/consumer_with_stubs_per_consumer/src/test/java/com/example/BeerControllerForBarTest.java b/consumer_with_stubs_per_consumer/src/test/java/com/example/BeerControllerForBarTest.java
@@ -36,7 +36,7 @@ public class BeerControllerForBarTest extends AbstractTest {
 	@Autowired MockMvc mockMvc;
 	@Autowired BeerController beerController;
 
-	@Value("${stubrunner.runningstubs.beer-api-producer-with-stubs-per-consumer.port}") int producerPort;
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.beer-api-producer-with-stubs-per-consumer.port}") int producerPort;
 
 	@BeforeEach
 	public void setupPort() {
diff --git a/consumer_with_stubs_per_consumer/src/test/java/com/example/BeerControllerTest.java b/consumer_with_stubs_per_consumer/src/test/java/com/example/BeerControllerTest.java
@@ -38,7 +38,7 @@ public class BeerControllerTest extends AbstractTest {
 	@Autowired MockMvc mockMvc;
 	@Autowired BeerController beerController;
 
-	@Value("${stubrunner.runningstubs.beer-api-producer-with-stubs-per-consumer.port}") int producerPort;
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.beer-api-producer-with-stubs-per-consumer.port}") int producerPort;
 
 	@BeforeEach
 	public void setupPort() {
diff --git a/consumer_with_stubs_per_consumer/src/test/java/com/example/BeerControllerWithConsumerNameTest.java b/consumer_with_stubs_per_consumer/src/test/java/com/example/BeerControllerWithConsumerNameTest.java
@@ -36,7 +36,7 @@ public class BeerControllerWithConsumerNameTest extends AbstractTest {
 
 	@Autowired MockMvc mockMvc;
 	@Autowired BeerController beerController;
-	@Value("${stubrunner.runningstubs.beer-api-producer-with-stubs-per-consumer.port}") int producerPort;
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.beer-api-producer-with-stubs-per-consumer.port}") int producerPort;
 
 	@BeforeEach
 	public void setupPort() {
diff --git a/docs/tutorials/snippets/consumer_flow_2.adoc b/docs/tutorials/snippets/consumer_flow_2.adoc
@@ -23,6 +23,6 @@ stubsMode = StubRunnerProperties.StubsMode.REMOTE
 public class YourTestOnTheConsumerSide extends AbstractTest {
 }
 ----
-  * Another option is to pass the property `stubrunner.repositoryRoot` either as a
-   system / environment property, or via an `application.yml` and `stubrunner.stubs-mode`
+  * Another option is to pass the property `spring.cloud.contract.stubrunner.repositoryRoot` either as a
+   system / environment property, or via an `application.yml` and `spring.cloud.contract.stubrunner.stubs-mode`
    equal to `remote`
diff --git a/docs/tutorials/spring_cloud_contract_advanced.adoc b/docs/tutorials/spring_cloud_contract_advanced.adoc
@@ -589,15 +589,15 @@ include::{root}/consumer/src/test/java/com/example/GrumpyBartenderControllerTest
 How can you retrieve the port value then? There are two ways of doing so:
 
 * Autowire the field annotated with
-`@Value("${stubrunner.runningstubs.artifactid.port}")`.
+`@Value("${spring.cloud.contract.stubrunner.runningstubs.artifactid.port}")`.
 * Use the autowired `StubFinder` interface, which includes the `findStub` method.
 
 The following code shows an example of autowiring the field for
 `beer-api-producer-advanced`:
 
 [source,java]
 ----
-@Value("${stubrunner.runningstubs.beer-api-producer-advanced.port}") int stubPort;
+@Value("${spring.cloud.contract.stubrunner.runningstubs.beer-api-producer-advanced.port}") int stubPort;
 
 @BeforeEach
 public void setupPort() {
diff --git a/docs/tutorials/spring_cloud_contract_advanced.html b/docs/tutorials/spring_cloud_contract_advanced.html
@@ -1288,7 +1288,7 @@ <h4 id="_cloned_producer">Cloned Producer</h4>
 <ul>
 <li>
 <p>Autowire the field annotated with
-<code>@Value("${stubrunner.runningstubs.artifactid.port}")</code>.</p>
+<code>@Value("${spring.cloud.contract.stubrunner.runningstubs.artifactid.port}")</code>.</p>
 </li>
 <li>
 <p>Use the autowired <code>StubFinder</code> interface, which includes the <code>findStub</code> method.</p>
@@ -1301,7 +1301,7 @@ <h4 id="_cloned_producer">Cloned Producer</h4>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Value("${stubrunner.runningstubs.beer-api-producer-advanced.port}") int stubPort;
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Value("${spring.cloud.contract.stubrunner.runningstubs.beer-api-producer-advanced.port}") int stubPort;
 
 @BeforeEach
 public void setupPort() {
diff --git a/docs/tutorials/stubbing_out_service_discovery.adoc b/docs/tutorials/stubbing_out_service_discovery.adoc
@@ -76,13 +76,13 @@ Now let's assume that we call the producer application by using the
 `http://somenameforproducer/check` URL. You need to provide some properties to tell Stub
 Runner that the given service name (in our case, `somenameforproducer`) should be mapped
 to the running HTTP server stub of a given producer. Let's set those properties.
-Stub Runner requires you to set the `stubrunner.idsToServiceIds` mapping in which the key
+Stub Runner requires you to set the `spring.cloud.contract.stubrunner.idsToServiceIds` mapping in which the key
 is the artifact ID and the value is the service name in the code. You also need to define
 the `idsToServiceIds` property, as shown in the following code:
 
 [source,yml]
 ----
-stubrunner:
+spring.cloud.contract.stubrunner:
   idsToServiceIds:
     beer-api-producer: somenameforproducer
 ----
diff --git a/docs/tutorials/stubbing_out_service_discovery.html b/docs/tutorials/stubbing_out_service_discovery.html
@@ -659,7 +659,7 @@ <h3 id="_consumer_flow_1">Consumer flow 1</h3>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-yml" data-lang="yml">stubrunner:
+<pre class="prettyprint highlight"><code class="language-yml" data-lang="yml">spring.cloud.contract.stubrunner:
   idsToServiceIds:
     beer-api-producer: somenameforproducer</code></pre>
 </div>
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,6 @@
 				<module>common</module>
 				<module>wiremock</module>
 				<module>wiremock-for-contract-docs</module>
-				<module>wiremock-native</module>
 				<module>wiremock-tomcat</module>
 				<module>wiremock-undertow</module>
 				<module>wiremock-undertow-ssl</module>
@@ -114,7 +113,6 @@
 				<module>beer_contracts</module>
 				<module>wiremock</module>
 				<module>wiremock-for-contract-docs</module>
-				<module>wiremock-native</module>
 				<module>wiremock-tomcat</module>
 				<module>wiremock-undertow</module>
 				<module>wiremock-undertow-ssl</module>
diff --git a/producer/src/main/resources/application.yml b/producer/src/main/resources/application.yml
@@ -1,7 +1,6 @@
 spring:
     application.name: beer-api-producer
     cloud.stream.bindings.output-out-0:
-        
         destination: verifications
         
 server.port: ${PORT:8080}
diff --git a/standalone/dsl/http-client/src/test/resources/application-gradle.yaml b/standalone/dsl/http-client/src/test/resources/application-gradle.yaml
@@ -1,3 +1,3 @@
-stubrunner:
+spring.cloud.contract.stubrunner:
   stubs-mode: local
   stubs.ids: 'com.example:http-server-dsl-gradle:+:stubs:6565'
diff --git a/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml b/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml
@@ -1,3 +1,3 @@
-stubrunner:
+spring.cloud.contract.stubrunner:
   ids: 'com.example:http-server-dsl:+:stubs:8080'
   repositoryRoot: https://repo.spring.io/libs-snapshot
diff --git a/standalone/restdocs/http-client/src/test/java/com/example/loan/LoanApplicationServiceusingStubRunnerTests.java b/standalone/restdocs/http-client/src/test/java/com/example/loan/LoanApplicationServiceusingStubRunnerTests.java
@@ -40,7 +40,7 @@ class LoanApplicationServiceusingStubRunnerTests {
 	@Autowired
 	LoanApplicationService service;
 
-	@Value("${stubrunner.runningstubs.http-server-restdocs.port}")
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.http-server-restdocs.port}")
 	int port;
 
 	@BeforeEach
diff --git a/standalone/restdocs/http-client/src/test/java/com/example/loan/XmlServiceUsingStubRunnerTests.java b/standalone/restdocs/http-client/src/test/java/com/example/loan/XmlServiceUsingStubRunnerTests.java
@@ -36,7 +36,7 @@
 @AutoConfigureStubRunner(ids = "com.example:http-server-restdocs")
 class XmlServiceUsingStubRunnerTests {
 
-	@Value("${stubrunner.runningstubs.http-server-restdocs.port}")
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.http-server-restdocs.port}")
 	int port;
 
 	@Test
diff --git a/standalone/restdocs/http-client/src/test/resources/application-gradle.yaml b/standalone/restdocs/http-client/src/test/resources/application-gradle.yaml
@@ -1,2 +1,2 @@
-stubrunner:
+spring.cloud.contract.stubrunner:
   stubs.ids: 'com.example:http-server-restdocs-gradle'
diff --git a/standalone/webclient/http-client/src/test/java/com/example/loan/LoanApplicationServiceusingStubRunnerGradleTests.java b/standalone/webclient/http-client/src/test/java/com/example/loan/LoanApplicationServiceusingStubRunnerGradleTests.java
@@ -40,7 +40,7 @@ public class LoanApplicationServiceusingStubRunnerGradleTests {
 	@Autowired
 	LoanApplicationService service;
 
-	@Value("${stubrunner.runningstubs.http-server-webclient.port}")
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.http-server-webclient.port}")
 	int port;
 
 	@BeforeEach
diff --git a/standalone/webclient/http-client/src/test/java/com/example/loan/LoanApplicationServiceusingStubRunnerTests.java b/standalone/webclient/http-client/src/test/java/com/example/loan/LoanApplicationServiceusingStubRunnerTests.java
@@ -40,7 +40,7 @@ public class LoanApplicationServiceusingStubRunnerTests {
 	@Autowired
 	LoanApplicationService service;
 
-	@Value("${stubrunner.runningstubs.http-server-webclient.port}")
+	@Value("${spring.cloud.contract.stubrunner.runningstubs.http-server-webclient.port}")
 	int port;
 
 	@BeforeEach
diff --git a/standalone/webclient/http-client/src/test/resources/application-gradle.yaml b/standalone/webclient/http-client/src/test/resources/application-gradle.yaml
@@ -1,2 +1,2 @@
-stubrunner:
+spring.cloud.contract.stubrunner:
   stubs.ids: 'com.example:http-server-webclient'
diff --git a/wiremock-native/.mvn/wrapper/maven-wrapper.jar b/wiremock-native/.mvn/wrapper/maven-wrapper.jar
diff --git a/wiremock-native/.mvn/wrapper/maven-wrapper.properties b/wiremock-native/.mvn/wrapper/maven-wrapper.properties
diff --git a/wiremock-native/mvnw b/wiremock-native/mvnw
diff --git a/wiremock-native/mvnw.cmd b/wiremock-native/mvnw.cmd
diff --git a/wiremock-native/pom.xml b/wiremock-native/pom.xml
diff --git a/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java b/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java
diff --git a/wiremock-native/src/main/resources/application.properties b/wiremock-native/src/main/resources/application.properties
diff --git a/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java b/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java
diff --git a/wiremock-native/src/test/resources/stubs/resource.json b/wiremock-native/src/test/resources/stubs/resource.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-stubrunner:`
	`1`	`+spring.cloud.contract.stubrunner:`
`2`	`2`	`idsToServiceIds:`
`3`	`3`
`4`	`4`	`beer-api-producer: somenameforproducer`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ stubsMode = StubRunnerProperties.StubsMode.REMOTE`
`23`	`23`	`public class YourTestOnTheConsumerSide extends AbstractTest {`
`24`	`24`	`}`
`25`	`25`	`----`
`26`		- * Another option is to pass the property `stubrunner.repositoryRoot` either as a
`27`		- system / environment property, or via an `application.yml` and `stubrunner.stubs-mode`
	`26`	+ * Another option is to pass the property `spring.cloud.contract.stubrunner.repositoryRoot` either as a
	`27`	+ system / environment property, or via an `application.yml` and `spring.cloud.contract.stubrunner.stubs-mode`
`28`	`28`	equal to `remote`