From 42a2d1dfb13119c8570d86f0835f8cd5a3914046 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 16 Apr 2019 08:41:10 +0400 Subject: [PATCH] Bumped Boot in gradle samples --- .../standalone/dsl/http-client/build.gradle | 2 +- .../dsl/http-client/gradle.properties | 3 ++- .../standalone/dsl/http-server/build.gradle | 2 +- .../dsl/http-server/gradle.properties | 3 ++- .../messaging/stream-sink/build.gradle | 2 +- .../messaging/stream-sink/gradle.properties | 3 ++- .../messaging/stream-source/build.gradle | 2 +- .../messaging/stream-source/gradle.properties | 3 ++- .../pact/pact-http-client/build.gradle | 2 +- .../pact/pact-http-client/gradle.properties | 3 ++- .../pact/pact-http-server/build.gradle | 2 +- .../pact/pact-http-server/gradle.properties | 3 ++- .../restdocs/http-client/build.gradle | 2 +- .../restdocs/http-client/gradle.properties | 3 ++- .../restdocs/http-server/build.gradle | 2 +- .../restdocs/http-server/gradle.properties | 3 ++- .../webclient/http-client/build.gradle | 2 +- .../webclient/http-client/gradle.properties | 3 ++- .../webclient/http-server/build.gradle | 2 +- .../webclient/http-server/gradle.properties | 3 ++- .../standalone/yml/http-client/build.gradle | 2 +- .../yml/http-client/gradle.properties | 1 + .../standalone/yml/http-server/build.gradle | 2 +- .../yml/http-server/gradle.properties | 1 + .../camel/StubRunnerCamelConfiguration.java | 3 ++- .../StubRunnerIntegrationConfiguration.java | 3 ++- .../stream/StubRunnerStreamConfiguration.java | 3 ++- .../spring/StubRunnerConfiguration.java | 3 ++- .../ConditionalOnStubbedDiscoveryDisabled.java | 3 ++- .../ConditionalOnStubbedDiscoveryEnabled.java | 3 ++- ...StubRunnerSpringCloudAutoConfiguration.java | 3 ++- .../eureka/ConditionalOnEurekaEnabled.java | 3 ++- ...rSpringCloudZookeeperAutoConfiguration.java | 3 ++- .../stubrunner/StubRunnerSliceTests.java | 5 +++-- .../contract/maven/verifier/ConvertMojo.java | 6 ++++-- .../maven/verifier/GenerateStubsMojo.java | 12 ++++++++---- .../maven/verifier/GenerateTestsMojo.java | 15 ++++++++++----- .../maven/verifier/PushStubsToScmMojo.java | 9 ++++++--- .../cloud/contract/maven/verifier/RunMojo.java | 18 ++++++++++++------ ...MockConnectionFactoryAutoConfiguration.java | 3 ++- .../ContractVerifierCamelConfiguration.java | 3 ++- ...ontractVerifierStreamAutoConfiguration.java | 3 ++- .../WireMockRestTemplateConfiguration.java | 3 ++- .../AutoConfigureWireMockApplicationTests.java | 4 +++- ...igureWireMockAutoStubsApplicationTests.java | 4 +++- ...reWireMockConfigurationCustomizerTests.java | 7 +++++-- ...ConfigureWireMockFilesApplicationTests.java | 4 +++- ...ckFilesApplicationWithUrlResourceTests.java | 5 ++++- ...eMockFilesApplicationWithoutSlashTests.java | 4 +++- ...igureWireMockHttpsPortApplicationTests.java | 4 +++- ...oConfigureWireMockPortApplicationTests.java | 4 +++- ...gureWireMockRandomPortApplicationTests.java | 4 +++- ...ireMockRandomPortHttpsApplicationTests.java | 4 +++- ...figureWireMockSamePortApplicationTests.java | 4 +++- ...eWireMockStubsAndFilesApplicationTests.java | 7 +++++-- ...kStubsAndMultipleFilesApplicationTests.java | 9 ++++++--- ...ConfigureWireMockStubsApplicationTests.java | 4 +++- ...WireMockStubsApplicationWithSlashTests.java | 4 +++- .../WiremockHttpsServerApplicationTests.java | 3 ++- .../WiremockServerApplicationTests.java | 4 +++- 60 files changed, 161 insertions(+), 78 deletions(-) diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle index 61d0f8d423..aa2c6b87a4 100644 --- a/samples/standalone/dsl/http-client/build.gradle +++ b/samples/standalone/dsl/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index 6e09cc6cad..6b3c50fd63 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,2 +1,3 @@ org.gradle.daemon=false -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index 32364c36de..c6bc9c685b 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -9,7 +9,7 @@ buildscript { } // end::repos[] dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle index 265ba893c7..862b9c36c6 100644 --- a/samples/standalone/messaging/stream-sink/build.gradle +++ b/samples/standalone/messaging/stream-sink/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/messaging/stream-sink/gradle.properties b/samples/standalone/messaging/stream-sink/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/messaging/stream-sink/gradle.properties +++ b/samples/standalone/messaging/stream-sink/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 8a8172ac32..f92bb7ecc4 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" // Example of using Rest Assured 3.x. If you don't add this section Rest Assured 2.9.0 will be used // classpath "com.jayway.restassured:rest-assured:2.9.0" diff --git a/samples/standalone/messaging/stream-source/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/messaging/stream-source/gradle.properties +++ b/samples/standalone/messaging/stream-source/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/pact/pact-http-client/build.gradle b/samples/standalone/pact/pact-http-client/build.gradle index 80768e9549..4e308872f1 100644 --- a/samples/standalone/pact/pact-http-client/build.gradle +++ b/samples/standalone/pact/pact-http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/pact/pact-http-client/gradle.properties b/samples/standalone/pact/pact-http-client/gradle.properties index 6e09cc6cad..6b3c50fd63 100644 --- a/samples/standalone/pact/pact-http-client/gradle.properties +++ b/samples/standalone/pact/pact-http-client/gradle.properties @@ -1,2 +1,3 @@ org.gradle.daemon=false -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/pact/pact-http-server/build.gradle b/samples/standalone/pact/pact-http-server/build.gradle index 17719d3b6b..caf21cf721 100644 --- a/samples/standalone/pact/pact-http-server/build.gradle +++ b/samples/standalone/pact/pact-http-server/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" //tag::pact_dependency[] classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}" diff --git a/samples/standalone/pact/pact-http-server/gradle.properties b/samples/standalone/pact/pact-http-server/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/pact/pact-http-server/gradle.properties +++ b/samples/standalone/pact/pact-http-server/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-client/build.gradle b/samples/standalone/restdocs/http-client/build.gradle index 3c55f36367..7c56bfbada 100644 --- a/samples/standalone/restdocs/http-client/build.gradle +++ b/samples/standalone/restdocs/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle index 97beb5a697..42612eac72 100644 --- a/samples/standalone/restdocs/http-server/build.gradle +++ b/samples/standalone/restdocs/http-server/build.gradle @@ -10,7 +10,7 @@ buildscript { maven { url "https://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${project.findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/webclient/http-client/build.gradle b/samples/standalone/webclient/http-client/build.gradle index 8d0cf4566c..d89b733eb6 100644 --- a/samples/standalone/webclient/http-client/build.gradle +++ b/samples/standalone/webclient/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/webclient/http-server/build.gradle b/samples/standalone/webclient/http-server/build.gradle index 2703c06a79..83d8c67d4d 100644 --- a/samples/standalone/webclient/http-server/build.gradle +++ b/samples/standalone/webclient/http-server/build.gradle @@ -10,7 +10,7 @@ buildscript { maven { url "https://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index 797b760468..4e2909074c 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT -BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/yml/http-client/build.gradle b/samples/standalone/yml/http-client/build.gradle index f521a95c56..955c2461c9 100644 --- a/samples/standalone/yml/http-client/build.gradle +++ b/samples/standalone/yml/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" } } diff --git a/samples/standalone/yml/http-client/gradle.properties b/samples/standalone/yml/http-client/gradle.properties index 535ecb91d1..f2aac84e71 100644 --- a/samples/standalone/yml/http-client/gradle.properties +++ b/samples/standalone/yml/http-client/gradle.properties @@ -1,2 +1,3 @@ org.gradle.daemon=false BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-server/build.gradle b/samples/standalone/yml/http-server/build.gradle index fae5a590a3..b88b5709f3 100644 --- a/samples/standalone/yml/http-server/build.gradle +++ b/samples/standalone/yml/http-server/build.gradle @@ -9,7 +9,7 @@ buildscript { } // end::repos[] dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/yml/http-server/gradle.properties b/samples/standalone/yml/http-server/gradle.properties index 824726cc69..b15537ccf7 100644 --- a/samples/standalone/yml/http-server/gradle.properties +++ b/samples/standalone/yml/http-server/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=false verifierVersion=2.2.0.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java index 049ad74cf5..ec693f9f58 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java @@ -46,7 +46,8 @@ import org.springframework.util.StringUtils; */ @Configuration @ConditionalOnClass(RoutesBuilder.class) -@ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true", + matchIfMissing = true) public class StubRunnerCamelConfiguration { static final String STUBRUNNER_DESTINATION_URL_HEADER_NAME = "STUBRUNNER_DESTINATION_URL"; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java index 602f800f90..5adc4fbd65 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java @@ -50,7 +50,8 @@ import org.springframework.util.StringUtils; */ @Configuration @ConditionalOnClass(IntegrationFlowBuilder.class) -@ConditionalOnProperty(name = "stubrunner.integration.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "stubrunner.integration.enabled", havingValue = "true", + matchIfMissing = true) public class StubRunnerIntegrationConfiguration { @Bean diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java index f83675b04e..7c0a6d5e38 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java @@ -60,7 +60,8 @@ import org.springframework.util.StringUtils; */ @Configuration @ConditionalOnClass({ IntegrationFlows.class, EnableBinding.class }) -@ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true", + matchIfMissing = true) @AutoConfigureBefore(StubRunnerIntegrationConfiguration.class) public class StubRunnerStreamConfiguration { diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java index f97628ff88..e3b2349bc7 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java @@ -48,7 +48,8 @@ import org.springframework.util.StringUtils; */ @Configuration @EnableConfigurationProperties(StubRunnerProperties.class) -@ConditionalOnMissingBean(type = "org.springframework.cloud.contract.wiremock.WiremockServerConfiguration") +@ConditionalOnMissingBean( + type = "org.springframework.cloud.contract.wiremock.WiremockServerConfiguration") @Import(StubRunnerPortBeanPostProcessor.class) public class StubRunnerConfiguration { diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryDisabled.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryDisabled.java index 84a0309c74..837df895e8 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryDisabled.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryDisabled.java @@ -34,7 +34,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @Documented -@ConditionalOnProperty(value = "stubrunner.cloud.stubbed.discovery.enabled", havingValue = "false") +@ConditionalOnProperty(value = "stubrunner.cloud.stubbed.discovery.enabled", + havingValue = "false") public @interface ConditionalOnStubbedDiscoveryDisabled { } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryEnabled.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryEnabled.java index a1ff2e0ae7..0ca2779a90 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryEnabled.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ConditionalOnStubbedDiscoveryEnabled.java @@ -35,7 +35,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @Documented -@ConditionalOnProperty(value = "stubrunner.cloud.stubbed.discovery.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(value = "stubrunner.cloud.stubbed.discovery.enabled", + havingValue = "true", matchIfMissing = true) public @interface ConditionalOnStubbedDiscoveryEnabled { } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java index baf0fc3559..81bf42dfff 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java @@ -55,7 +55,8 @@ public class StubRunnerSpringCloudAutoConfiguration { @Bean @ConditionalOnMissingBean(DiscoveryClient.class) @ConditionalOnStubbedDiscoveryEnabled - @ConditionalOnProperty(value = "stubrunner.cloud.delegate.enabled", havingValue = "false", matchIfMissing = true) + @ConditionalOnProperty(value = "stubrunner.cloud.delegate.enabled", + havingValue = "false", matchIfMissing = true) public DiscoveryClient noOpStubRunnerDiscoveryClient(StubFinder stubFinder, StubMapperProperties stubMapperProperties, @Value("${spring.application.name:unknown}") String springAppName) { diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/ConditionalOnEurekaEnabled.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/ConditionalOnEurekaEnabled.java index 330e62be2c..f0d9279eae 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/ConditionalOnEurekaEnabled.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/ConditionalOnEurekaEnabled.java @@ -34,7 +34,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @Documented -@ConditionalOnProperty(value = "eureka.client.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(value = "eureka.client.enabled", havingValue = "true", + matchIfMissing = true) @interface ConditionalOnEurekaEnabled { } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfiguration.java index ac8506221d..f5463a4de5 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfiguration.java @@ -44,7 +44,8 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnClass(org.apache.curator.x.discovery.ServiceInstance.class) @ConditionalOnStubbedDiscoveryDisabled @ConditionalOnZookeeperDiscoveryEnabled -@ConditionalOnProperty(value = "stubrunner.cloud.zookeeper.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "stubrunner.cloud.zookeeper.enabled", + matchIfMissing = true) public class StubRunnerSpringCloudZookeeperAutoConfiguration { @Bean(initMethod = "registerStubs") diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/StubRunnerSliceTests.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/StubRunnerSliceTests.java index 000601e3e9..86567e082a 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/StubRunnerSliceTests.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/StubRunnerSliceTests.java @@ -40,8 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat; @WebMvcTest @AutoConfigureStubRunner(ids = { "org.springframework.cloud.contract.verifier.stubs:loanIssuance:+:stubs", - "org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer:+:stubs" }, minPort = 10001, maxPort = 10020, mappingsOutputFolder = "target/outputmappings/", properties = { - "hello=world", "foo=bar" }) + "org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer:+:stubs" }, + minPort = 10001, maxPort = 10020, mappingsOutputFolder = "target/outputmappings/", + properties = { "hello=world", "foo=bar" }) @ActiveProfiles("test") public class StubRunnerSliceTests { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java index 25f3ad23d2..487f569a53 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java @@ -48,7 +48,8 @@ import org.springframework.cloud.contract.verifier.converter.ToYamlConverter; * * @author Mariusz Smykula */ -@Mojo(name = "convert", requiresProject = false, defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES) +@Mojo(name = "convert", requiresProject = false, + defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES) public class ConvertMojo extends AbstractMojo { static final String DEFAULT_STUBS_DIR = "${project.build.directory}/stubs/"; @@ -65,7 +66,8 @@ public class ConvertMojo extends AbstractMojo { * Directory containing Spring Cloud Contract Verifier contracts written using the * GroovyDSL. */ - @Parameter(property = "spring.cloud.contract.verifier.contractsDirectory", defaultValue = "${project.basedir}/src/test/resources/contracts") + @Parameter(property = "spring.cloud.contract.verifier.contractsDirectory", + defaultValue = "${project.basedir}/src/test/resources/contracts") private File contractsDirectory; /** diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java index 1cc82ba869..133bb4c93a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java @@ -39,13 +39,16 @@ import org.codehaus.plexus.archiver.jar.JarArchiver; * * @author Mariusz Smykula */ -@Mojo(name = "generateStubs", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true) +@Mojo(name = "generateStubs", defaultPhase = LifecyclePhase.PACKAGE, + requiresProject = true) public class GenerateStubsMojo extends AbstractMojo { - @Parameter(defaultValue = "${project.build.directory}", readonly = true, required = true) + @Parameter(defaultValue = "${project.build.directory}", readonly = true, + required = true) private File projectBuildDirectory; - @Parameter(property = "stubsDirectory", defaultValue = "${project.build.directory}/stubs") + @Parameter(property = "stubsDirectory", + defaultValue = "${project.build.directory}/stubs") private File outputDirectory; /** @@ -57,7 +60,8 @@ public class GenerateStubsMojo extends AbstractMojo { /** * Set this to "true" to bypass only JAR creation. */ - @Parameter(property = "spring.cloud.contract.verifier.jar.skip", defaultValue = "false") + @Parameter(property = "spring.cloud.contract.verifier.jar.skip", + defaultValue = "false") private boolean jarSkip; @Component diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java index 8c99f0ce80..a1441e613c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java @@ -49,7 +49,8 @@ import org.springframework.cloud.contract.verifier.config.TestMode; * * @author Mariusz Smykula */ -@Mojo(name = "generateTests", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, requiresDependencyResolution = ResolutionScope.TEST) +@Mojo(name = "generateTests", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, + requiresDependencyResolution = ResolutionScope.TEST) public class GenerateTestsMojo extends AbstractMojo { private final AetherStubDownloaderFactory aetherStubDownloaderFactory; @@ -57,13 +58,16 @@ public class GenerateTestsMojo extends AbstractMojo { @Parameter(defaultValue = "${repositorySystemSession}", readonly = true) private RepositorySystemSession repoSession; - @Parameter(property = "spring.cloud.contract.verifier.contractsDirectory", defaultValue = "${project.basedir}/src/test/resources/contracts") + @Parameter(property = "spring.cloud.contract.verifier.contractsDirectory", + defaultValue = "${project.basedir}/src/test/resources/contracts") private File contractsDirectory; - @Parameter(defaultValue = "${project.build.directory}/generated-test-sources/contracts") + @Parameter( + defaultValue = "${project.build.directory}/generated-test-sources/contracts") private File generatedTestSourcesDir; - @Parameter(defaultValue = "${project.build.directory}/generated-test-resources/contracts") + @Parameter( + defaultValue = "${project.build.directory}/generated-test-resources/contracts") private File generatedTestResourcesDir; @Parameter @@ -112,7 +116,8 @@ public class GenerateTestsMojo extends AbstractMojo { * Incubating feature. You can check the size of JSON arrays. If not turned on * explicitly will be disabled. */ - @Parameter(property = "spring.cloud.contract.verifier.assert.size", defaultValue = "false") + @Parameter(property = "spring.cloud.contract.verifier.assert.size", + defaultValue = "false") private boolean assertJsonSize; /** diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java index 70a0816a53..65e4a67c2e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java @@ -41,10 +41,12 @@ import org.springframework.util.StringUtils; @Mojo(name = "pushStubsToScm") public class PushStubsToScmMojo extends AbstractMojo { - @Parameter(defaultValue = "${project.build.directory}", readonly = true, required = true) + @Parameter(defaultValue = "${project.build.directory}", readonly = true, + required = true) private File projectBuildDirectory; - @Parameter(property = "stubsDirectory", defaultValue = "${project.build.directory}/stubs") + @Parameter(property = "stubsDirectory", + defaultValue = "${project.build.directory}/stubs") private File outputDirectory; /** @@ -56,7 +58,8 @@ public class PushStubsToScmMojo extends AbstractMojo { /** * Set this to "true" to bypass only JAR creation. */ - @Parameter(property = "spring.cloud.contract.verifier.publish-stubs-to-scm.skip", defaultValue = "false") + @Parameter(property = "spring.cloud.contract.verifier.publish-stubs-to-scm.skip", + defaultValue = "false") private boolean taskSkip; @Parameter(defaultValue = "${project}", readonly = true) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java index 58b26f27cf..5e85751daa 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java @@ -45,7 +45,8 @@ import org.springframework.util.StringUtils; * @author Mariusz Smykula */ @SuppressWarnings("FieldCanBeLocal") -@Mojo(name = "run", requiresProject = false, requiresDependencyResolution = ResolutionScope.RUNTIME) +@Mojo(name = "run", requiresProject = false, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class RunMojo extends AbstractMojo { private final LocalStubRunner localStubRunner; @@ -64,7 +65,8 @@ public class RunMojo extends AbstractMojo { /** * HTTP port for the WireMock server that serves stubs. */ - @Parameter(property = "spring.cloud.contract.verifier.http.port", defaultValue = "8080") + @Parameter(property = "spring.cloud.contract.verifier.http.port", + defaultValue = "8080") private int httpPort; /** @@ -76,7 +78,8 @@ public class RunMojo extends AbstractMojo { /** * Set this to "true" to bypass verifier test generation. */ - @Parameter(property = "spring.cloud.contract.verifier.skipTestOnly", defaultValue = "false") + @Parameter(property = "spring.cloud.contract.verifier.skipTestOnly", + defaultValue = "false") private boolean skipTestOnly; /** @@ -88,19 +91,22 @@ public class RunMojo extends AbstractMojo { /** * Minimal port at which the stub should start. */ - @Parameter(property = "spring.cloud.contract.verifier.http.minPort", defaultValue = "10000") + @Parameter(property = "spring.cloud.contract.verifier.http.minPort", + defaultValue = "10000") private int minPort; /** * Maximal port at which the stub should start. */ - @Parameter(property = "spring.cloud.contract.verifier.http.maxPort", defaultValue = "15000") + @Parameter(property = "spring.cloud.contract.verifier.http.maxPort", + defaultValue = "15000") private int maxPort; /** * Should the plugin wait for the user to press the key after starting the stubs. */ - @Parameter(property = "spring.cloud.contract.verifier.wait-for-key-pressed", defaultValue = "true") + @Parameter(property = "spring.cloud.contract.verifier.wait-for-key-pressed", + defaultValue = "true") private boolean waitForKeyPressed; /** diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/RabbitMockConnectionFactoryAutoConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/RabbitMockConnectionFactoryAutoConfiguration.java index 7a58bb8c96..25e629bbbf 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/RabbitMockConnectionFactoryAutoConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/RabbitMockConnectionFactoryAutoConfiguration.java @@ -44,7 +44,8 @@ import static org.mockito.Mockito.when; */ @Configuration @ConditionalOnBean(ContractVerifierAmqpAutoConfiguration.class) -@ConditionalOnProperty(value = "stubrunner.amqp.mockConnection", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(value = "stubrunner.amqp.mockConnection", havingValue = "true", + matchIfMissing = true) public class RabbitMockConnectionFactoryAutoConfiguration { @Bean diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java index 4e64329a5c..3563ca2dda 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java @@ -38,7 +38,8 @@ import org.springframework.context.annotation.Import; @Configuration @ConditionalOnClass(Message.class) @Import(CamelAutoConfiguration.class) -@ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true", + matchIfMissing = true) @AutoConfigureBefore(NoOpContractVerifierAutoConfiguration.class) public class ContractVerifierCamelConfiguration { diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java index 304c5c77a4..e5c8d77224 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java @@ -37,7 +37,8 @@ import org.springframework.util.Assert; */ @Configuration @ConditionalOnClass({ EnableBinding.class, MessageCollector.class }) -@ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true", + matchIfMissing = true) @AutoConfigureBefore(NoOpContractVerifierAutoConfiguration.class) public class ContractVerifierStreamAutoConfiguration { diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java index 1d6b4a14ee..c8d308a68c 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java @@ -40,7 +40,8 @@ public class WireMockRestTemplateConfiguration { @Bean @ConditionalOnClass(SSLContextBuilder.class) - @ConditionalOnProperty(value = "wiremock.rest-template-ssl-enabled", matchIfMissing = true) + @ConditionalOnProperty(value = "wiremock.rest-template-ssl-enabled", + matchIfMissing = true) public RestTemplateCustomizer wiremockRestTemplateCustomizer() { return new RestTemplateCustomizer() { @Override diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java index 99004282b9..f516f7543e 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java @@ -31,7 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 12345) public class AutoConfigureWireMockApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java index d597ae1bd9..538546909c 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java @@ -27,7 +27,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0) // Default stubs work at classpath:/mappings public class AutoConfigureWireMockAutoStubsApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockConfigurationCustomizerTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockConfigurationCustomizerTests.java index 27bef9801e..b12a14372e 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockConfigurationCustomizerTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockConfigurationCustomizerTests.java @@ -30,8 +30,11 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { WiremockTestsApplication.class, - AutoConfigureWireMockConfigurationCustomizerTests.Config.class }, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest( + classes = { WiremockTestsApplication.class, + AutoConfigureWireMockConfigurationCustomizerTests.Config.class }, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0, stubs = "file:src/test/resources/io.stubs/mappings") public class AutoConfigureWireMockConfigurationCustomizerTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java index 504705502d..5ed4f25399 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java @@ -27,7 +27,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0, files = "classpath:/root/") public class AutoConfigureWireMockFilesApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithUrlResourceTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithUrlResourceTests.java index 8138704918..a208bad219 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithUrlResourceTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithUrlResourceTests.java @@ -28,7 +28,10 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; @RunWith(SpringRunner.class) -@SpringBootTest(classes = AutoConfigureWireMockFilesApplicationWithUrlResourceTests.Config.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = SpringBootTest.WebEnvironment.NONE) +@SpringBootTest( + classes = AutoConfigureWireMockFilesApplicationWithUrlResourceTests.Config.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = SpringBootTest.WebEnvironment.NONE) // tag::load_all_stubs[] @AutoConfigureWireMock(port = 0, stubs = "classpath*:/META-INF/**/mappings/**/*.json") // end::load_all_stubs[] diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithoutSlashTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithoutSlashTests.java index 15948910bc..4225c0f5ae 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithoutSlashTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithoutSlashTests.java @@ -27,7 +27,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0, files = "classpath:root") public class AutoConfigureWireMockFilesApplicationWithoutSlashTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java index 6ba35a5422..bcb8b7415a 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java @@ -31,7 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=https://localhost:${wiremock.server.https-port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=https://localhost:${wiremock.server.https-port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(httpsPort = 9999, port = 0) public class AutoConfigureWireMockHttpsPortApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockPortApplicationTests.java index 888c07e0a7..b8579210ec 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockPortApplicationTests.java @@ -31,7 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 9999) public class AutoConfigureWireMockPortApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java index 4f50876101..b10ce68beb 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java @@ -33,7 +33,9 @@ import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0) public class AutoConfigureWireMockRandomPortApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java index 3f14ae5e3e..6ee166ff05 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java @@ -31,7 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=https://localhost:${wiremock.server.https-port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=https://localhost:${wiremock.server.https-port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0, httpsPort = 0) public class AutoConfigureWireMockRandomPortHttpsApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java index a497f3d846..aa39b24f50 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java @@ -31,7 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 9999) // Should manage to register public class AutoConfigureWireMockSamePortApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndFilesApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndFilesApplicationTests.java index 2a9871321a..946bd46dd0 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndFilesApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndFilesApplicationTests.java @@ -27,8 +27,11 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) -@AutoConfigureWireMock(port = 0, files = "classpath:/root/", stubs = "file:src/test/resources/io.stubs/mappings") +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) +@AutoConfigureWireMock(port = 0, files = "classpath:/root/", + stubs = "file:src/test/resources/io.stubs/mappings") public class AutoConfigureWireMockStubsAndFilesApplicationTests { @Autowired diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java index de6e233542..c545eb4a02 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java @@ -27,9 +27,12 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) -@AutoConfigureWireMock(port = 0, files = { "classpath:/", "classpath:/root/", - "classpath:/nonexistent/" }, stubs = "file:src/test/resources/io.stubs/mappings") +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) +@AutoConfigureWireMock(port = 0, + files = { "classpath:/", "classpath:/root/", "classpath:/nonexistent/" }, + stubs = "file:src/test/resources/io.stubs/mappings") public class AutoConfigureWireMockStubsAndMultipleFilesApplicationTests { @Autowired diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationTests.java index b7932a95df..7012f76a12 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationTests.java @@ -27,7 +27,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0, stubs = "file:src/test/resources/io.stubs/mappings") public class AutoConfigureWireMockStubsApplicationTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java index 5d7c026a54..8520e4a104 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java @@ -27,7 +27,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:${wiremock.server.port}", + webEnvironment = WebEnvironment.NONE) @AutoConfigureWireMock(port = 0, stubs = "file:src/test/resources/io.stubs/mappings/") public class AutoConfigureWireMockStubsApplicationWithSlashTests { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java index 49139fbb74..6b6145212c 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java @@ -32,7 +32,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=https://localhost:8443") +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=https://localhost:8443") public class WiremockHttpsServerApplicationTests { @ClassRule diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java index 7299c361e5..6136d4dcaa 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java @@ -33,7 +33,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = WiremockTestsApplication.class, properties = "app.baseUrl=http://localhost:5435", webEnvironment = WebEnvironment.NONE) +@SpringBootTest(classes = WiremockTestsApplication.class, + properties = "app.baseUrl=http://localhost:5435", + webEnvironment = WebEnvironment.NONE) public class WiremockServerApplicationTests { @ClassRule