diff --git a/pom.xml b/pom.xml index 5551814fd0..fe1fedb0cd 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ 0.8.4 1.6.0 1.3.0 + 1.3.41 diff --git a/samples/standalone/kotlin/http-client/README.adoc b/samples/standalone/kotlin/http-client/README.adoc index cdcb0e4a56..8d085bf557 100644 --- a/samples/standalone/kotlin/http-client/README.adoc +++ b/samples/standalone/kotlin/http-client/README.adoc @@ -2,7 +2,7 @@ == Prerequisites -First you have to publish to Maven Local the stubs of the *http-server* module +First, you have to publish to Maven Local the stubs of the *http-server* module. == How to run it? diff --git a/samples/standalone/kotlin/http-server/src/main/kotlin/com/example/fraud/TestController.kt b/samples/standalone/kotlin/http-server/src/main/kotlin/com/example/fraud/TestController.kt index ac138d3f0b..c2c409b862 100644 --- a/samples/standalone/kotlin/http-server/src/main/kotlin/com/example/fraud/TestController.kt +++ b/samples/standalone/kotlin/http-server/src/main/kotlin/com/example/fraud/TestController.kt @@ -52,7 +52,7 @@ class TestController { if (!Arrays.equals(this.request, requestBody)) { throw IllegalStateException("Invalid request body"); } - return this.response; + return response; } } \ No newline at end of file diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpMethods.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpMethods.java index 2cd5528f3e..59869e13ab 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpMethods.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpMethods.java @@ -16,6 +16,9 @@ package org.springframework.cloud.contract.spec.internal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Contains Http Methods. * @@ -25,6 +28,13 @@ package org.springframework.cloud.contract.spec.internal; */ public final class HttpMethods { + private static final Log log = LogFactory.getLog(HttpMethods.class); + + public HttpMethods() { + log.warn( + "WARNING: HttpMethods shouldn't be instantiated. Use its static methods instead."); + } + /** * The HTTP {@code GET} method. */ diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpStatus.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpStatus.java index 0307ee8e46..c445c994b0 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpStatus.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpStatus.java @@ -16,6 +16,9 @@ package org.springframework.cloud.contract.spec.internal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Helper functions for HTTP statuses. * @@ -25,6 +28,13 @@ package org.springframework.cloud.contract.spec.internal; */ public final class HttpStatus { + private static final Log log = LogFactory.getLog(HttpStatus.class); + + public HttpStatus() { + log.warn( + "WARNING: HttpStatus shouldn't be instantiated. Use its static methods instead."); + } + /** * The HTTP {@code 100 Continue} status code. * @see HTTP/1.1: diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MediaTypes.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MediaTypes.java index b3a4b2514d..33ca3c6bcc 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MediaTypes.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MediaTypes.java @@ -16,6 +16,9 @@ package org.springframework.cloud.contract.spec.internal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Contains most commonly used media types. * @@ -25,6 +28,13 @@ package org.springframework.cloud.contract.spec.internal; */ public class MediaTypes { + private static final Log log = LogFactory.getLog(MediaTypes.class); + + public MediaTypes() { + log.warn( + "WARNING: MediaTypes shouldn't be instantiated. Use its static methods instead."); + } + /** * Public constant for that includes all media ranges (i.e. "*/*"). */ diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MessagingHeaders.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MessagingHeaders.java index 2099b47d71..1bc47b0542 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MessagingHeaders.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MessagingHeaders.java @@ -16,6 +16,9 @@ package org.springframework.cloud.contract.spec.internal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Contains most commonly used messaging headers. * @@ -25,6 +28,13 @@ package org.springframework.cloud.contract.spec.internal; */ public class MessagingHeaders { + private static final Log log = LogFactory.getLog(MessagingHeaders.class); + + public MessagingHeaders() { + log.warn( + "WARNING: MessagingHeaders shouldn't be instantiated. Use its static methods instead."); + } + /** * The Content-Type header name of a message. */ diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java index 8ef63de339..cc04dea4b2 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java @@ -20,6 +20,9 @@ import java.util.Arrays; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Contains most common regular expression patterns. * @@ -29,8 +32,11 @@ import java.util.stream.Collectors; */ public final class RegexPatterns { + private static final Log log = LogFactory.getLog(RegexPatterns.class); + public RegexPatterns() { - System.out.println("WARNING: RegexPatterns shouldn't be instantiated"); + log.warn( + "WARNING: RegexPatterns shouldn't be instantiated. Use its static methods instead."); } protected static final Pattern TRUE_OR_FALSE = Pattern.compile("(true|false)"); diff --git a/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpHeadersTests.java b/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpHeadersTests.java index 3181aecb27..0e77f6ccc4 100644 --- a/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpHeadersTests.java +++ b/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpHeadersTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; /** * @author Tim Ysewyn */ -public class HttpHeadersTests { +class HttpHeadersTests { @Test public void ACCEPT() { diff --git a/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpMethodsTests.java b/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpMethodsTests.java index 7b1e89ce8f..6fc3ae1538 100644 --- a/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpMethodsTests.java +++ b/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpMethodsTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; /** * @author Tim Ysewyn */ -public class HttpMethodsTests { +class HttpMethodsTests { @Test public void GET() { diff --git a/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/MediaTypesTests.java b/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/MediaTypesTests.java index bc71298151..693003af39 100644 --- a/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/MediaTypesTests.java +++ b/specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/MediaTypesTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; /** * @author Tim Ysewyn */ -public class MediaTypesTests { +class MediaTypesTests { @Test public void ALL_VALUE() { diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index 734b2a8890..f9071538bb 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -3,9 +3,6 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - 1.3.41 - org.springframework.cloud spring-cloud-contract-parent diff --git a/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/ContractDslMarker.kt b/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/ContractDslMarker.kt index 3d060e31c7..5f1240a752 100644 --- a/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/ContractDslMarker.kt +++ b/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/ContractDslMarker.kt @@ -17,7 +17,9 @@ package org.springframework.cloud.contract.spec.internal /** + * Marker to narrow the scope inside the lamda. * @author Tim Ysewyn + * @since 2.2.0 */ @DslMarker annotation class ContractDslMarker \ No newline at end of file diff --git a/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/FromRequestDsl.kt b/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/FromRequestDsl.kt index 59a3f6f295..7ca6498f9e 100644 --- a/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/FromRequestDsl.kt +++ b/specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/FromRequestDsl.kt @@ -52,7 +52,7 @@ class FromRequestDsl { fun path() = FromRequestDslProperty(template.escapedPath()) /** - * nth value of a URL path (zero indexed) e.g. {{{ request.path.[2] }}}* @param index. + * nth value of a URL path (zero indexed) e.g. {{{ request.path.[2] }}}*. * @param index path index * @return dsl property */ diff --git a/specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/internal/KotlinContractConverterTest.kt b/specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/internal/KotlinContractConverterTests.kt similarity index 98% rename from specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/internal/KotlinContractConverterTest.kt rename to specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/internal/KotlinContractConverterTests.kt index c66b02ed8d..3468ea9e80 100644 --- a/specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/internal/KotlinContractConverterTest.kt +++ b/specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/internal/KotlinContractConverterTests.kt @@ -22,7 +22,7 @@ import java.io.File import kotlin.test.assertEquals import kotlin.test.assertTrue -class KotlinContractConverterTest { +class KotlinContractConverterTests { @Test fun `accept kts files`() {