From 64fe74fee7e18a08e408cf84d6134212ce16126f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 16 Mar 2018 16:55:25 +0100 Subject: [PATCH] Polish --- spring-cloud-contract-stub-runner/README.adoc | 2 +- .../stubrunner/spring/StubRunnerConfiguration.java | 8 ++------ .../cloud/contract/stubrunner/spring/StubRunnerPort.java | 2 +- .../cloud/ribbon/StubRunnerRibbonBeanPostProcessor.java | 2 +- .../spring/cloud/ribbon/StubRunnerRibbonServerList.java | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spring-cloud-contract-stub-runner/README.adoc b/spring-cloud-contract-stub-runner/README.adoc index af2200f4a0..1b3eec708d 100644 --- a/spring-cloud-contract-stub-runner/README.adoc +++ b/spring-cloud-contract-stub-runner/README.adoc @@ -391,7 +391,7 @@ for every registered WireMock server. Example for Stub Runner ids Which you can reference in your code. You can also use the `@StubRunnerPort` annotation to inject the port of a running stub. -Value of the annotation can be the `groupid.artifactid` or just the `artifactid`. Example for Stub Runner ids +Value of the annotation can be the `groupid:artifactid` or just the `artifactid`. Example for Stub Runner ids `com.example:foo`, `com.example:bar`. [source,java,indent=0] 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 5a3c340d9a..d581276728 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 @@ -35,8 +35,8 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.core.env.ConfigurableEnvironment; -import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.io.Resource; @@ -48,6 +48,7 @@ import org.springframework.core.io.Resource; @Configuration @EnableConfigurationProperties(StubRunnerProperties.class) @ConditionalOnMissingBean(type = "org.springframework.cloud.contract.wiremock.WiremockServerConfiguration") +@Import(StubRunnerPortBeanPostProcessor.class) public class StubRunnerConfiguration { static final String STUBRUNNER_PREFIX = "stubrunner.runningstubs"; @@ -82,11 +83,6 @@ public class StubRunnerConfiguration { return batchStubRunner; } - @Bean - StubRunnerPortBeanPostProcessor stubRunnerPortBeanPostProcessor(Environment environment) { - return new StubRunnerPortBeanPostProcessor(environment); - } - private StubRunnerOptionsBuilder builder() throws IOException { return new StubRunnerOptionsBuilder() .withMinMaxPort(this.props.getMinPort(), this.props.getMaxPort()) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerPort.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerPort.java index 0eb155ec3c..c6c202c2d8 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerPort.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerPort.java @@ -19,7 +19,7 @@ import java.lang.annotation.Target; public @interface StubRunnerPort { /** - * The {@code artifactid} or {@code groupid.artifactid} notation of the started stub + * The {@code artifactid} or {@code groupid:artifactid} notation of the started stub */ String value(); diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonBeanPostProcessor.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonBeanPostProcessor.java index 61549c3652..4284a5c82e 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonBeanPostProcessor.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonBeanPostProcessor.java @@ -68,7 +68,7 @@ class StubRunnerRibbonBeanPostProcessor implements BeanPostProcessor { @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof ServerList && !(bean instanceof StubRunnerRibbonServerList)) { - return new StubRunnerRibbonServerList(stubFinder(), stubMapperProperties(), clientConfig(), (ServerList) bean); + return new StubRunnerRibbonServerList(stubFinder(), stubMapperProperties(), clientConfig()); } return bean; } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java index 779f1abeb3..ce4eb47709 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java @@ -47,7 +47,7 @@ class StubRunnerRibbonServerList implements ServerList { StubRunnerRibbonServerList(final StubFinder stubFinder, final StubMapperProperties stubMapperProperties, - final IClientConfig clientConfig, final ServerList delegate) { + final IClientConfig clientConfig) { String serviceName = clientConfig.getClientName(); String mappedServiceName = StringUtils .hasText(stubMapperProperties.fromServiceIdToIvyNotation(serviceName)) ?