From c7665db7d9dfe16961fc198d056636cc88babbe8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 12 Aug 2016 11:46:41 +0200 Subject: [PATCH] Fixed code style issues --- .../contract/stubrunner/AvailablePortScanner.java | 10 +++++++--- .../contract/stubrunner/StubRunnerExecutor.java | 4 +++- .../cloud/contract/stubrunner/StubRunnerMain.java | 4 +++- .../cloud/contract/stubrunner/StubServer.java | 10 +++++++--- .../stream/StubRunnerStreamConfiguration.java | 14 +++++++++----- .../stubrunner/server/TriggerController.java | 8 ++++++-- .../junit/StubRunnerRuleCustomPortJUnitTest.java | 11 +++++------ .../stubrunner/junit/StubRunnerRuleJUnitTest.java | 11 +++++------ .../wiremock/RecursiveFilesConverter.groovy | 4 +++- .../cloud/contract/maven/verifier/RunMojo.java | 2 +- .../verifier/stubrunner/RemoteStubRunner.java | 4 +++- .../contract/verifier/builder/MethodBuilder.groovy | 4 +++- .../verifier/builder/SingleTestGenerator.groovy | 8 ++++++-- .../verifier/util/JsonToJsonPathsConverter.groovy | 14 ++++++++++---- .../messaging/stream/StreamStubMessages.java | 14 +++++++++----- .../wiremock/restdocs/ContractRequestHandler.java | 8 ++++---- 16 files changed, 84 insertions(+), 46 deletions(-) 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 ce56613317..17efbc02c6 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 @@ -63,15 +63,19 @@ class AvailablePortScanner { return executeLogicForAvailablePort(portToScan, closure); } catch (IOException exception) { - log.debug("Failed to execute callback (try: " + i + "/" + maxRetryCount - + ")", exception); + if (log.isDebugEnabled()) { + log.debug("Failed to execute callback (try: " + i + "/" + maxRetryCount + + ")", exception); + } } } throw new NoPortAvailableException(minPortNumber, maxPortNumber); } private T executeLogicForAvailablePort(int portToScan, PortCallback closure) throws IOException { - log.debug("Trying to execute closure with port [$portToScan]"); + if (log.isDebugEnabled()) { + log.debug("Trying to execute closure with port [" + portToScan + "]"); + } return closure.call(portToScan); } 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 9149d36a63..8494234b2f 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 @@ -193,7 +193,9 @@ class StubRunnerExecutor implements StubFinder { final Collection contracts = repository.contracts; Integer port = stubRunnerOptions.port(stubConfiguration); if (!contracts.isEmpty() && !hasRequest(contracts)) { - log.debug("There are no HTTP related contracts. Won't start any servers"); + if (log.isDebugEnabled()) { + log.debug("There are no HTTP related contracts. Won't start any servers"); + } stubServer = new StubServer(stubConfiguration, mappings, contracts, new NoOpHttpServerStub()); return; } 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 438588ffd2..46f2ed1c14 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 @@ -92,7 +92,9 @@ public class StubRunnerMain { private void execute() { try { - log.debug("Launching StubRunner with args: " + arguments); + if (log.isDebugEnabled()) { + log.debug("Launching StubRunner with args: " + arguments); + } // TODO: Pass StubsToRun either from String or File BatchStubRunner stubRunner = new BatchStubRunnerFactory( arguments.getStubRunnerOptions()).buildBatchStubRunner(); 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 812f5b582f..5ca3dc7c21 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 @@ -59,8 +59,10 @@ class StubServer { if (httpServerStub.isRunning()) { return httpServerStub.port(); } - log.debug("The HTTP Server stub is not running... That means that the " + - "artifact is running a messaging module. Returning back -1 value of the port."); + if (log.isDebugEnabled()) { + log.debug("The HTTP Server stub is not running... That means that the " + + "artifact is running a messaging module. Returning back -1 value of the port."); + } return -1; } @@ -96,7 +98,9 @@ class StubServer { for (WiremockMappingDescriptor mappingDescriptor : sortedMappings) { try { wireMock.register(mappingDescriptor.getMapping()); - log.debug("Registered stub mappings from [" + mappingDescriptor.descriptor + "]"); + if (log.isDebugEnabled()) { + log.debug("Registered stub mappings from [" + mappingDescriptor.descriptor + "]"); + } } catch (Exception e) { log.warn("Failed to register the stub mapping ["+ mappingDescriptor + "]", e); } 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 a23241ae35..d89c31ef6c 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 @@ -126,14 +126,18 @@ public class StubRunnerStreamConfiguration { for (Map.Entry entry : channelBindingServiceProperties .getBindings().entrySet()) { if (entry.getValue().getDestination().equals(destination)) { - log.debug("Found a channel named [{}] with destination [{}]", - entry.getKey(), destination); + if (log.isDebugEnabled()) { + log.debug("Found a channel named [{}] with destination [{}]", + entry.getKey(), destination); + } return entry.getKey(); } } - log.debug( - "No destination named [{}] was found. Assuming that the destination equals the channel name", - destination); + if (log.isDebugEnabled()) { + log.debug( + "No destination named [{}] was found. Assuming that the destination equals the channel name", + destination); + } return destination; } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/TriggerController.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/TriggerController.java index d23b46218c..42d0e8f091 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/TriggerController.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/TriggerController.java @@ -54,7 +54,9 @@ public class TriggerController { stubFinder.trigger(label); return ResponseEntity.ok().body(Collections.>emptyMap()); } catch (Exception e) { - log.debug("Exception occurred while trying to return " + label + " label", e); + if (log.isDebugEnabled()) { + log.debug("Exception occurred while trying to return " + label + " label", e); + } return new ResponseEntity<>(stubFinder.labels(), HttpStatus.NOT_FOUND); } } @@ -65,7 +67,9 @@ public class TriggerController { stubFinder.trigger(ivyNotation, label); return ResponseEntity.ok().body(Collections.>emptyMap()); } catch (Exception e) { - log.debug("Exception occurred while trying to return " + label + " label", e); + if (log.isDebugEnabled()) { + log.debug("Exception occurred while trying to return " + label + " label", e); + } return new ResponseEntity<>(stubFinder.labels(), HttpStatus.NOT_FOUND); } } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleCustomPortJUnitTest.java b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleCustomPortJUnitTest.java index 2cbfa95bfe..6418f7a3b6 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleCustomPortJUnitTest.java +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleCustomPortJUnitTest.java @@ -16,19 +16,18 @@ package org.springframework.cloud.contract.stubrunner.junit; -import static org.assertj.core.api.BDDAssertions.then; - import java.io.InputStream; import java.net.URI; import java.nio.charset.Charset; -import org.assertj.core.api.BDDAssertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.springframework.util.StreamUtils; +import static org.assertj.core.api.BDDAssertions.then; + /** * @author Marcin Grzejszczak */ @@ -57,9 +56,9 @@ public class StubRunnerRuleCustomPortJUnitTest { then(rule.findStubUrl("loanIssuance")).isEqualTo(rule.findStubUrl("org.springframework.cloud.contract.verifier.stubs", "loanIssuance")); then(rule.findStubUrl("org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer")).isNotNull(); // and: - BDDAssertions.then(rule.findAllRunningStubs().isPresent("loanIssuance")).isTrue(); - BDDAssertions.then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs", "fraudDetectionServer")).isTrue(); - BDDAssertions.then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer")).isTrue(); + then(rule.findAllRunningStubs().isPresent("loanIssuance")).isTrue(); + then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs", "fraudDetectionServer")).isTrue(); + then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer")).isTrue(); // and: 'Stubs were registered' then(httpGet(rule.findStubUrl("loanIssuance").toString() + "/name")).isEqualTo("loanIssuance"); then(httpGet(rule.findStubUrl("fraudDetectionServer").toString() + "/name")).isEqualTo("fraudDetectionServer"); diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleJUnitTest.java b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleJUnitTest.java index 96f8153a18..512180121e 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleJUnitTest.java +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/junit/StubRunnerRuleJUnitTest.java @@ -16,19 +16,18 @@ package org.springframework.cloud.contract.stubrunner.junit; -import static org.assertj.core.api.BDDAssertions.then; - import java.io.InputStream; import java.net.URI; import java.nio.charset.Charset; -import org.assertj.core.api.BDDAssertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.springframework.util.StreamUtils; +import static org.assertj.core.api.BDDAssertions.then; + /** * @author Marcin Grzejszczak */ @@ -57,9 +56,9 @@ public class StubRunnerRuleJUnitTest { then(rule.findStubUrl("loanIssuance")).isEqualTo(rule.findStubUrl("org.springframework.cloud.contract.verifier.stubs", "loanIssuance")); then(rule.findStubUrl("org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer")).isNotNull(); // and: - BDDAssertions.then(rule.findAllRunningStubs().isPresent("loanIssuance")).isTrue(); - BDDAssertions.then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs", "fraudDetectionServer")).isTrue(); - BDDAssertions.then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer")).isTrue(); + then(rule.findAllRunningStubs().isPresent("loanIssuance")).isTrue(); + then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs", "fraudDetectionServer")).isTrue(); + then(rule.findAllRunningStubs().isPresent("org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer")).isTrue(); // and: 'Stubs were registered' then(httpGet(rule.findStubUrl("loanIssuance").toString() + "/name")).isEqualTo("loanIssuance"); then(httpGet(rule.findStubUrl("fraudDetectionServer").toString() + "/name")).isEqualTo("fraudDetectionServer"); diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy index 56ddd3f99e..5be7dec7ab 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy @@ -56,7 +56,9 @@ class RecursiveFilesConverter { void processFiles() { ContractFileScanner scanner = new ContractFileScanner(properties.contractsDslDir, properties.excludedFiles as Set, [] as Set) ListMultimap contracts = scanner.findContracts() - log.debug("Found the following contracts $contracts") + if (log.isDebugEnabled()) { + log.debug("Found the following contracts $contracts") + } contracts.asMap().entrySet().each { entry -> entry.value.each { ContractMetadata contract -> File sourceFile = contract.path.toFile() 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 69f6554b7a..d27ea8d96a 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 @@ -98,7 +98,7 @@ public class RunMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { if (skip || skipTestOnly) { - getLog().info("Skipping verifier execution: spring.cloud.contract.verifier.skip=" + String.valueOf(skip)); + getLog().info("Skipping verifier execution: spring.cloud.contract.verifier.skip=" + skip); return; } BatchStubRunner batchStubRunner = null; diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.java index b76f02ef69..e2bfb3f1c5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.java @@ -41,7 +41,9 @@ public class RemoteStubRunner { public BatchStubRunner run(StubRunnerOptions options, RepositorySystemSession repositorySystemSession) { AetherStubDownloader stubDownloader = aetherStubDownloaderFactory.build(repositorySystemSession); try { - log.debug("Launching StubRunner with args: " + String.valueOf(options)); + if (log.isDebugEnabled()) { + log.debug("Launching StubRunner with args: " + options); + } BatchStubRunner stubRunner = new BatchStubRunnerFactory(options, stubDownloader).buildBatchStubRunner(); RunningStubs runningCollaborators = stubRunner.runStubs(); diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy index 0d17899d91..c6ca7fcc3d 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy @@ -54,7 +54,9 @@ class MethodBuilder { * A factory method that creates a {@link MethodBuilder} for the given arguments */ static MethodBuilder createTestMethod(ContractMetadata contract, File stubsFile, Contract stubContent, ContractVerifierConfigProperties configProperties) { - log.debug("Stub content Groovy DSL [$stubContent]") + if (log.isDebugEnabled()) { + log.debug("Stub content Groovy DSL [$stubContent]") + } String methodName = NamesUtil.camelCase(NamesUtil.toLastDot(NamesUtil.afterLast(stubsFile.path, File.separator))) return new MethodBuilder(methodName, stubContent, configProperties, contract.ignored) } 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 aed6cefd27..90ffd53a46 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 @@ -120,7 +120,9 @@ class SingleTestGenerator { private Map mapContractsToTheirTestTypes(Collection listOfFiles) { return listOfFiles.collectEntries { File stubsFile = it.path.toFile() - log.debug("Stub content from file [${stubsFile.text}]") + if (log.isDebugEnabled()) { + log.debug("Stub content from file [${stubsFile.text}]") + } org.springframework.cloud.contract.spec.Contract stubContent = ContractVerifierDslConverter.convert(stubsFile) TestType testType = (stubContent.input || stubContent.outputMessage) ? TestType.MESSAGING : TestType.HTTP return [(new ParsedDsl(it, stubContent, stubsFile)): testType] @@ -169,7 +171,9 @@ class SingleTestGenerator { Class.forName(JSON_ASSERT_CLASS) return true } catch (ClassNotFoundException e) { - log.debug("JsonAssert is not present on classpath. Will not add a static import.") + if (log.isDebugEnabled()) { + log.debug("JsonAssert is not present on classpath. Will not add a static import.") + } return false } } diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy index 35ecbdc3e8..d7e07dc413 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy @@ -53,7 +53,9 @@ class JsonToJsonPathsConverter { JsonToJsonPathsConverter() { this.configProperties = new ContractVerifierConfigProperties() - log.debug("Creating JsonToJsonPaths converter with default properties") + if (log.isDebugEnabled()) { + log.debug("Creating JsonToJsonPaths converter with default properties") + } } public JsonPaths transformToJsonPathWithTestsSideValues(def json) { @@ -146,14 +148,18 @@ class JsonToJsonPathsConverter { configPropValue) { addArraySizeCheck(key, value, closure) } else { - log.debug("Turning off the incubating feature of JSON array check. " + - "System property [$systemPropValue]. Config property [$configPropValue]") + if (log.isDebugEnabled()) { + log.debug("Turning off the incubating feature of JSON array check. " + + "System property [$systemPropValue]. Config property [$configPropValue]") + } return } } private void addArraySizeCheck(MethodBufferingJsonVerifiable key, List value, Closure closure) { - log.debug("WARNING: Turning on the incubating feature of JSON array check") + if (log.isDebugEnabled()) { + log.debug("WARNING: Turning on the incubating feature of JSON array check") + } if (isRootElement(key) || key.assertsConcreteValue()) { if (value.size() > 0) { closure(key.hasSize(value.size()), value) 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 d6ac9ee0b0..8d493b80ab 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 @@ -86,14 +86,18 @@ public class StreamStubMessages implements MessageVerifier> { for (Map.Entry entry : channelBindingServiceProperties .getBindings().entrySet()) { if (entry.getValue().getDestination().equals(destination)) { - log.debug("Found a channel named [{}] with destination [{}]", - entry.getKey(), destination); + if (log.isDebugEnabled()) { + log.debug("Found a channel named [{}] with destination [{}]", + entry.getKey(), destination); + } return entry.getKey(); } } - log.debug( - "No destination named [{}] was found. Assuming that the destination equals the channel name", - destination); + if (log.isDebugEnabled()) { + log.debug( + "No destination named [{}] was found. Assuming that the destination equals the channel name", + destination); + } return destination; } diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractRequestHandler.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractRequestHandler.java index e6f70b1ea9..8a14e52c22 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractRequestHandler.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractRequestHandler.java @@ -16,8 +16,6 @@ package org.springframework.cloud.contract.wiremock.restdocs; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.util.HashMap; @@ -41,6 +39,8 @@ import com.github.tomakehurst.wiremock.servlet.WireMockHttpServletRequestAdapter import com.github.tomakehurst.wiremock.stubbing.StubMapping; import com.jayway.jsonpath.JsonPath; +import static org.assertj.core.api.Assertions.assertThat; + public class ContractRequestHandler implements ResultHandler { static final String ATTRIBUTE_NAME_CONFIGURATION = "org.springframework.restdocs.configuration"; @@ -134,9 +134,9 @@ public class ContractRequestHandler implements ResultHandler { private void compile(String expression, Object... args) { org.springframework.util.Assert.hasText( - (expression == null ? null : expression.toString()), + (expression == null ? null : expression), "expression must not be null or empty"); - expression = String.format(expression.toString(), args); + expression = String.format(expression, args); jsonPaths.put(expression, JsonPath.compile(expression)); }