From e135e618ec6011c3057397db88fb26bc9eb892d1 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 2 Feb 2017 17:16:36 +0100 Subject: [PATCH] Polish --- .../contract/stubrunner/WiremockMappingDescriptor.java | 4 ++-- .../wiremock/DslToWireMockClientConverterSpec.groovy | 4 ++-- .../verifier/wiremock/WireMockToDslConverterSpec.groovy | 4 ++-- ...eMock2_1_7_StubMapping.java => WireMockStubMapping.java} | 2 +- .../cloud/contract/verifier/dsl/WireMockStubVerifier.groovy | 4 ++-- ...tubMappingSpec.groovy => WireMockStubMappingSpec.groovy} | 6 +++--- .../cloud/contract/wiremock/WireMockConfiguration.java | 2 +- ...eMock2_1_7_StubMapping.java => WireMockStubMapping.java} | 2 +- ..._7_StubMappingTest.java => WireMockStubMappingTest.java} | 6 +++--- .../contract/wiremock/restdocs/WireMockSnippetTests.java | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-) rename spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/{WireMock2_1_7_StubMapping.java => WireMockStubMapping.java} (92%) rename spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/{WireMock2_1_7_StubMappingSpec.groovy => WireMockStubMappingSpec.groovy} (81%) rename spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/{WireMock2_1_7_StubMapping.java => WireMockStubMapping.java} (92%) rename spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/{WireMock2_1_7_StubMappingTest.java => WireMockStubMappingTest.java} (82%) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/WiremockMappingDescriptor.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/WiremockMappingDescriptor.java index 64b6eee23b..5a7a759c96 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/WiremockMappingDescriptor.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/WiremockMappingDescriptor.java @@ -21,7 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.nio.charset.Charset; -import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping; +import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping; import org.springframework.util.StreamUtils; import com.github.tomakehurst.wiremock.stubbing.StubMapping; @@ -40,7 +40,7 @@ class WiremockMappingDescriptor { public StubMapping getMapping() { try { - return WireMock2_1_7_StubMapping.buildFrom(StreamUtils.copyToString( + return WireMockStubMapping.buildFrom(StreamUtils.copyToString( new FileInputStream(this.descriptor), Charset.forName("UTF-8"))); } catch (IOException e) { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy index e31a1472fd..7d38754aa5 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy @@ -21,7 +21,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping import org.junit.Rule import org.junit.rules.TemporaryFolder import org.skyscreamer.jsonassert.JSONAssert -import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping +import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping import org.springframework.cloud.contract.verifier.file.ContractMetadata import spock.lang.Issue import spock.lang.Specification @@ -579,7 +579,7 @@ class DslToWireMockClientConverterSpec extends Specification { } void stubMappingIsValidWireMockStub(String mappingDefinition) { - StubMapping stubMapping = WireMock2_1_7_StubMapping.buildFrom(mappingDefinition) + StubMapping stubMapping = WireMockStubMapping.buildFrom(mappingDefinition) stubMapping.request.bodyPatterns.findAll { it.isPresent() && it instanceof RegexPattern }.every { Pattern.compile(it.getValue()) } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy index 1adf79a546..6200e1a072 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.verifier.wiremock import org.springframework.cloud.contract.spec.Contract -import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping +import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConverter import spock.lang.Specification @@ -554,6 +554,6 @@ class WireMockToDslConverterSpec extends Specification { } void stubMappingIsValidWireMockStub(String mappingDefinition) { - WireMock2_1_7_StubMapping.buildFrom(mappingDefinition) + WireMockStubMapping.buildFrom(mappingDefinition) } } diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMapping.java b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMapping.java similarity index 92% rename from spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMapping.java rename to spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMapping.java index 1f00d257a8..aa14eed7f4 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMapping.java +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMapping.java @@ -7,7 +7,7 @@ import com.jayway.jsonpath.JsonPath; /** * @author Marcin Grzejszczak */ -public class WireMock2_1_7_StubMapping { +public class WireMockStubMapping { public static StubMapping buildFrom(String mappingDefinition) { DocumentContext context = JsonPath.parse(mappingDefinition); context.delete("$.id"); diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy index c5ec9c3a44..73d03e7048 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.dsl import com.github.tomakehurst.wiremock.matching.RegexPattern import com.github.tomakehurst.wiremock.stubbing.StubMapping -import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping +import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubStrategy import org.springframework.cloud.contract.verifier.file.ContractMetadata @@ -27,7 +27,7 @@ import java.util.regex.Pattern trait WireMockStubVerifier { void stubMappingIsValidWireMockStub(String mappingDefinition) { - StubMapping stubMapping = WireMock2_1_7_StubMapping.buildFrom(mappingDefinition) + StubMapping stubMapping = WireMockStubMapping.buildFrom(mappingDefinition) stubMapping.request.bodyPatterns.findAll { it.isPresent() && it instanceof RegexPattern }.every { Pattern.compile(it.getValue()) } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMappingSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy similarity index 81% rename from spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMappingSpec.groovy rename to spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy index 30552eb690..01c874dad7 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMappingSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy @@ -7,7 +7,7 @@ import spock.lang.Specification /** * @author Marcin Grzejszczak */ -class WireMock2_1_7_StubMappingSpec extends Specification { +class WireMockStubMappingSpec extends Specification { private static final String stub_2_1_7 = """ { "request" : { @@ -33,14 +33,14 @@ class WireMock2_1_7_StubMappingSpec extends Specification { def "should successfully parse a WireMock 2.1.7 stub"() { when: - StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_1_7) + StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_1_7) then: JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false) } def "should successfully parse a WireMock 2.5.1 stub"() { when: - StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_5_1) + StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_5_1) then: JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false) } 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 97adb63c88..00619480d5 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 @@ -103,7 +103,7 @@ public class WireMockConfiguration implements SmartLifecycle { pattern = pattern + "**/*.json"; } for (Resource resource : resolver.getResources(pattern)) { - this.server.addStubMapping(WireMock2_1_7_StubMapping + this.server.addStubMapping(WireMockStubMapping .buildFrom(StreamUtils.copyToString(resource.getInputStream(), Charset.forName("UTF-8")))); } } diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMapping.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockStubMapping.java similarity index 92% rename from spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMapping.java rename to spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockStubMapping.java index b54c886061..62ebc4949f 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMapping.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockStubMapping.java @@ -7,7 +7,7 @@ import com.jayway.jsonpath.JsonPath; /** * @author Marcin Grzejszczak */ -public class WireMock2_1_7_StubMapping { +public class WireMockStubMapping { public static StubMapping buildFrom(String mappingDefinition) { DocumentContext context = JsonPath.parse(mappingDefinition); context.delete("$.id"); diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMappingTest.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMockStubMappingTest.java similarity index 82% rename from spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMappingTest.java rename to spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMockStubMappingTest.java index f2c5591879..9beca80d32 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMappingTest.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMockStubMappingTest.java @@ -8,14 +8,14 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping; /** * @author Marcin Grzejszczak */ -public class WireMock2_1_7_StubMappingTest { +public class WireMockStubMappingTest { private static final String stub_2_1_7 = "{\"request\" : { \"method\" : \"GET\" }, \"response\" : { \"status\" : 200 }}"; private static final String stub_2_5_1 = "{\"id\" : \"77514bd4-a102-4478-a3c0-0fda8b905591\", \"request\" : { \"method\" : \"GET\" }, \"response\" : { \"status\" : 200 }, \"uuid\" : \"77514bd4-a102-4478-a3c0-0fda8b905591\"}"; @Test public void should_successfully_parse_a_WireMock_2_1_7_stub() { // when: - StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_1_7); + StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_1_7); // then: JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false); } @@ -23,7 +23,7 @@ public class WireMock2_1_7_StubMappingTest { @Test public void should_successfully_parse_a_WireMock_2_5_1_stub() { // when: - StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_5_1); + StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_5_1); // then: JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java index 9d9d2c5109..47e1822c0c 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java @@ -15,7 +15,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.cloud.contract.wiremock.WireMock2_1_7_StubMapping; +import org.springframework.cloud.contract.wiremock.WireMockStubMapping; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -68,7 +68,7 @@ public class WireMockSnippetTests { File stub = new File(this.outputFolder, "stubs/foo.json"); assertThat(stub).exists(); - StubMapping stubMapping = WireMock2_1_7_StubMapping + StubMapping stubMapping = WireMockStubMapping .buildFrom(new String(Files.readAllBytes(stub.toPath()))); assertThat(stubMapping.getResponse().getStatus()) .isEqualTo(HttpStatus.ACCEPTED.value()); @@ -84,7 +84,7 @@ public class WireMockSnippetTests { File stub = new File(this.outputFolder, "stubs/foo.json"); assertThat(stub).exists(); - StubMapping stubMapping = WireMock2_1_7_StubMapping + StubMapping stubMapping = WireMockStubMapping .buildFrom(new String(Files.readAllBytes(stub.toPath()))); assertThat(stubMapping.getRequest().getBodyPatterns().get(0)) .isInstanceOf(EqualToJsonPattern.class);