diff --git a/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java index 4f35f81e2b..fa59698f17 100644 --- a/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java @@ -43,7 +43,7 @@ class Service { @Value("${app.baseUrl:http://example.org}") private String base; - private RestTemplate restTemplate; + private final RestTemplate restTemplate; public Service(RestTemplate restTemplate) { this.restTemplate = restTemplate; diff --git a/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java index 4f35f81e2b..fa59698f17 100644 --- a/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java @@ -43,7 +43,7 @@ class Service { @Value("${app.baseUrl:http://example.org}") private String base; - private RestTemplate restTemplate; + private final RestTemplate restTemplate; public Service(RestTemplate restTemplate) { this.restTemplate = restTemplate; diff --git a/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java index 4f35f81e2b..fa59698f17 100644 --- a/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java @@ -43,7 +43,7 @@ class Service { @Value("${app.baseUrl:http://example.org}") private String base; - private RestTemplate restTemplate; + private final RestTemplate restTemplate; public Service(RestTemplate restTemplate) { this.restTemplate = restTemplate; diff --git a/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java index 4f35f81e2b..fa59698f17 100644 --- a/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java @@ -43,7 +43,7 @@ class Service { @Value("${app.baseUrl:http://example.org}") private String base; - private RestTemplate restTemplate; + private final RestTemplate restTemplate; public Service(RestTemplate restTemplate) { this.restTemplate = restTemplate; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java index bdbd727f37..709ed9db7e 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java @@ -68,7 +68,7 @@ class AetherFactories { return result; } - public static String localRepositoryDirectory() { + private static String localRepositoryDirectory() { return System.getProperty(MAVEN_LOCAL_REPOSITORY_LOCATION, System.getProperty("user.home") + "/.m2/repository"); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/Arguments.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/Arguments.java index 676f38b41c..0c4dce0085 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/Arguments.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/Arguments.java @@ -21,9 +21,8 @@ package org.springframework.cloud.contract.stubrunner; * * @see StubRunner */ -public class Arguments { +class Arguments { final private StubRunnerOptions stubRunnerOptions; - final private String context; final private String repositoryPath; final private StubConfiguration stub; @@ -35,7 +34,6 @@ public class Arguments { StubConfiguration stub) { this.stubRunnerOptions = stubRunnerOptions; this.repositoryPath = repositoryPath == null ? "" : repositoryPath; - this.context = null; // eh? this.stub = stub; } @@ -43,10 +41,6 @@ public class Arguments { return stubRunnerOptions; } - public String getContext() { - return context; - } - public String getRepositoryPath() { return repositoryPath; } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AvailablePortScanner.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AvailablePortScanner.java index 9facd4f7e3..ce56613317 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AvailablePortScanner.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AvailablePortScanner.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; /** * Tries to execute a closure with an available port from the given range */ -public class AvailablePortScanner { +class AvailablePortScanner { private static final Logger log = LoggerFactory.getLogger(AvailablePortScanner.class); @@ -89,20 +89,20 @@ public class AvailablePortScanner { @SuppressWarnings("serial") static class NoPortAvailableException extends RuntimeException { - protected NoPortAvailableException(int lowerBound, int upperBound) { + NoPortAvailableException(int lowerBound, int upperBound) { super("Could not find available port in range " + lowerBound + ":" + upperBound); } } @SuppressWarnings("serial") static class InvalidPortRange extends RuntimeException { - protected InvalidPortRange(int lowerBound, int upperBound) { + InvalidPortRange(int lowerBound, int upperBound) { super("Invalid bounds exceptions, min port [" + lowerBound + "] is greater to max port [" + upperBound + "]"); } } - public static interface PortCallback { + public interface PortCallback { T call(int port) throws IOException; } } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java index 5babddd107..710ad15327 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java @@ -35,10 +35,6 @@ public class BatchStubRunnerFactory { this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), new NoOpStubMessages()); } - public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, MessageVerifier contractVerifierMessaging) { - this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), contractVerifierMessaging); - } - public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader) { this(stubRunnerOptions, stubDownloader, new NoOpStubMessages()); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.java deleted file mode 100644 index c0df21b717..0000000000 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2013-2016 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.contract.stubrunner; - -import org.springframework.cloud.contract.spec.Contract; - -/** - * @author Marcin Grzejszczak - */ -class GroovyDslWrapper { - - final Contract groovyDsl; - - GroovyDslWrapper(Contract groovyDsl) { - this.groovyDsl = groovyDsl; - } - - boolean hasHttpPart() { - return groovyDsl.getRequest() != null; - } -} diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubDownloader.java index 87c22347e5..725a1827a8 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubDownloader.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubDownloader.java @@ -26,6 +26,4 @@ public interface StubDownloader { * If there was no artifact this method will return {@code null}. */ Map.Entry downloadAndUnpackStubJar(StubRunnerOptions options, StubConfiguration stubConfiguration); - - } \ No newline at end of file diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRepository.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRepository.java index de1a0ed28f..b815b00604 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRepository.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRepository.java @@ -37,7 +37,7 @@ import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConve /** * Wraps the folder with WireMock mappings. */ -public class StubRepository { +class StubRepository { private static final Logger log = LoggerFactory.getLogger(StubRepository.class); diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java index 89f3a2a51a..9149d36a63 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java @@ -54,7 +54,7 @@ class StubRunnerExecutor implements StubFinder { this.contractVerifierMessaging = contractVerifierMessaging; } - public StubRunnerExecutor(AvailablePortScanner portScanner) { + protected StubRunnerExecutor(AvailablePortScanner portScanner) { this(portScanner, new NoOpStubMessages()); } @@ -114,7 +114,6 @@ class StubRunnerExecutor implements StubFinder { matchingContracts.addAll(it.getValue()); } } - ; return triggerForDsls(matchingContracts, labelName); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java index 7d6f3b72d7..06fc9b8343 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java @@ -22,6 +22,7 @@ import org.kohsuke.args4j.Option; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("FieldCanBeLocal") public class StubRunnerMain { private static final Logger log = LoggerFactory.getLogger(StubRunnerMain.class); diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubServer.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubServer.java index c1521e9b9e..812f5b582f 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubServer.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubServer.java @@ -30,7 +30,7 @@ class StubServer { private static final Logger log = LoggerFactory.getLogger(StubServer.class); - private HttpServerStub httpServerStub; + private final HttpServerStub httpServerStub; final StubConfiguration stubConfiguration; final Collection mappings; final Collection contracts; @@ -77,10 +77,6 @@ class StubServer { return stubConfiguration; } - public Collection getMappings() { - return mappings; - } - public Collection getContracts() { return contracts; } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRule.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRule.java index f8067e292d..771cbb2ed6 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRule.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRule.java @@ -43,7 +43,7 @@ public class StubRunnerRule implements TestRule, StubFinder { private static final String DELIMITER = ":"; private static final String LATEST_VERSION = "+"; - private StubRunnerOptionsBuilder stubRunnerOptionsBuilder = new StubRunnerOptionsBuilder(defaultStubRunnerOptions()); + private final StubRunnerOptionsBuilder stubRunnerOptionsBuilder = new StubRunnerOptionsBuilder(defaultStubRunnerOptions()); private BatchStubRunner stubFinder; @Override diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicate.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicate.java index 7540e4c355..985ee3e66a 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicate.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicate.java @@ -39,8 +39,7 @@ import com.toomuchcoding.jsonassert.JsonVerifiable; * * @author Marcin Grzejszczak */ - -public class StubRunnerCamelPredicate implements Predicate { +class StubRunnerCamelPredicate implements Predicate { private final Contract groovyDsl; private final ContractVerifierObjectMapper objectMapper = new ContractVerifierObjectMapper(); diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.java index 9a0aba3aa7..d69147cd24 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.java @@ -34,15 +34,12 @@ import com.jayway.jsonpath.JsonPath; import com.toomuchcoding.jsonassert.JsonAssertion; import com.toomuchcoding.jsonassert.JsonVerifiable; -import groovy.transform.CompileStatic; - /** * Passes through a message that matches the one defined in the DSL * * @author Marcin Grzejszczak */ -@CompileStatic -public class StubRunnerIntegrationMessageSelector implements MessageSelector { +class StubRunnerIntegrationMessageSelector implements MessageSelector { private final Contract groovyDsl; private final ContractVerifierObjectMapper objectMapper = new ContractVerifierObjectMapper(); diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java index 59595d138f..8114b83203 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java @@ -30,7 +30,7 @@ import org.springframework.messaging.support.MessageBuilder; * * @author Marcin Grzejszczak */ -public class StubRunnerIntegrationTransformer implements GenericTransformer, Message> { +class StubRunnerIntegrationTransformer implements GenericTransformer, Message> { private final Contract groovyDsl; 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 e2c9f89431..a23241ae35 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 @@ -123,7 +123,6 @@ public class StubRunnerStreamConfiguration { String destination) { ChannelBindingServiceProperties channelBindingServiceProperties = context .getBean(ChannelBindingServiceProperties.class); - String resolvedDestination = destination; for (Map.Entry entry : channelBindingServiceProperties .getBindings().entrySet()) { if (entry.getValue().getDestination().equals(destination)) { @@ -135,12 +134,11 @@ public class StubRunnerStreamConfiguration { log.debug( "No destination named [{}] was found. Assuming that the destination equals the channel name", destination); - return resolvedDestination; + return destination; } - protected static class DummyMessageHandler { - public void handle(Message message) { - } + private static class DummyMessageHandler { + public void handle(Message message) {} } static class FlowRegistrar { diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamMessageSelector.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamMessageSelector.java index 93365b3f1e..9292707667 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamMessageSelector.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamMessageSelector.java @@ -39,7 +39,7 @@ import com.toomuchcoding.jsonassert.JsonVerifiable; * * @author Marcin Grzejszczak */ -public class StubRunnerStreamMessageSelector implements MessageSelector { +class StubRunnerStreamMessageSelector implements MessageSelector { private final Contract groovyDsl; private final ContractVerifierObjectMapper objectMapper = new ContractVerifierObjectMapper(); @@ -87,7 +87,7 @@ public class StubRunnerStreamMessageSelector implements MessageSelector { String name = it.getName(); Object value = it.getClientValue(); Object valueInHeader = headers.get(name); - boolean matches = true; + boolean matches; if (value instanceof Pattern) { Pattern pattern = (Pattern) value; matches = pattern.matcher(valueInHeader.toString()).matches(); @@ -95,7 +95,7 @@ public class StubRunnerStreamMessageSelector implements MessageSelector { matches = valueInHeader!=null && valueInHeader.equals(value); } if (!matches) { - return matches; + return false; } } return true; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java index 4dac28e446..2f46e6fa46 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java @@ -30,7 +30,7 @@ import org.springframework.messaging.support.MessageBuilder; * * @author Marcin Grzejszczak */ -public class StubRunnerStreamTransformer implements GenericTransformer, Message> { +class StubRunnerStreamTransformer implements GenericTransformer, Message> { private final Contract groovyDsl; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java index 6758e96bb9..b2f340b2fe 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak */ @Configuration -public class StubRunnerBackupAutoConfiguration { +class StubRunnerBackupAutoConfiguration { @Bean @ConditionalOnMissingBean diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerDiscoveryClient.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerDiscoveryClient.java index e4905c7814..eeff4e92d3 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerDiscoveryClient.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerDiscoveryClient.java @@ -38,7 +38,7 @@ import org.springframework.cloud.contract.stubrunner.util.StringUtils; * * @since 1.0.0 */ -public class StubRunnerDiscoveryClient implements DiscoveryClient { +class StubRunnerDiscoveryClient implements DiscoveryClient { private final DiscoveryClient delegate; private final StubFinder stubFinder; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerServiceInstance.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerServiceInstance.java index d34340f98e..91f0a0779c 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerServiceInstance.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerServiceInstance.java @@ -29,7 +29,7 @@ import org.springframework.cloud.client.ServiceInstance; * * @since 1.0.0 */ -public class StubRunnerServiceInstance implements ServiceInstance { +class StubRunnerServiceInstance implements ServiceInstance { private final String serviceId; private final String host; 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 e0efe4bc8d..0df24b8838 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 @@ -21,16 +21,16 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import com.netflix.client.config.IClientConfig; -import com.netflix.loadbalancer.Server; -import com.netflix.loadbalancer.ServerList; - import org.springframework.cloud.contract.stubrunner.RunningStubs; import org.springframework.cloud.contract.stubrunner.StubConfiguration; import org.springframework.cloud.contract.stubrunner.StubFinder; import org.springframework.cloud.contract.stubrunner.spring.cloud.StubMapperProperties; import org.springframework.cloud.contract.stubrunner.util.StringUtils; +import com.netflix.client.config.IClientConfig; +import com.netflix.loadbalancer.Server; +import com.netflix.loadbalancer.ServerList; + /** * Stub Runner representation of a server list * @@ -46,7 +46,7 @@ class StubRunnerRibbonServerList implements ServerList { StubRunnerRibbonServerList(final StubFinder stubFinder, final StubMapperProperties stubMapperProperties, final IClientConfig clientConfig, - final ServerList delegate) {; + final ServerList delegate) { String serviceName = clientConfig.getClientName(); String mappedServiceName = StringUtils .hasText(stubMapperProperties.fromServiceIdToIvyNotation(serviceName)) ? diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StringUtils.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StringUtils.java index 01cd4872fe..a4b9954faf 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StringUtils.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StringUtils.java @@ -22,8 +22,8 @@ package org.springframework.cloud.contract.stubrunner.util; * @author Marcin Grzejszczak */ public class StringUtils { - public static final String EMPTY = ""; - private static int INDEX_NOT_FOUND = -1; + private static final String EMPTY = ""; + private static final int INDEX_NOT_FOUND = -1; // Empty checks // ----------------------------------------------------------------------- @@ -48,11 +48,11 @@ public class StringUtils { * @param str the String to check, may be null * @return true if the String is empty or null */ - public static boolean isEmpty(String str) { + private static boolean isEmpty(String str) { return str == null || str.length() == 0; } - public static boolean isNotEmpty(String string) { + private static boolean isNotEmpty(String string) { return string != null && !string.isEmpty(); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StubsParser.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StubsParser.java index 0d61fee480..5d5b353830 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StubsParser.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StubsParser.java @@ -16,11 +16,9 @@ package org.springframework.cloud.contract.stubrunner.util; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; @@ -46,11 +44,6 @@ public class StubsParser { * * "a:b,c:d:e" */ - public static Set fromString(String list, String defaultClassifier) { - List splitList = Arrays.asList(list.split(",")); - return fromString(splitList, defaultClassifier); - } - public static Set fromString(Collection collection, String defaultClassifier) { Set stubs = new LinkedHashSet<>(); for (String config : collection) { @@ -89,8 +82,8 @@ public class StubsParser { private static class StubSpecification { - private StubConfiguration stub; - private Integer port; + private final StubConfiguration stub; + private final Integer port; public StubSpecification(StubConfiguration stub, Integer port) { this.stub = stub; @@ -98,7 +91,7 @@ public class StubsParser { } public boolean hasPort() { - return port!=null; + return port != null; } private static StubSpecification parse(String id, String defaultClassifier) { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java index b92bb47026..22b6a98d8e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java @@ -29,7 +29,7 @@ import org.apache.maven.shared.filtering.MavenResourcesFiltering; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CopyContracts { +class CopyContracts { private static final Logger log = LoggerFactory .getLogger(MethodHandles.lookup().lookupClass()); private final MavenProject project; diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ManifestCreator.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ManifestCreator.java index 74f82ae53b..d811547cf8 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ManifestCreator.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ManifestCreator.java @@ -20,17 +20,18 @@ import java.util.List; import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; import org.apache.maven.project.MavenProject; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.plexus.archiver.jar.Manifest; import org.codehaus.plexus.archiver.jar.ManifestException; -public class ManifestCreator { +class ManifestCreator { public static Manifest createManifest(MavenProject project) throws ManifestException { Manifest manifest = new Manifest(); Plugin verifierMavenPlugin = findMavenPlugin(project.getBuildPlugins()); - manifest.addConfiguredAttribute(new Manifest.Attribute( - "Spring-Cloud-Contract-Verifier-Maven-Plugin-Version", verifierMavenPlugin.getVersion())); - if (DefaultGroovyMethods.asBoolean(verifierMavenPlugin.getDependencies())) { + if (verifierMavenPlugin != null) { + manifest.addConfiguredAttribute(new Manifest.Attribute( + "Spring-Cloud-Contract-Verifier-Maven-Plugin-Version", verifierMavenPlugin.getVersion())); + } + if (verifierMavenPlugin != null && !verifierMavenPlugin.getDependencies().isEmpty()) { Dependency verifierDependency = findVerifierDependency(verifierMavenPlugin.getDependencies()); if (verifierDependency != null) { String verifierVersion = verifierDependency.getVersion(); 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 cc024bfda3..69f6554b7a 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 @@ -37,6 +37,7 @@ import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder; import static com.google.common.base.Strings.isNullOrEmpty; +@SuppressWarnings("FieldCanBeLocal") @Mojo(name = "run", requiresProject = false, requiresDependencyResolution = ResolutionScope.RUNTIME) public class RunMojo extends AbstractMojo { diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy index ef360cb6a4..aed6cefd27 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy @@ -20,6 +20,7 @@ import groovy.transform.Canonical import groovy.transform.EqualsAndHashCode import groovy.transform.PackageScope import groovy.util.logging.Slf4j +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties import org.springframework.cloud.contract.verifier.config.TestFramework import org.springframework.cloud.contract.verifier.file.ContractMetadata @@ -130,7 +131,7 @@ class SingleTestGenerator { @EqualsAndHashCode private static class ParsedDsl { ContractMetadata contract - org.springframework.cloud.contract.spec.Contract groovyDsl + Contract groovyDsl File stubsFile } @@ -139,10 +140,10 @@ class SingleTestGenerator { } private boolean isScenarioClass(Collection listOfFiles) { - listOfFiles.find({ it.order != null }) != null + return listOfFiles.find({ it.order != null }) != null } - private ClassBuilder addJsonPathRelatedImports(ClassBuilder clazz) { + private void addJsonPathRelatedImports(ClassBuilder clazz) { clazz.addImport(['com.jayway.jsonpath.DocumentContext', 'com.jayway.jsonpath.JsonPath', ]) @@ -151,7 +152,7 @@ class SingleTestGenerator { } } - private ClassBuilder addMessagingRelatedEntries(ClassBuilder clazz) { + private void addMessagingRelatedEntries(ClassBuilder clazz) { clazz.addField(['@Inject ContractVerifierMessaging contractVerifierMessaging', 'ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()' ]) diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy index 4735b691b5..c156ec3aaa 100755 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy @@ -62,7 +62,7 @@ class WireMockRequestStubStrategy extends BaseWireMockStubStrategy { private RequestPatternBuilder appendMethodAndUrl() { if(!request.method) { - return + return null } RequestMethod requestMethod = RequestMethod.fromString(request.method.clientValue?.toString()) UrlPattern urlPattern = urlPattern() diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/MethodBuffering.java b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/MethodBuffering.java index 12774b14bb..772aa031ae 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/MethodBuffering.java +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/MethodBuffering.java @@ -23,7 +23,7 @@ package org.springframework.cloud.contract.verifier.util; * * @since 1.0.0 */ -public interface MethodBuffering { +interface MethodBuffering { String method(); } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java index 221e23cb97..f0daaf83e3 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java @@ -24,7 +24,7 @@ import org.apache.camel.impl.DefaultMessage; /** * @author Marcin Grzejszczak */ -public class ContractVerifierCamelMessageBuilder { +class ContractVerifierCamelMessageBuilder { public Message create(T payload, Map headers) { DefaultMessage message = new DefaultMessage(); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java index a7f306b4af..554536f50f 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java @@ -25,7 +25,7 @@ import org.springframework.messaging.support.MessageBuilder; /** * @author Marcin Grzejszczak */ -public class ContractVerifierIntegrationMessageBuilder { +class ContractVerifierIntegrationMessageBuilder { public Message create(T payload, Map headers) { return MessageBuilder.createMessage(payload, new MessageHeaders(headers)); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java index 36c52fed64..4efb8cc661 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java @@ -26,7 +26,7 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; */ public class ContractVerifierMessaging { - private MessageVerifier exchange; + private final MessageVerifier exchange; public ContractVerifierMessaging(MessageVerifier exchange) { this.exchange = exchange; diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java index a78124a8be..6656d317fc 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java @@ -25,7 +25,7 @@ import org.springframework.messaging.support.MessageBuilder; /** * @author Marcin Grzejszczak */ -public class ContractVerifierStreamMessageBuilder { +class ContractVerifierStreamMessageBuilder { public Message create(T payload, Map headers) { return MessageBuilder.createMessage(payload, new MessageHeaders(headers)); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java index c0f5e2ef86..d6ac9ee0b0 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java @@ -83,7 +83,6 @@ public class StreamStubMessages implements MessageVerifier> { private String resolvedDestination(String destination) { ChannelBindingServiceProperties channelBindingServiceProperties = context .getBean(ChannelBindingServiceProperties.class); - String resolvedDestination = destination; for (Map.Entry entry : channelBindingServiceProperties .getBindings().entrySet()) { if (entry.getValue().getDestination().equals(destination)) { @@ -95,7 +94,7 @@ public class StreamStubMessages implements MessageVerifier> { log.debug( "No destination named [{}] was found. Assuming that the destination equals the channel name", destination); - return resolvedDestination; + return destination; } @Override diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java index b2e692bff4..9f1e342be5 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java @@ -76,7 +76,7 @@ import io.undertow.Undertow.Builder; * @author Dave Syer * */ -public class SpringBootHttpServerFactory implements HttpServerFactory { +class SpringBootHttpServerFactory implements HttpServerFactory { @Override public HttpServer buildHttpServer(Options options, diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java index 9f3338de0b..069bb3b513 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java @@ -31,7 +31,7 @@ import com.github.tomakehurst.wiremock.core.Options; * */ @Configuration -public class WireMockConfiguration implements SmartLifecycle { +class WireMockConfiguration implements SmartLifecycle { private volatile boolean running; diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockExpectations.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockExpectations.java index 9a7381a537..c82a00beff 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockExpectations.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockExpectations.java @@ -16,9 +16,6 @@ package org.springframework.cloud.contract.wiremock; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; -import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; - import java.io.IOException; import java.nio.charset.Charset; @@ -32,13 +29,16 @@ import org.springframework.web.client.RestTemplate; import com.github.tomakehurst.wiremock.common.Json; import com.github.tomakehurst.wiremock.stubbing.StubMapping; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; +import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; + /** * @author Dave Syer * */ public class WireMockExpectations { - private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + private final PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); private String prefix = "classpath:/stubs/"; @@ -85,8 +85,7 @@ public class WireMockExpectations { } public static WireMockExpectations with(RestTemplate restTemplate) { - WireMockExpectations result = new WireMockExpectations(restTemplate); - return result; + return new WireMockExpectations(restTemplate); } } diff --git a/tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy b/tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy index d528ff8e4f..3358f2063d 100644 --- a/tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy +++ b/tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy @@ -43,20 +43,23 @@ import com.toomuchcoding.jsonassert.JsonAssertion @ContextConfiguration(classes = [CamelMessagingApplication], loader = SpringBootContextLoader) @DirtiesContext @AutoConfigureMessageVerifier -public class CamelMessagingApplicationSpec extends Specification { +class CamelMessagingApplicationSpec extends Specification { // ALL CASES + @Autowired ModelCamelContext camelContext + @Autowired BookDeleter bookDeleter @Inject MessageVerifier contractVerifierMessaging + ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper() - + @BeforeClass - void init() { + static void init() { System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*") } def "should work for triggered based messaging"() { given: - def dsl = Contract.make { + Contract.make { label 'some_label' input { triggeredBy('bookReturnedTriggered()') @@ -82,7 +85,7 @@ public class CamelMessagingApplicationSpec extends Specification { def "should generate tests triggered by a message"() { given: - def dsl = Contract.make { + Contract.make { label 'some_label' input { messageFrom('jms:input') @@ -104,9 +107,7 @@ public class CamelMessagingApplicationSpec extends Specification { } } } - // generated test should look like this: - when: contractVerifierMessaging.send( contractVerifierObjectMapper.writeValueAsString([bookName: 'foo']), @@ -121,7 +122,7 @@ public class CamelMessagingApplicationSpec extends Specification { def "should generate tests without destination, triggered by a message"() { given: - def dsl = Contract.make { + Contract.make { label 'some_label' input { messageFrom('jms:delete') @@ -134,9 +135,7 @@ public class CamelMessagingApplicationSpec extends Specification { assertThat('bookWasDeleted()') } } - // generated test should look like this: - when: contractVerifierMessaging.send(contractVerifierObjectMapper.writeValueAsString([bookName: 'foo']), [sample: 'header'], 'jms:delete') @@ -145,11 +144,6 @@ public class CamelMessagingApplicationSpec extends Specification { bookWasDeleted() } - // BASE CLASS WOULD HAVE THIS: - - @Autowired ModelCamelContext camelContext - @Autowired BookDeleter bookDeleter - void bookReturnedTriggered() { camelContext.createProducerTemplate().sendBody('direct:start', '''{"bookName" : "foo" }''') } diff --git a/tests/samples-messaging-integration/src/main/java/com/example/BookListener.java b/tests/samples-messaging-integration/src/main/java/com/example/BookListener.java index b7bf900ab1..6e892135a5 100644 --- a/tests/samples-messaging-integration/src/main/java/com/example/BookListener.java +++ b/tests/samples-messaging-integration/src/main/java/com/example/BookListener.java @@ -25,6 +25,8 @@ import org.springframework.messaging.support.MessageBuilder; public class BookListener { + public AtomicBoolean bookSuccessfullyDeleted = new AtomicBoolean(false); + private static final Logger log = LoggerFactory.getLogger(BookListener.class); /** @@ -34,7 +36,7 @@ public class BookListener { * upon receiving message on the output messageFrom */ public Message returnBook(BookReturned bookReturned) { - log.info("Returning book [$bookReturned]"); + log.info("Returning book [" + bookReturned + "]"); return MessageBuilder.withPayload(bookReturned) .setHeader("BOOK-NAME", bookReturned.bookName).build(); } @@ -46,9 +48,7 @@ public class BookListener { * upon receiving message on the output messageFrom */ public void bookDeleted(BookDeleted bookDeleted) { - log.info("Deleting book [$bookDeleted]"); - bookSuccessfulyDeleted.set(true); + log.info("Deleting book [ "+ bookDeleted + "]"); + bookSuccessfullyDeleted.set(true); } - - public AtomicBoolean bookSuccessfulyDeleted = new AtomicBoolean(false); } diff --git a/tests/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy b/tests/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy index e1cd234d5c..1b1778dffa 100644 --- a/tests/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy +++ b/tests/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy @@ -161,7 +161,7 @@ public class IntegrationMessagingApplicationSpec extends Specification { } void bookWasDeleted() { - assert bookListener.bookSuccessfulyDeleted.get() + assert bookListener.bookSuccessfullyDeleted.get() } } \ No newline at end of file diff --git a/tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java b/tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java index 32240b5160..37860cc164 100644 --- a/tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java +++ b/tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java @@ -25,7 +25,7 @@ import org.springframework.messaging.SubscribableChannel; */ interface DeleteSink extends Sink { - static String INPUT = "delete"; + String INPUT = "delete"; @Input(DeleteSink.INPUT) SubscribableChannel delete();