diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle index db891ccfe5..66a3f7c2ce 100644 --- a/samples/standalone/restdocs/http-server/build.gradle +++ b/samples/standalone/restdocs/http-server/build.gradle @@ -5,9 +5,6 @@ buildscript { maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/release" } - maven { url 'https://repo.spring.io/plugins-snapshot' } - maven { url "https://repo.spring.io/plugins-release-local" } - maven { url "https://repo.spring.io/plugins-staging-local/" } } dependencies { classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}" diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/BodyMatchers.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/BodyMatchers.java index 544c3fe142..a8afb2f9cc 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/BodyMatchers.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/BodyMatchers.java @@ -52,15 +52,6 @@ public class BodyMatchers { this.matchers.add(new PathBodyMatcher(xPath, matchingTypeValue)); } - /** - * @deprecated use{@link #matchers()} - * @return json path matchers - */ - @Deprecated - public List jsonPathMatchers() { - return matchers(); - } - public boolean hasMatchers() { return !this.matchers.isEmpty(); } diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpHeaders.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpHeaders.java index 5f1782348f..1f2eeb8c3e 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpHeaders.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpHeaders.java @@ -433,653 +433,4 @@ public final class HttpHeaders { */ public static final String WWW_AUTHENTICATE = "WWW-Authenticate"; - /** - * @return The HTTP {@code Accept} header field name. - * @see Section 5.3.2 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.ACCEPT}. - */ - @Deprecated - public String accept() { - return ACCEPT; - } - - /** - * @return The HTTP {@code Accept-Charset} header field name. - * @see Section 5.3.3 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.ACCEPT_CHARSET}. - */ - @Deprecated - public String acceptCharset() { - return ACCEPT_CHARSET; - } - - /** - * @return The HTTP {@code Accept-Encoding} header field name. - * @see Section 5.3.4 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.ACCEPT_ENCODING}. - */ - @Deprecated - public String acceptEncoding() { - return ACCEPT_ENCODING; - } - - /** - * @return The HTTP {@code Accept-Language} header field name. - * @see Section 5.3.5 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.ACCEPT_LANGUAGE}. - */ - @Deprecated - public String acceptLanguage() { - return ACCEPT_LANGUAGE; - } - - /** - * @return The HTTP {@code Accept-Ranges} header field name. - * @see Section 5.3.5 of RFC - * 7233 - * @deprecated Replaced by {@code HttpHeaders.ACCEPT_RANGES}. - */ - @Deprecated - public String acceptRanges() { - return ACCEPT_RANGES; - } - - /** - * @return The CORS {@code Access-Control-Allow-Credentials} response header field - * name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS}. - */ - @Deprecated - public String accessControlAllowCredentials() { - return ACCESS_CONTROL_ALLOW_CREDENTIALS; - } - - /** - * @return The CORS {@code Access-Control-Allow-Headers} response header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS}. - */ - @Deprecated - public String accessControlAllowHeaders() { - return ACCESS_CONTROL_ALLOW_HEADERS; - } - - /** - * @return The CORS {@code Access-Control-Allow-Methods} response header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS}. - */ - @Deprecated - public String accessControlAllowMethods() { - return ACCESS_CONTROL_ALLOW_METHODS; - } - - /** - * @return The CORS {@code Access-Control-Allow-Origin} response header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN}. - */ - @Deprecated - public String accessControlAllowOrigin() { - return ACCESS_CONTROL_ALLOW_ORIGIN; - } - - /** - * @return The CORS {@code Access-Control-Expose-Headers} response header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS}. - */ - @Deprecated - public String accessControlExposeHeaders() { - return ACCESS_CONTROL_EXPOSE_HEADERS; - } - - /** - * @return The CORS {@code Access-Control-Max-Age} response header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_MAX_AGE}. - */ - @Deprecated - public String accessControlMaxAge() { - return ACCESS_CONTROL_MAX_AGE; - } - - /** - * @return The CORS {@code Access-Control-Request-Headers} request header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS}. - */ - @Deprecated - public String accessControlRequestHeaders() { - return ACCESS_CONTROL_REQUEST_HEADERS; - } - - /** - * @return The CORS {@code Access-Control-Request-Method} request header field name. - * @see CORS W3C recommendation - * @deprecated Replaced by {@code HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD}. - */ - @Deprecated - public String accessControlRequestMethod() { - return ACCESS_CONTROL_REQUEST_METHOD; - } - - /** - * @return The HTTP {@code Age} header field name. - * @see Section 5.1 of RFC - * 7234 - * @deprecated Replaced by {@code HttpHeaders.AGE}. - */ - @Deprecated - public String age() { - return AGE; - } - - /** - * @return The HTTP {@code Allow} header field name. - * @see Section 7.4.1 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.ALLOW}. - */ - @Deprecated - public String allow() { - return ALLOW; - } - - /** - * @return The HTTP {@code Authorization} header field name. - * @see Section 4.2 of RFC - * 7235 - * @deprecated Replaced by {@code HttpHeaders.AUTHORIZATION}. - */ - @Deprecated - public String authorization() { - return AUTHORIZATION; - } - - /** - * @return The HTTP {@code Cache-Control} header field name. - * @see Section 5.2 of RFC - * 7234 - * @deprecated Replaced by {@code HttpHeaders.CACHE_CONTROL}. - */ - @Deprecated - public String cacheControl() { - return CACHE_CONTROL; - } - - /** - * @return The HTTP {@code Connection} header field name. - * @see Section 6.1 of RFC - * 7230 - * @deprecated Replaced by {@code HttpHeaders.CONNECTION}. - */ - @Deprecated - public String connection() { - return CONNECTION; - } - - /** - * @return The HTTP {@code Content-Encoding} header field name. - * @see Section 3.1.2.2 - * of RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_ENCODING}. - */ - @Deprecated - public String contentEncoding() { - return CONTENT_ENCODING; - } - - /** - * @return The HTTP {@code Content-Disposition} header field name - * @see RFC 6266 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_DISPOSITION}. - */ - @Deprecated - public String contentDisposition() { - return CONTENT_DISPOSITION; - } - - /** - * @return The HTTP {@code Content-Language} header field name. - * @see Section 3.1.3.2 - * of RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_LANGUAGE}. - */ - @Deprecated - public String contentLanguage() { - return CONTENT_LANGUAGE; - } - - /** - * @return The HTTP {@code Content-Length} header field name. - * @see Section 3.3.2 of - * RFC 7230 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_LENGTH}. - */ - @Deprecated - public String contentLength() { - return CONTENT_LENGTH; - } - - /** - * @return The HTTP {@code Content-Location} header field name. - * @see Section 3.1.4.2 - * of RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_LOCATION}. - */ - @Deprecated - public String contentLocation() { - return CONTENT_LOCATION; - } - - /** - * @return The HTTP {@code Content-Range} header field name. - * @see Section 4.2 of RFC - * 7233 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_RANGE}. - */ - @Deprecated - public String contentRange() { - return CONTENT_RANGE; - } - - /** - * @return The HTTP {@code Content-Type} header field name. - * @see Section 3.1.1.5 - * of RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.CONTENT_TYPE}. - */ - @Deprecated - public String contentType() { - return CONTENT_TYPE; - } - - /** - * @return The HTTP {@code Cookie} header field name. - * @see Section 4.3.4 of - * RFC 2109 - * @deprecated Replaced by {@code HttpHeaders.COOKIE}. - */ - @Deprecated - public String cookie() { - return COOKIE; - } - - /** - * @return The HTTP {@code Date} header field name. - * @see Section 7.1.1.2 - * of RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.DATE}. - */ - @Deprecated - public String date() { - return DATE; - } - - /** - * @return The HTTP {@code ETag} header field name. - * @see Section 2.3 of RFC - * 7232 - * @deprecated Replaced by {@code HttpHeaders.ETAG}. - */ - @Deprecated - public String etag() { - return ETAG; - } - - /** - * @return The HTTP {@code Expect} header field name. - * @see Section 5.1.1 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.EXPECT}. - */ - @Deprecated - public String expect() { - return EXPECT; - } - - /** - * @return The HTTP {@code Expires} header field name. - * @see Section 5.3 of RFC - * 7234 - * @deprecated Replaced by {@code HttpHeaders.EXPIRES}. - */ - @Deprecated - public String expires() { - return EXPIRES; - } - - /** - * @return The HTTP {@code From} header field name. - * @see Section 5.5.1 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.FROM}. - */ - @Deprecated - public String from() { - return FROM; - } - - /** - * @return The HTTP {@code Host} header field name. - * @see Section 5.4 of RFC - * 7230 - * @deprecated Replaced by {@code HttpHeaders.HOST}. - */ - @Deprecated - public String host() { - return HOST; - } - - /** - * @return The HTTP {@code If-Match} header field name. - * @see Section 3.1 of RFC - * 7232 - * @deprecated Replaced by {@code HttpHeaders.IF_MATCH}. - */ - @Deprecated - public String ifMatch() { - return IF_MATCH; - } - - /** - * @return The HTTP {@code If-Modified-Since} header field name. - * @see Section 3.3 of RFC - * 7232 - * @deprecated Replaced by {@code HttpHeaders.IF_MODIFIED_SINCE}. - */ - @Deprecated - public String ifModifiedSince() { - return IF_MODIFIED_SINCE; - } - - /** - * @return The HTTP {@code If-None-Match} header field name. - * @see Section 3.2 of RFC - * 7232 - * @deprecated Replaced by {@code HttpHeaders.IF_NONE_MATCH}. - */ - @Deprecated - public String ifNoneMatch() { - return IF_NONE_MATCH; - } - - /** - * @return The HTTP {@code If-Range} header field name. - * @see Section 3.2 of RFC - * 7233 - * @deprecated Replaced by {@code HttpHeaders.IF_RANGE}. - */ - @Deprecated - public String ifRange() { - return IF_RANGE; - } - - /** - * @return The HTTP {@code If-Unmodified-Since} header field name. - * @see Section 3.4 of RFC - * 7232 - * @deprecated Replaced by {@code HttpHeaders.IF_UNMODIFIED_SINCE}. - */ - @Deprecated - public String ifUnmodifiedSince() { - return IF_UNMODIFIED_SINCE; - } - - /** - * @return The HTTP {@code Last-Modified} header field name. - * @see Section 2.2 of RFC - * 7232 - * @deprecated Replaced by {@code HttpHeaders.LAST_MODIFIED}. - */ - @Deprecated - public String lastModified() { - return LAST_MODIFIED; - } - - /** - * @return The HTTP {@code Link} header field name. - * @see RFC 5988 - * @deprecated Replaced by {@code HttpHeaders.LINK}. - */ - @Deprecated - public String link() { - return LINK; - } - - /** - * @return The HTTP {@code Location} header field name. - * @see Section 7.1.2 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.LOCATION}. - */ - @Deprecated - public String location() { - return LOCATION; - } - - /** - * @return The HTTP {@code Max-Forwards} header field name. - * @see Section 5.1.2 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.MAX_FORWARDS}. - */ - @Deprecated - public String max_forwards() { - return MAX_FORWARDS; - } - - /** - * @return The HTTP {@code Origin} header field name. - * @see RFC 6454 - * @deprecated Replaced by {@code HttpHeaders.ORIGIN}. - */ - @Deprecated - public String origin() { - return ORIGIN; - } - - /** - * @return The HTTP {@code Pragma} header field name. - * @see Section 5.4 of RFC - * 7234 - * @deprecated Replaced by {@code HttpHeaders.PRAGMA}. - */ - @Deprecated - public String pragma() { - return PRAGMA; - } - - /** - * @return The HTTP {@code Proxy-Authenticate} header field name. - * @see Section 4.3 of RFC - * 7235 - * @deprecated Replaced by {@code HttpHeaders.PROXY_AUTHENTICATE}. - */ - @Deprecated - public String proxyAuthenticate() { - return PROXY_AUTHENTICATE; - } - - /** - * @return The HTTP {@code Proxy-Authorization} header field name. - * @see Section 4.4 of RFC - * 7235 - * @deprecated Replaced by {@code HttpHeaders.PROXY_AUTHORIZATION}. - */ - @Deprecated - public String proxyAuthorization() { - return PROXY_AUTHORIZATION; - } - - /** - * @return The HTTP {@code Range} header field name. - * @see Section 3.1 of RFC - * 7233 - * @deprecated Replaced by {@code HttpHeaders.RANGE}. - */ - @Deprecated - public String range() { - return RANGE; - } - - /** - * @return The HTTP {@code Referer} header field name. - * @see Section 5.5.2 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.REFERER}. - */ - @Deprecated - public String referer() { - return REFERER; - } - - /** - * @return The HTTP {@code Retry-After} header field name. - * @see Section 7.1.3 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.RETRY_AFTER}. - */ - @Deprecated - public String retryAfter() { - return RETRY_AFTER; - } - - /** - * @return The HTTP {@code Server} header field name. - * @see Section 7.4.2 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.server}. - */ - @Deprecated - public String server() { - return SERVER; - } - - /** - * @return The HTTP {@code Set-Cookie} header field name. - * @see Section 4.2.2 of - * RFC 2109 - * @deprecated Replaced by {@code HttpHeaders.SET_COOKIE}. - */ - @Deprecated - public String setCookie() { - return SET_COOKIE; - } - - /** - * @return The HTTP {@code Set-Cookie2} header field name. - * @see RFC 2965 - * @deprecated Replaced by {@code HttpHeaders.SET_COOKIE_2}. - */ - @Deprecated - public String setCookie2() { - return SET_COOKIE_2; - } - - /** - * @return The HTTP {@code TE} header field name. - * @see Section 4.3 of RFC - * 7230 - * @deprecated Replaced by {@code HttpHeaders.TE}. - */ - @Deprecated - public String te() { - return TE; - } - - /** - * @return The HTTP {@code Trailer} header field name. - * @see Section 4.4 of RFC - * 7230 - * @deprecated Replaced by {@code HttpHeaders.TRAILER}. - */ - @Deprecated - public String trailer() { - return TRAILER; - } - - /** - * @return The HTTP {@code Transfer-Encoding} header field name. - * @see Section 3.3.1 of - * RFC 7230 - * @deprecated Replaced by {@code HttpHeaders.TRANSFER_ENCODING}. - */ - @Deprecated - public String transferEncoding() { - return TRANSFER_ENCODING; - } - - /** - * @return The HTTP {@code Upgrade} header field name. - * @see Section 6.7 of RFC - * 7230 - * @deprecated Replaced by {@code HttpHeaders.UPGRADE}. - */ - @Deprecated - public String upgrade() { - return UPGRADE; - } - - /** - * @return The HTTP {@code User-Agent} header field name. - * @see Section 5.5.3 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.USER_AGENT}. - */ - @Deprecated - public String user_agent() { - return USER_AGENT; - } - - /** - * @return The HTTP {@code Vary} header field name. - * @see Section 7.1.4 of - * RFC 7231 - * @deprecated Replaced by {@code HttpHeaders.VARY}. - */ - @Deprecated - public String vary() { - return VARY; - } - - /** - * @return The HTTP {@code Via} header field name. - * @see Section 5.7.1 of - * RFC 7230 - * @deprecated Replaced by {@code HttpHeaders.VIA}. - */ - @Deprecated - public String via() { - return VIA; - } - - /** - * @return The HTTP {@code Warning} header field name. - * @see Section 5.5 of RFC - * 7234 - * @deprecated Replaced by {@code HttpHeaders.WARNING}. - */ - @Deprecated - public String warning() { - return WARNING; - } - - /** - * @return The HTTP {@code WWW-Authenticate} header field name. - * @see Section 4.1 of RFC - * 7235 - * @deprecated Replaced by {@code HttpHeaders.WWW_AUTHENTICATE}. - */ - @Deprecated - public String wwwAuthenticate() { - return WWW_AUTHENTICATE; - } - } 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 d6a78504ff..1f5ebbcc6b 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 @@ -74,78 +74,6 @@ public final class HttpMethods { */ public static String TRACE = "TRACE"; - /** - * @return {@code GET}. - * @deprecated Replaced by {@code HttpMethods.GET}. - */ - @Deprecated - public HttpMethod GET() { - return HttpMethod.GET; - } - - /** - * @return {@code HEAD}. - * @deprecated Replaced by {@code HttpMethods.HEAD}. - */ - @Deprecated - public HttpMethod HEAD() { - return HttpMethod.HEAD; - } - - /** - * @return {@code POST}. - * @deprecated Replaced by {@code HttpMethods.POST}. - */ - @Deprecated - public HttpMethod POST() { - return HttpMethod.POST; - } - - /** - * @return {@code PUT}. - * @deprecated Replaced by {@code HttpMethods.PUT}. - */ - @Deprecated - public HttpMethod PUT() { - return HttpMethod.PUT; - } - - /** - * @return {@code PATCH}. - * @deprecated Replaced by {@code HttpMethods.PATCH}. - */ - @Deprecated - public HttpMethod PATCH() { - return HttpMethod.PATCH; - } - - /** - * @return {@code DELETE}. - * @deprecated Replaced by {@code HttpMethods.DELETE}. - */ - @Deprecated - public HttpMethod DELETE() { - return HttpMethod.DELETE; - } - - /** - * @return {@code OPTIONS}. - * @deprecated Replaced by {@code HttpMethods.OPTIONS}. - */ - @Deprecated - public HttpMethod OPTIONS() { - return HttpMethod.OPTIONS; - } - - /** - * @return {@code TRACE}. - * @deprecated Replaced by {@code HttpMethods.TRACE}. - */ - @Deprecated - public HttpMethod TRACE() { - return HttpMethod.TRACE; - } - public enum HttpMethod { GET(HttpMethods.GET), HEAD(HttpMethods.HEAD), POST(HttpMethods.POST), PUT(HttpMethods.PUT), PATCH( 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 ca2133664b..e2763195ea 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 @@ -151,15 +151,6 @@ public final class HttpStatus { */ public static final int FOUND = 302; - /** - * The HTTP {@code 302 Moved Temporarily} status code. - * @see HTTP/1.0, section - * 9.3 - * @deprecated in favor of {@link #FOUND} which will be returned from - */ - @Deprecated - public static final int MOVED_TEMPORARILY = 302; - /** * The HTTP {@code 303 See Other} status code. * @see HTTP/1.1: @@ -174,15 +165,6 @@ public final class HttpStatus { */ public static final int NOT_MODIFIED = 304; - /** - * The HTTP {@code 305 Use Proxy} status code. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.5 - * @deprecated due to security concerns regarding in-band configuration of a proxy - */ - @Deprecated - public static final int USE_PROXY = 305; - /** * The HTTP {@code 307 Temporary Redirect} status code. * @see HTTP/1.1: @@ -294,15 +276,6 @@ public final class HttpStatus { */ public static final int PAYLOAD_TOO_LARGE = 413; - /** - * The HTTP {@code 413 Request Entity Too Large} status code. - * @see HTTP/1.1, - * section 10.4.14 - * @deprecated in favor of {@link #PAYLOAD_TOO_LARGE} which will be returned from - */ - @Deprecated - public static final int REQUEST_ENTITY_TOO_LARGE = 413; - /** * The HTTP {@code 414 URI Too Long} status code. * @since 4.1* @see @@ -310,15 +283,6 @@ public final class HttpStatus { */ public static final int URI_TOO_LONG = 414; - /** - * The HTTP {@code 414 Request-URI Too Long} status code. - * @see HTTP/1.1, - * section 10.4.15 - * @deprecated in favor of {@link #URI_TOO_LONG} which will be returned from - */ - @Deprecated - public static final int REQUEST_URI_TOO_LONG = 414; - /** * The HTTP {@code 415 Unsupported Media Type} status code. * @see HTTP/1.1: @@ -346,33 +310,6 @@ public final class HttpStatus { */ public static final int I_AM_A_TEAPOT = 418; - /** - * The HTTP {@code 419 Insufficient Space} status code. - * @deprecated See WebDAV - * Draft Changes - */ - @Deprecated - public static final int INSUFFICIENT_SPACE_ON_RESOURCE = 419; - - /** - * The HTTP {@code 420 Method Failure} status code. - * @deprecated See WebDAV - * Draft Changes - */ - @Deprecated - public static final int METHOD_FAILURE = 420; - - /** - * The HTTP {@code 421 Destination Locked} status code. - * @deprecated See WebDAV - * Draft Changes - */ - @Deprecated - public static final int DESTINATION_LOCKED = 421; - /** * The HTTP {@code 422 Unprocessable Entity} status code. * @see WebDAV @@ -508,732 +445,4 @@ public final class HttpStatus { */ public static final int NETWORK_AUTHENTICATION_REQUIRED = 511; - /** - * @return {@code 100 Continue}. - * @see HTTP/1.1: - * Semantics and Content, section 6.2.1 - * @deprecated Replaced by {@code HttpStatus.CONTINUE}. - */ - @Deprecated - public int CONTINUE() { - return HttpStatus.CONTINUE; - } - - /** - * @return {@code 101 Switching Protocols}. - * @see HTTP/1.1: - * Semantics and Content, section 6.2.2 - * @deprecated Replaced by {@code HttpStatus.SWITCHING_PROTOCOLS}. - */ - @Deprecated - public int SWITCHING_PROTOCOLS() { - return HttpStatus.SWITCHING_PROTOCOLS; - } - - /** - * @return {@code 102 Processing}. - * @see WebDAV - * @deprecated Replaced by {@code HttpStatus.PROCESSING}. - */ - @Deprecated - public int PROCESSING() { - return HttpStatus.PROCESSING; - } - - /** - * @return {@code 103 Checkpoint}. - * @see - * A proposal for supporting resumable POST/PUT HTTP requests in HTTP/1.0 - * @deprecated Replaced by {@code HttpStatus.CHECKPOINT}. - */ - @Deprecated - public int CHECKPOINT() { - return HttpStatus.CHECKPOINT; - } - - /** - * @return {@code 200 OK}. - * @see HTTP/1.1: - * Semantics and Content, section 6.3.1 - * @deprecated Replaced by {@code HttpStatus.OK}. - */ - @Deprecated - public int OK() { - return HttpStatus.OK; - } - - /** - * @return {@code 201 Created}. - * @see HTTP/1.1: - * Semantics and Content, section 6.3.2 - * @deprecated Replaced by {@code HttpStatus.CREATED}. - */ - @Deprecated - public int CREATED() { - return HttpStatus.CREATED; - } - - /** - * @return {@code 202 Accepted}. - * @see HTTP/1.1: - * Semantics and Content, section 6.3.3 - * @deprecated Replaced by {@code HttpStatus.ACCEPTED}. - */ - @Deprecated - public int ACCEPTED() { - return HttpStatus.ACCEPTED; - } - - /** - * @return {@code 203 Non-Authoritative Information}. - * @see HTTP/1.1: - * Semantics and Content, section 6.3.4 - * @deprecated Replaced by {@code HttpStatus.NON_AUTHORITATIVE_INFORMATION}. - */ - @Deprecated - public int NON_AUTHORITATIVE_INFORMATION() { - return HttpStatus.NON_AUTHORITATIVE_INFORMATION; - } - - /** - * @return {@code 204 No Content}. - * @see HTTP/1.1: - * Semantics and Content, section 6.3.5 - * @deprecated Replaced by {@code HttpStatus.NO_CONTENT}. - */ - @Deprecated - public int NO_CONTENT() { - return HttpStatus.NO_CONTENT; - } - - /** - * @return {@code 205 Reset Content}. - * @see HTTP/1.1: - * Semantics and Content, section 6.3.6 - * @deprecated Replaced by {@code HttpStatus.RESET_CONTENT}. - */ - @Deprecated - public int RESET_CONTENT() { - return HttpStatus.RESET_CONTENT; - } - - /** - * @return {@code 206 Partial Content}. - * @see HTTP/1.1: Range - * Requests, section 4.1 - * @deprecated Replaced by {@code HttpStatus.PARTIAL_CONTENT}. - */ - @Deprecated - public int PARTIAL_CONTENT() { - return HttpStatus.PARTIAL_CONTENT; - } - - /** - * @return {@code 207 Multi-Status}. - * @see WebDAV - * @deprecated Replaced by {@code HttpStatus.MULTI_STATUS}. - */ - @Deprecated - public int MULTI_STATUS() { - return HttpStatus.MULTI_STATUS; - } - - /** - * @return {@code 208 Already Reported}. - * @see WebDAV Binding - * Extensions - * @deprecated Replaced by {@code HttpStatus.ALREADY_REPORTED}. - */ - @Deprecated - public int ALREADY_REPORTED() { - return HttpStatus.ALREADY_REPORTED; - } - - /** - * @return {@code 226 IM Used}. - * @see Delta encoding in - * HTTP - * @deprecated Replaced by {@code HttpStatus.IM_USED}. - */ - @Deprecated - public int IM_USED() { - return HttpStatus.IM_USED; - } - - /** - * @return {@code 300 Multiple Choices}. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.1 - * @deprecated Replaced by {@code HttpStatus.MULTIPLE_CHOICES}. - */ - @Deprecated - public int MULTIPLE_CHOICES() { - return HttpStatus.MULTIPLE_CHOICES; - } - - /** - * @return {@code 301 Moved Permanently}. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.2 - * @deprecated Replaced by {@code HttpStatus.MOVED_PERMANENTLY}. - */ - @Deprecated - public int MOVED_PERMANENTLY() { - return HttpStatus.MOVED_PERMANENTLY; - } - - /** - * @return {@code 302 Found}. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.3 - * @deprecated Replaced by {@code HttpStatus.FOUND}. - */ - @Deprecated - public int FOUND() { - return HttpStatus.FOUND; - } - - /** - * @return {@code 302 Moved Temporarily}. - * @see HTTP/1.0, section - * 9.3 - * @deprecated in favor of {@link #FOUND} which will be returned from - */ - @Deprecated - public int MOVED_TEMPORARILY() { - return HttpStatus.MOVED_TEMPORARILY; - } - - /** - * @return {@code 303 See Other}. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.4 - * @deprecated Replaced by {@code HttpStatus.SEE_OTHER}. - */ - @Deprecated - public int SEE_OTHER() { - return HttpStatus.SEE_OTHER; - } - - /** - * @return {@code 304 Not Modified}. - * @see HTTP/1.1: - * Conditional Requests, section 4.1 - * @deprecated Replaced by {@code HttpStatus.NOT_MODIFIED}. - */ - @Deprecated - public int NOT_MODIFIED() { - return HttpStatus.NOT_MODIFIED; - } - - /** - * @return {@code 305 Use Proxy}. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.5 - * @deprecated due to security concerns regarding in-band configuration of a proxy - */ - @Deprecated - public int USE_PROXY() { - return HttpStatus.USE_PROXY; - } - - /** - * @return {@code 307 Temporary Redirect}. - * @see HTTP/1.1: - * Semantics and Content, section 6.4.7 - * @deprecated Replaced by {@code HttpStatus.TEMPORARY_REDIRECT}. - */ - @Deprecated - public int TEMPORARY_REDIRECT() { - return HttpStatus.TEMPORARY_REDIRECT; - } - - /** - * @return {@code 308 Permanent Redirect}. - * @see RFC 7238 - * @deprecated Replaced by {@code HttpStatus.PERMANENT_REDIRECT}. - */ - @Deprecated - public int PERMANENT_REDIRECT() { - return HttpStatus.PERMANENT_REDIRECT; - } - - /** - * @return {@code 400 Bad Request}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.1 - * @deprecated Replaced by {@code HttpStatus.BAD_REQUEST}. - */ - @Deprecated - public int BAD_REQUEST() { - return HttpStatus.BAD_REQUEST; - } - - /** - * @return {@code 401 Unauthorized}. - * @see HTTP/1.1: - * Authentication, section 3.1 - * @deprecated Replaced by {@code HttpStatus.UNAUTHORIZED}. - */ - @Deprecated - public int UNAUTHORIZED() { - return HttpStatus.UNAUTHORIZED; - } - - /** - * @return {@code 402 Payment Required}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.2 - * @deprecated Replaced by {@code HttpStatus.PAYMENT_REQUIRED}. - */ - @Deprecated - public int PAYMENT_REQUIRED() { - return HttpStatus.PAYMENT_REQUIRED; - } - - /** - * @return {@code 403 Forbidden}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.3 - * @deprecated Replaced by {@code HttpStatus.FORBIDDEN}. - */ - @Deprecated - public int FORBIDDEN() { - return HttpStatus.FORBIDDEN; - } - - /** - * @return {@code 404 Not Found}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.4 - * @deprecated Replaced by {@code HttpStatus.NOT_FOUND}. - */ - @Deprecated - public int NOT_FOUND() { - return HttpStatus.NOT_FOUND; - } - - /** - * @return {@code 405 Method Not Allowed}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.5 - * @deprecated Replaced by {@code HttpStatus.METHOD_NOT_ALLOWED}. - */ - @Deprecated - public int METHOD_NOT_ALLOWED() { - return HttpStatus.METHOD_NOT_ALLOWED; - } - - /** - * @return {@code 406 Not Acceptable}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.6 - * @deprecated Replaced by {@code HttpStatus.NOT_ACCEPTABLE}. - */ - @Deprecated - public int NOT_ACCEPTABLE() { - return HttpStatus.NOT_ACCEPTABLE; - } - - /** - * @return {@code 407 Proxy Authentication Required}. - * @see HTTP/1.1: - * Authentication, section 3.2 - * @deprecated Replaced by {@code HttpStatus.PROXY_AUTHENTICATION_REQUIRED}. - */ - @Deprecated - public int PROXY_AUTHENTICATION_REQUIRED() { - return HttpStatus.PROXY_AUTHENTICATION_REQUIRED; - } - - /** - * @return {@code 408 Request Timeout}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.7 - * @deprecated Replaced by {@code HttpStatus.REQUEST_TIMEOUT}. - */ - @Deprecated - public int REQUEST_TIMEOUT() { - return HttpStatus.REQUEST_TIMEOUT; - } - - /** - * @return {@code 409 Conflict}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.8 - * @deprecated Replaced by {@code HttpStatus.CONFLICT}. - */ - @Deprecated - public int CONFLICT() { - return HttpStatus.CONFLICT; - } - - /** - * @return {@code 410 Gone}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.9 - * @deprecated Replaced by {@code HttpStatus.GONE}. - */ - @Deprecated - public int GONE() { - return HttpStatus.GONE; - } - - /** - * @return {@code 411 Length Required}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.10 - * @deprecated Replaced by {@code HttpStatus.LENGTH_REQUIRED}. - */ - @Deprecated - public int LENGTH_REQUIRED() { - return HttpStatus.LENGTH_REQUIRED; - } - - /** - * @return {@code 412 Precondition failed}. - * @see HTTP/1.1: - * Conditional Requests, section 4.2 - * @deprecated Replaced by {@code HttpStatus.PRECONDITION_FAILED}. - */ - @Deprecated - public int PRECONDITION_FAILED() { - return HttpStatus.PRECONDITION_FAILED; - } - - /** - * @return {@code 413 Payload Too Large}. - * @since 4.1* @see - * HTTP/1.1: Semantics and Content, section 6.5.11 - * @deprecated Replaced by {@code HttpStatus.PAYLOAD_TOO_LARGE}. - */ - @Deprecated - public int PAYLOAD_TOO_LARGE() { - return HttpStatus.PAYLOAD_TOO_LARGE; - } - - /** - * @return {@code 413 Request Entity Too Large}. - * @see HTTP/1.1, - * section 10.4.14 - * @deprecated in favor of {@link #PAYLOAD_TOO_LARGE} which will be returned from - */ - @Deprecated - public int REQUEST_ENTITY_TOO_LARGE() { - return HttpStatus.REQUEST_ENTITY_TOO_LARGE; - } - - /** - * @return {@code 414 URI Too Long}. - * @since 4.1* @see - * HTTP/1.1: Semantics and Content, section 6.5.12 - * @deprecated Replaced by {@code HttpStatus.URI_TOO_LONG}. - */ - @Deprecated - public int URI_TOO_LONG() { - return HttpStatus.URI_TOO_LONG; - } - - /** - * @return {@code 414 Request-URI Too Long}. - * @see HTTP/1.1, - * section 10.4.15 - * @deprecated in favor of {@link #URI_TOO_LONG} which will be returned from - */ - @Deprecated - public int REQUEST_URI_TOO_LONG() { - return HttpStatus.REQUEST_URI_TOO_LONG; - } - - /** - * @return {@code 415 Unsupported Media Type}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.13 - * @deprecated Replaced by {@code HttpStatus.UNSUPPORTED_MEDIA_TYPE}. - */ - @Deprecated - public int UNSUPPORTED_MEDIA_TYPE() { - return HttpStatus.UNSUPPORTED_MEDIA_TYPE; - } - - /** - * @return {@code 416 Requested Range Not Satisfiable}. - * @see HTTP/1.1: Range - * Requests, section 4.4 - * @deprecated Replaced by {@code HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE}. - */ - @Deprecated - public int REQUESTED_RANGE_NOT_SATISFIABLE() { - return HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE; - } - - /** - * @return {@code 417 Expectation Failed}. - * @see HTTP/1.1: - * Semantics and Content, section 6.5.14 - * @deprecated Replaced by {@code HttpStatus.EXPECTATION_FAILED}. - */ - @Deprecated - public int EXPECTATION_FAILED() { - return HttpStatus.EXPECTATION_FAILED; - } - - /** - * @return {@code 418 I'm a teapot}. - * @see HTCPCP/1.0 - * @deprecated Replaced by {@code HttpStatus.I_AM_A_TEAPOT}. - */ - @Deprecated - public int I_AM_A_TEAPOT() { - return HttpStatus.I_AM_A_TEAPOT; - } - - /** - * @return {@code 419 Insufficient Space}. - * @deprecated See WebDAV - * Draft Changes - */ - @Deprecated - public int INSUFFICIENT_SPACE_ON_RESOURCE() { - return HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE; - } - - /** - * @return {@code 420 Method Failure}. - * @deprecated See WebDAV - * Draft Changes - */ - @Deprecated - public int METHOD_FAILURE() { - return HttpStatus.METHOD_FAILURE; - } - - /** - * @return {@code 421 Destination Locked}. - * @deprecated See WebDAV - * Draft Changes - */ - @Deprecated - public int DESTINATION_LOCKED() { - return HttpStatus.DESTINATION_LOCKED; - } - - /** - * @return {@code 422 Unprocessable Entity}. - * @see WebDAV - * @deprecated Replaced by {@code HttpStatus.UNPROCESSABLE_ENTITY}. - */ - @Deprecated - public int UNPROCESSABLE_ENTITY() { - return HttpStatus.UNPROCESSABLE_ENTITY; - } - - /** - * @return {@code 423 Locked}. - * @see WebDAV - * @deprecated Replaced by {@code HttpStatus.LOCKED}. - */ - @Deprecated - public int LOCKED() { - return HttpStatus.LOCKED; - } - - /** - * @return {@code 424 Failed Dependency}. - * @see WebDAV - * @deprecated Replaced by {@code HttpStatus.FAILED_DEPENDENCY}. - */ - @Deprecated - public int FAILED_DEPENDENCY() { - return HttpStatus.FAILED_DEPENDENCY; - } - - /** - * @return {@code 426 Upgrade Required}. - * @see Upgrading to TLS - * Within HTTP/1.1 - * @deprecated Replaced by {@code HttpStatus.UPGRADE_REQUIRED}. - */ - @Deprecated - public int UPGRADE_REQUIRED() { - return HttpStatus.UPGRADE_REQUIRED; - } - - /** - * @return {@code 428 Precondition Required}. - * @see Additional HTTP Status - * Codes - * @deprecated Replaced by {@code HttpStatus.PRECONDITION_REQUIRED}. - */ - @Deprecated - public int PRECONDITION_REQUIRED() { - return HttpStatus.PRECONDITION_REQUIRED; - } - - /** - * @return {@code 429 Too Many Requests}. - * @see Additional HTTP Status - * Codes - * @deprecated Replaced by {@code HttpStatus.TOO_MANY_REQUESTS}. - */ - @Deprecated - public int TOO_MANY_REQUESTS() { - return HttpStatus.TOO_MANY_REQUESTS; - } - - /** - * @return {@code 431 Request Header Fields Too Large}. - * @see Additional HTTP Status - * Codes - * @deprecated Replaced by {@code HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE}. - */ - @Deprecated - public int REQUEST_HEADER_FIELDS_TOO_LARGE() { - return HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE; - } - - /** - * @return {@code 451 Unavailable For Legal Reasons}. - * @see An - * HTTP Status Code to Report Legal Obstacles - * @deprecated Replaced by {@code HttpStatus.UNAVAILABLE_FOR_LEGAL_REASONS}. - */ - @Deprecated - public int UNAVAILABLE_FOR_LEGAL_REASONS() { - return HttpStatus.UNAVAILABLE_FOR_LEGAL_REASONS; - } - - /** - * @return {@code 500 Internal Server Error}. - * @see HTTP/1.1: - * Semantics and Content, section 6.6.1 - * @deprecated Replaced by {@code HttpStatus.INTERNAL_SERVER_ERROR}. - */ - @Deprecated - public int INTERNAL_SERVER_ERROR() { - return HttpStatus.INTERNAL_SERVER_ERROR; - } - - /** - * @return {@code 501 Not Implemented}. - * @see HTTP/1.1: - * Semantics and Content, section 6.6.2 - * @deprecated Replaced by {@code HttpStatus.NOT_IMPLEMENTED}. - */ - @Deprecated - public int NOT_IMPLEMENTED() { - return HttpStatus.NOT_IMPLEMENTED; - } - - /** - * @return {@code 502 Bad Gateway}. - * @see HTTP/1.1: - * Semantics and Content, section 6.6.3 - * @deprecated Replaced by {@code HttpStatus.BAD_GATEWAY}. - */ - @Deprecated - public int BAD_GATEWAY() { - return HttpStatus.BAD_GATEWAY; - } - - /** - * @return {@code 503 Service Unavailable}. - * @see HTTP/1.1: - * Semantics and Content, section 6.6.4 - * @deprecated Replaced by {@code HttpStatus.SERVICE_UNAVAILABLE}. - */ - @Deprecated - public int SERVICE_UNAVAILABLE() { - return HttpStatus.SERVICE_UNAVAILABLE; - } - - /** - * @return {@code 504 Gateway Timeout}. - * @see HTTP/1.1: - * Semantics and Content, section 6.6.5 - * @deprecated Replaced by {@code HttpStatus.GATEWAY_TIMEOUT}. - */ - @Deprecated - public int GATEWAY_TIMEOUT() { - return HttpStatus.GATEWAY_TIMEOUT; - } - - /** - * @return {@code 505 HTTP Version Not Supported}. - * @see HTTP/1.1: - * Semantics and Content, section 6.6.6 - * @deprecated Replaced by {@code HttpStatus.HTTP_VERSION_NOT_SUPPORTED}. - */ - @Deprecated - public int HTTP_VERSION_NOT_SUPPORTED() { - return HttpStatus.HTTP_VERSION_NOT_SUPPORTED; - } - - /** - * @return {@code 506 Variant Also Negotiates} - * @see Transparent Content - * Negotiation - * @deprecated Replaced by {@code HttpStatus.VARIANT_ALSO_NEGOTIATES}. - */ - @Deprecated - public int VARIANT_ALSO_NEGOTIATES() { - return HttpStatus.VARIANT_ALSO_NEGOTIATES; - } - - /** - * @return {@code 507 Insufficient Storage} - * @see WebDAV - * @deprecated Replaced by {@code HttpStatus.INSUFFICIENT_STORAGE}. - */ - @Deprecated - public int INSUFFICIENT_STORAGE() { - return HttpStatus.INSUFFICIENT_STORAGE; - } - - /** - * @return {@code 508 Loop Detected} - * @see WebDAV Binding - * Extensions - * @deprecated Replaced by {@code HttpStatus.LOOP_DETECTED}. - */ - @Deprecated - public int LOOP_DETECTED() { - return HttpStatus.LOOP_DETECTED; - } - - /** - * @return {@code 509 Bandwidth Limit Exceeded} - * @deprecated Replaced by {@code HttpStatus.BANDWIDTH_LIMIT_EXCEEDED}. - */ - @Deprecated - public int BANDWIDTH_LIMIT_EXCEEDED() { - return HttpStatus.BANDWIDTH_LIMIT_EXCEEDED; - } - - /** - * @return {@code 510 Not Extended} - * @see HTTP Extension - * Framework - * @deprecated Replaced by {@code HttpStatus.NOT_EXTENDED}. - */ - @Deprecated - public int NOT_EXTENDED() { - return HttpStatus.NOT_EXTENDED; - } - - /** - * @return {@code 511 Network Authentication Required}. - * @see Additional HTTP Status - * Codes - * @deprecated Replaced by {@code HttpStatus.NETWORK_AUTHENTICATION_REQUIRED}. - */ - @Deprecated - public int NETWORK_AUTHENTICATION_REQUIRED() { - return HttpStatus.NETWORK_AUTHENTICATION_REQUIRED; - } - } diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Input.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Input.java index 2bc3be92e1..92a2077f0c 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Input.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Input.java @@ -291,18 +291,6 @@ public class Input extends Common implements RegexCreatingProperty consumer) { - log.warn("stubMatchers method is deprecated. Please use bodyMatchers instead"); - bodyMatchers(consumer); - } - /** * The stub matchers part of the contract. * @param consumer function to manipulate the message headers @@ -324,18 +312,6 @@ public class Input extends Common implements RegexCreatingProperty consumer) { - log.warn("testMatchers method is deprecated. Please use bodyMatchers instead"); - bodyMatchers(consumer); - } - /** * The stub matchers part of the contract. * @param consumer function to manipulate the body matchers @@ -328,18 +296,6 @@ public class OutputMessage extends Common implements RegexCreatingProperty consumer) { - log.warn("stubMatchers method is deprecated. Please use bodyMatchers instead"); - bodyMatchers(consumer); - } - /** * Allows to set matchers for the body. * @param consumer function to manipulate the URL @@ -755,17 +734,6 @@ public class Request extends Common implements RegexCreatingProperty consumer) { - log.warn("testMatchers method is deprecated. Please use bodyMatchers instead"); - bodyMatchers(consumer); - } - /** * Allows to set matchers for the body. * @param consumer function to manipulate the URL @@ -771,17 +725,6 @@ public class Response extends Common implements RegexCreatingProperty minPortValueOpt = parser - .acceptsAll(Arrays.asList("minp", "minPort"), - "Minimum port value to be assigned to the WireMock instance. Defaults to 10000") - .withRequiredArg().ofType(Integer.class).defaultsTo(10000); - ArgumentAcceptingOptionSpec maxPortValueOpt = parser - .acceptsAll(Arrays.asList("maxp", "maxPort"), - "Maximum port value to be assigned to the WireMock instance. Defaults to 15000") - .withRequiredArg().ofType(Integer.class).defaultsTo(15000); - ArgumentAcceptingOptionSpec stubsOpt = parser - .acceptsAll(Arrays.asList("s", "stubs"), - "Comma separated list of Ivy representation " - + "of jars with stubs. Eg. groupid:artifactid1,groupid2:artifactid2:classifier") - .withRequiredArg(); - ArgumentAcceptingOptionSpec classifierOpt = parser - .acceptsAll(Arrays.asList("c", "classifier"), "Suffix for the jar containing stubs (e.g. 'stubs' " - + "if the stub jar would have a 'stubs' classifier for stubs: foobar-stubs ). Defaults to 'stubs'") - .withRequiredArg().defaultsTo("stubs"); - ArgumentAcceptingOptionSpec rootOpt = parser - .acceptsAll(Arrays.asList("r", "root"), - "Location of a Jar containing server where you keep " - + "your stubs (e.g. https://nexus.net/content/repositories/repository)") - .withRequiredArg(); - ArgumentAcceptingOptionSpec usernameOpt = parser - .acceptsAll(Arrays.asList("u", "username"), "Username to user when connecting to repository") - .withOptionalArg(); - ArgumentAcceptingOptionSpec passwordOpt = parser - .acceptsAll(Arrays.asList("p", "password"), "Password to user when connecting to repository") - .withOptionalArg(); - ArgumentAcceptingOptionSpec proxyHostOpt = parser - .acceptsAll(Arrays.asList("phost", "proxyHost"), "Proxy host to use for repository requests") - .withOptionalArg(); - ArgumentAcceptingOptionSpec proxyPortOpt = parser - .acceptsAll(Arrays.asList("pport", "proxyPort"), "Proxy port to use for repository requests") - .withOptionalArg().ofType(Integer.class); - ArgumentAcceptingOptionSpec stubsMode = parser - .acceptsAll(Arrays.asList("sm", "stubsMode"), - "Stubs mode to be used. Acceptable values " - + Arrays.toString(StubRunnerProperties.StubsMode.values())) - .withRequiredArg().defaultsTo(StubRunnerProperties.StubsMode.CLASSPATH.toString()); - OptionSet options = parser.parse(args); - String stubs = options.valueOf(stubsOpt); - StubRunnerProperties.StubsMode stubsModeValue = StubRunnerProperties.StubsMode - .valueOf(options.valueOf(stubsMode)); - Integer minPortValue = options.valueOf(minPortValueOpt); - Integer maxPortValue = options.valueOf(maxPortValueOpt); - String stubRepositoryRoot = options.valueOf(rootOpt); - String stubsSuffix = options.valueOf(classifierOpt); - final String username = options.valueOf(usernameOpt); - final String password = options.valueOf(passwordOpt); - final String proxyHost = options.valueOf(proxyHostOpt); - final Integer proxyPort = options.valueOf(proxyPortOpt); - final StubRunnerOptionsBuilder builder = new StubRunnerOptionsBuilder() - .withMinMaxPort(minPortValue, maxPortValue).withStubRepositoryRoot(stubRepositoryRoot) - .withStubsMode(stubsModeValue).withStubsClassifier(stubsSuffix).withUsername(username) - .withPassword(password).withStubs(stubs); - if (proxyHost != null) { - builder.withProxy(proxyHost, proxyPort); - } - StubRunnerOptions stubRunnerOptions = builder.build(); - this.arguments = new Arguments(stubRunnerOptions); - } - catch (Exception e) { - printErrorMessage(e, parser); - throw e; - } - } - - public static void main(String[] args) throws Exception { - new StubRunnerMain(args).execute(); - } - - private void printErrorMessage(Exception e, OptionParser parser) throws IOException { - System.err.println(e.getMessage()); - System.err.println("java -jar stub-runner.jar [options...] "); - parser.printHelpOn(System.err); - System.err.println(); - System.err.println("Example: java -jar stub-runner.jar ${parser.printExample(ALL)}"); - } - - private void execute() { - try { - if (log.isDebugEnabled()) { - log.debug("Launching StubRunner with args: " + this.arguments); - } - // TODO: Pass StubsToRun either from String or File - BatchStubRunner stubRunner = new BatchStubRunnerFactory(this.arguments.getStubRunnerOptions()) - .buildBatchStubRunner(); - RunningStubs runningCollaborators = stubRunner.runStubs(); - log.info(runningCollaborators.toString()); - } - catch (Exception e) { - log.error("An exception occurred while trying to execute the stubs", e); - throw e; - } - } - -} diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerOptions.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerOptions.java index 01bb5b4e89..73a54e6728 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerOptions.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerOptions.java @@ -293,20 +293,10 @@ public class StubRunnerOptions { return this.stubsPerConsumer; } - @Deprecated - public void setStubsPerConsumer(boolean stubsPerConsumer) { - this.stubsPerConsumer = stubsPerConsumer; - } - public String getConsumerName() { return this.consumerName; } - @Deprecated - public void setConsumerName(String consumerName) { - this.consumerName = consumerName; - } - public boolean hasMappingsOutputFolder() { return StringUtils.hasText(this.mappingsOutputFolder); } @@ -315,20 +305,10 @@ public class StubRunnerOptions { return this.mappingsOutputFolder; } - @Deprecated - public void setMappingsOutputFolder(String mappingsOutputFolder) { - this.mappingsOutputFolder = mappingsOutputFolder; - } - public boolean isDeleteStubsAfterTest() { return this.deleteStubsAfterTest; } - @Deprecated - public void setDeleteStubsAfterTest(boolean deleteStubsAfterTest) { - this.deleteStubsAfterTest = deleteStubsAfterTest; - } - public boolean isGenerateStubs() { return this.generateStubs; } @@ -341,11 +321,6 @@ public class StubRunnerOptions { return this.properties; } - @Deprecated - public void setProperties(Map properties) { - this.properties = properties; - } - public String getServerId() { return this.serverId; } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java index 036239c3a3..c541237b88 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java @@ -53,7 +53,6 @@ import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockExtensio import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.util.ClassUtils; -import org.springframework.util.SocketUtils; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; @@ -100,14 +99,7 @@ public class WireMockHttpServerStub implements HttpServerStub { return extensions.toArray(new Extension[extensions.size()]); } - /** - * Override this if you want to register your own helpers. - * @deprecated - please use the {@link WireMockExtensions} mechanism and pass the - * helpers in your implementation - * @return a mapping of helper names to its implementations - */ - @Deprecated - protected Map helpers() { + private Map helpers() { Map helpers = new HashMap<>(); helpers.put(HandlebarsJsonPathHelper.NAME, new HandlebarsJsonPathHelper()); helpers.put(HandlebarsEscapeHelper.NAME, new HandlebarsEscapeHelper()); @@ -124,36 +116,6 @@ public class WireMockHttpServerStub implements HttpServerStub { return this.wireMockServer != null && this.wireMockServer.isRunning(); } - @Override - public HttpServerStub start() { - if (isRunning()) { - if (log.isTraceEnabled()) { - log.trace("The server is already running at port [" + port() + "]"); - } - return this; - } - HttpServerStubConfiguration configuration = defaultConfiguration(); - HttpServerStub serverStub = start(configuration); - cacheStubServer(configuration.randomPort, configuration.port); - return serverStub; - } - - private HttpServerStubConfiguration defaultConfiguration(int port) { - return new HttpServerStubConfiguration(HttpServerStubConfigurer.NoOpHttpServerStubConfigurer.INSTANCE, null, - null, port); - } - - private HttpServerStubConfiguration defaultConfiguration() { - int port = SocketUtils.findAvailableTcpPort(); - return new HttpServerStubConfiguration(HttpServerStubConfigurer.NoOpHttpServerStubConfigurer.INSTANCE, null, - null, port, true); - } - - @Override - public HttpServerStub start(int port) { - return start(defaultConfiguration(port)); - } - @Override public HttpServerStub start(HttpServerStubConfiguration configuration) { if (isRunning()) { diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy index fec4c18000..e3fd9a72d7 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy @@ -137,7 +137,7 @@ class StubRunnerCamelPredicateSpec extends Specification { header("foo", 123) } messageBody(foo: 123) - stubMatchers { + bodyMatchers { jsonPath('$.foo', byRegex("[0-9]{3}")) } } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy index e937068f24..4d91e783d8 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy @@ -23,8 +23,11 @@ import spock.lang.Specification import org.springframework.boot.test.system.OutputCaptureRule import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.cloud.contract.stubrunner.HttpServerStubConfiguration +import org.springframework.cloud.contract.stubrunner.HttpServerStubConfigurer import org.springframework.http.HttpEntity import org.springframework.http.HttpMethod +import org.springframework.util.SocketUtils import org.springframework.web.client.RestTemplate class WireMockHttpServerStubSpec extends Specification { @@ -39,7 +42,8 @@ class WireMockHttpServerStubSpec extends Specification { def 'should describe stub mapping'() { given: - WireMockHttpServerStub mappingDescriptor = new WireMockHttpServerStub().start() as WireMockHttpServerStub + WireMockHttpServerStub mappingDescriptor = new WireMockHttpServerStub().start(new HttpServerStubConfiguration(HttpServerStubConfigurer.NoOpHttpServerStubConfigurer.INSTANCE, null, + null, SocketUtils.findAvailableTcpPort())) as WireMockHttpServerStub when: StubMapping mapping = mappingDescriptor.getMapping(MAPPING_DESCRIPTOR) then: @@ -64,7 +68,8 @@ class WireMockHttpServerStubSpec extends Specification { def 'should make WireMock print out logs on INFO'() { given: - WireMockHttpServerStub mappingDescriptor = new WireMockHttpServerStub().start() as WireMockHttpServerStub + WireMockHttpServerStub mappingDescriptor = new WireMockHttpServerStub().start(new HttpServerStubConfiguration(HttpServerStubConfigurer.NoOpHttpServerStubConfigurer.INSTANCE, null, + null, SocketUtils.findAvailableTcpPort())) as WireMockHttpServerStub mappingDescriptor.registerMappings([ new File(WireMockHttpServerStubSpec.classLoader.getResource("simple.json").toURI()) ]) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java index cda061bf3c..863c0be992 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java @@ -35,7 +35,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.contract.spec.Contract; -import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties; import org.springframework.cloud.contract.verifier.file.ContractFileScanner; import org.springframework.cloud.contract.verifier.file.ContractFileScannerBuilder; import org.springframework.cloud.contract.verifier.file.ContractMetadata; @@ -65,31 +64,6 @@ public class RecursiveFilesConverter { private final boolean excludeBuildFolders; - @Deprecated - public RecursiveFilesConverter(ContractVerifierConfigProperties props, StubGeneratorProvider holder) { - this(props.getStubsOutputDir(), props.getContractsDslDir(), props.getExcludedFiles(), - props.getIncludedContracts(), props.getExcludeBuildFolders(), holder); - } - - @Deprecated - public RecursiveFilesConverter(ContractVerifierConfigProperties props) { - this(props.getStubsOutputDir(), props.getContractsDslDir(), props.getExcludedFiles(), - props.getIncludedContracts(), props.getExcludeBuildFolders(), null); - } - - @Deprecated - public RecursiveFilesConverter(ContractVerifierConfigProperties props, File stubsOutputDir) { - this(stubsOutputDir, props.getContractsDslDir(), props.getExcludedFiles(), props.getIncludedContracts(), - props.getExcludeBuildFolders(), null); - } - - @Deprecated - public RecursiveFilesConverter(ContractVerifierConfigProperties props, File stubsOutputDir, - StubGeneratorProvider holder) { - this(stubsOutputDir, props.getContractsDslDir(), props.getExcludedFiles(), props.getIncludedContracts(), - props.getExcludeBuildFolders(), holder); - } - public RecursiveFilesConverter(File stubsOutputDir, File contractsDslDir, List excludedFiles, String includedContracts, boolean excludeBuildFolders, StubGeneratorProvider holder) { this.outMappingsDir = stubsOutputDir; diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle index 87be861db0..cf02ad05cf 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle @@ -2,7 +2,6 @@ buildscript { repositories { mavenCentral() mavenLocal() - maven { url 'https://repo.spring.io/plugins-release' } if (project.hasProperty('fatJar')) { jcenter() } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java index 5e6eb561e0..1c3615fd57 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java @@ -151,15 +151,6 @@ public class ConvertMojo extends AbstractMojo { @Parameter(property = "contractsRepositoryProxyPort") private Integer contractsRepositoryProxyPort; - /** - * If {@code true} then will not assert whether a stub / contract JAR was downloaded - * from local or remote location. - * @deprecated - with 2.1.0 this option is redundant - */ - @Parameter(property = "contractsSnapshotCheckSkip", defaultValue = "false") - @Deprecated - private boolean contractsSnapshotCheckSkip; - /** * If set to {@code false} will NOT delete stubs from a temporary folder after running * tests. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java index a8409dfd46..74d3d49c5d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java @@ -205,15 +205,6 @@ public class GenerateTestsMojo extends AbstractMojo { @Parameter(property = "contractsRepositoryProxyPort") private Integer contractsRepositoryProxyPort; - /** - * If {@code true} then will not assert whether a stub / contract JAR was downloaded - * from local or remote location. - * @deprecated - with 2.1.0 this option is redundant - */ - @Parameter(property = "contractsSnapshotCheckSkip", defaultValue = "false") - @Deprecated - private boolean contractsSnapshotCheckSkip; - /** * If set to {@code false} will NOT delete stubs from a temporary folder after running * tests. diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredImports.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredImports.java index 2c0bbc2f98..d8a75b7f1d 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredImports.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredImports.java @@ -20,15 +20,12 @@ import java.util.Arrays; import org.springframework.cloud.contract.verifier.config.TestMode; -class ExplicitRestAssuredImports implements Imports, RestAssuredVerifier { +class ExplicitRestAssuredImports implements Imports { private final BlockBuilder blockBuilder; private final GeneratedClassMetaData generatedClassMetaData; - private static final String[] REST_ASSURED_2_IMPORTS = { - "com.jayway.restassured.specification.RequestSpecification", "com.jayway.restassured.response.Response" }; - private static final String[] REST_ASSURED_3_IMPORTS = { "io.restassured.specification.RequestSpecification", "io.restassured.response.Response" }; @@ -39,8 +36,7 @@ class ExplicitRestAssuredImports implements Imports, RestAssuredVerifier { @Override public Imports call() { - Arrays.stream(isRestAssured2Present() ? REST_ASSURED_2_IMPORTS : REST_ASSURED_3_IMPORTS) - .forEach(s -> this.blockBuilder.addLineWithEnding("import " + s)); + Arrays.stream(REST_ASSURED_3_IMPORTS).forEach(s -> this.blockBuilder.addLineWithEnding("import " + s)); return this; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredStaticImports.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredStaticImports.java index 85b61916d4..cfee4ccda9 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredStaticImports.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/ExplicitRestAssuredStaticImports.java @@ -20,14 +20,12 @@ import java.util.Arrays; import org.springframework.cloud.contract.verifier.config.TestMode; -class ExplicitRestAssuredStaticImports implements Imports, RestAssuredVerifier { +class ExplicitRestAssuredStaticImports implements Imports { private final BlockBuilder blockBuilder; private final GeneratedClassMetaData generatedClassMetaData; - private static final String[] REST_ASSURED_2_IMPORTS = { "com.jayway.restassured.RestAssured.*" }; - private static final String[] REST_ASSURED_3_IMPORTS = { "io.restassured.RestAssured.*" }; ExplicitRestAssuredStaticImports(BlockBuilder blockBuilder, GeneratedClassMetaData generatedClassMetaData) { @@ -37,8 +35,7 @@ class ExplicitRestAssuredStaticImports implements Imports, RestAssuredVerifier { @Override public Imports call() { - Arrays.stream(isRestAssured2Present() ? REST_ASSURED_2_IMPORTS : REST_ASSURED_3_IMPORTS) - .forEach(s -> this.blockBuilder.addLineWithEnding("import static " + s)); + Arrays.stream(REST_ASSURED_3_IMPORTS).forEach(s -> this.blockBuilder.addLineWithEnding("import static " + s)); return this; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.java index 175ef46959..0eb7749ca6 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JavaTestGenerator.java @@ -18,9 +18,6 @@ package org.springframework.cloud.contract.verifier.builder; import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties; import org.springframework.cloud.contract.verifier.file.ContractMetadata; @@ -31,14 +28,6 @@ import org.springframework.cloud.contract.verifier.file.ContractMetadata; */ public class JavaTestGenerator implements SingleTestGenerator { - private static final Log log = LogFactory.getLog(JavaTestGenerator.class); - - @Override - public String buildClass(ContractVerifierConfigProperties properties, Collection listOfFiles, - String className, String classPackage, String includedDirectoryRelativePath) { - throw new UnsupportedOperationException("Deprecated method"); - } - @Override public String buildClass(ContractVerifierConfigProperties properties, Collection listOfFiles, String includedDirectoryRelativePath, GeneratedClassData generatedClassData) { diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredImports.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredImports.java index 7003aab72b..b6d2105797 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredImports.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredImports.java @@ -20,17 +20,12 @@ import java.util.Arrays; import org.springframework.cloud.contract.verifier.config.TestMode; -class MockMvcRestAssuredImports implements Imports, RestAssuredVerifier { +class MockMvcRestAssuredImports implements Imports { private final BlockBuilder blockBuilder; private final GeneratedClassMetaData generatedClassMetaData; - @Deprecated - private static final String[] REST_ASSURED_2_IMPORTS = { - "com.jayway.restassured.module.mockmvc.specification.MockMvcRequestSpecification", - "com.jayway.restassured.response.ResponseOptions" }; - private static final String[] REST_ASSURED_3_IMPORTS = { "io.restassured.module.mockmvc.specification.MockMvcRequestSpecification", "io.restassured.response.ResponseOptions" }; @@ -42,8 +37,7 @@ class MockMvcRestAssuredImports implements Imports, RestAssuredVerifier { @Override public Imports call() { - Arrays.stream(isRestAssured2Present() ? REST_ASSURED_2_IMPORTS : REST_ASSURED_3_IMPORTS) - .forEach(s -> this.blockBuilder.addLineWithEnding("import " + s)); + Arrays.stream(REST_ASSURED_3_IMPORTS).forEach(s -> this.blockBuilder.addLineWithEnding("import " + s)); return this; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredStaticImports.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredStaticImports.java index f9db09398d..1c68248a8e 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredStaticImports.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/MockMvcRestAssuredStaticImports.java @@ -20,15 +20,12 @@ import java.util.Arrays; import org.springframework.cloud.contract.verifier.config.TestMode; -class MockMvcRestAssuredStaticImports implements Imports, RestAssuredVerifier { +class MockMvcRestAssuredStaticImports implements Imports { private final BlockBuilder blockBuilder; private final GeneratedClassMetaData generatedClassMetaData; - private static final String[] REST_ASSURED_2_IMPORTS = { - "com.jayway.restassured.module.mockmvc.RestAssuredMockMvc.*" }; - private static final String[] REST_ASSURED_3_IMPORTS = { "io.restassured.module.mockmvc.RestAssuredMockMvc.*" }; MockMvcRestAssuredStaticImports(BlockBuilder blockBuilder, GeneratedClassMetaData generatedClassMetaData) { @@ -38,8 +35,7 @@ class MockMvcRestAssuredStaticImports implements Imports, RestAssuredVerifier { @Override public Imports call() { - Arrays.stream(isRestAssured2Present() ? REST_ASSURED_2_IMPORTS : REST_ASSURED_3_IMPORTS) - .forEach(s -> this.blockBuilder.addLineWithEnding("import static " + s)); + Arrays.stream(REST_ASSURED_3_IMPORTS).forEach(s -> this.blockBuilder.addLineWithEnding("import static " + s)); return this; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/RestAssuredVerifier.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/RestAssuredVerifier.java deleted file mode 100644 index d7afa4ff37..0000000000 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/RestAssuredVerifier.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * https://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.verifier.builder; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -interface RestAssuredVerifier { - - Log log = LogFactory.getLog(RestAssuredVerifier.class); - - // TODO: Remove in next major - String REST_ASSURED_2_0_CLASS = "com.jayway.restassured.RestAssured"; - - ClassPresenceChecker checker = new ClassPresenceChecker(); - - @Deprecated - default boolean isRestAssured2Present() { - boolean restAssured2Present = checker.isClassPresent(REST_ASSURED_2_0_CLASS); - if (restAssured2Present) { - log.warn("Rest Assured 2 found on the classpath. Please upgrade to the latest version of Rest Assured"); - } - return restAssured2Present; - - } - -} - -class ClassPresenceChecker { - - private static final Log log = LogFactory.getLog(ClassPresenceChecker.class); - - boolean isClassPresent(String className) { - try { - Class.forName(className); - return true; - } - catch (ClassNotFoundException ex) { - if (log.isTraceEnabled()) { - log.trace("[" + className + "] is not present on classpath"); - } - return false; - } - } - -} diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.java index 40f03d6adf..22b1606dd4 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.java @@ -29,22 +29,6 @@ import org.springframework.cloud.contract.verifier.file.ContractMetadata; */ public interface SingleTestGenerator { - /** - * Creates contents of a single test class in which all test scenarios from the - * contract metadata should be placed. - * @param properties - properties passed to the plugin - * @param listOfFiles - list of parsed contracts with additional metadata - * @param className - the name of the generated test class - * @param classPackage - the name of the package in which the test class should be - * stored - * @param includedDirectoryRelativePath - relative path to the included directory - * @return contents of a single test class - * @deprecated use{@link SingleTestGenerator#buildClass(ContractVerifierConfigProperties, Collection, String, GeneratedClassData)} - */ - @Deprecated - String buildClass(ContractVerifierConfigProperties properties, Collection listOfFiles, - String className, String classPackage, String includedDirectoryRelativePath); - /** * Creates contents of a single test class in which all test scenarios from the * contract metadata should be placed. diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/WebTestClientRestAssuredImports.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/WebTestClientRestAssuredImports.java index 5300a81cb8..41b031f696 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/WebTestClientRestAssuredImports.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/WebTestClientRestAssuredImports.java @@ -20,16 +20,12 @@ import java.util.Arrays; import org.springframework.cloud.contract.verifier.config.TestMode; -class WebTestClientRestAssuredImports implements Imports, RestAssuredVerifier { +class WebTestClientRestAssuredImports implements Imports { private final BlockBuilder blockBuilder; private final GeneratedClassMetaData generatedClassMetaData; - private static final String[] REST_ASSURED_2_IMPORTS = { - "com.jayway.restassured.module.webtestclient.specification.WebTestClientRequestSpecification", - "com.jayway.restassured.module.webtestclient.response.WebTestClientResponse" }; - private static final String[] REST_ASSURED_3_IMPORTS = { "io.restassured.module.webtestclient.specification.WebTestClientRequestSpecification", "io.restassured.module.webtestclient.response.WebTestClientResponse" }; @@ -41,8 +37,7 @@ class WebTestClientRestAssuredImports implements Imports, RestAssuredVerifier { @Override public Imports call() { - Arrays.stream(isRestAssured2Present() ? REST_ASSURED_2_IMPORTS : REST_ASSURED_3_IMPORTS) - .forEach(s -> this.blockBuilder.addLineWithEnding("import " + s)); + Arrays.stream(REST_ASSURED_3_IMPORTS).forEach(s -> this.blockBuilder.addLineWithEnding("import " + s)); return this; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/ContractVerifierConfigProperties.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/ContractVerifierConfigProperties.java index 61c0c89203..2965ddf41f 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/ContractVerifierConfigProperties.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/ContractVerifierConfigProperties.java @@ -34,13 +34,6 @@ public class ContractVerifierConfigProperties { private static final Log log = LogFactory.getLog(ContractVerifierConfigProperties.class); - /** - * For which unit test library tests should be generated. - * @deprecated - use {@code testFramework} - */ - @Deprecated - private TestFramework targetFramework; - /** * For which unit test library tests should be generated. */ @@ -182,17 +175,6 @@ public class ContractVerifierConfigProperties { */ private boolean failOnInProgress = true; - @Deprecated - public void setTargetFramework(TestFramework targetFramework) { - log.warn("Please use the [testFramework] field. [targetFramework] is deprecated"); - setTestFramework(targetFramework); - } - - @Deprecated - public TestFramework getTargetFramework() { - return getTestFramework(); - } - public TestFramework getTestFramework() { return testFramework; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/TestFramework.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/TestFramework.java index fade0df5a4..d1b9590b3e 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/TestFramework.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/TestFramework.java @@ -16,8 +16,6 @@ package org.springframework.cloud.contract.verifier.config; -import java.util.List; - import org.springframework.cloud.contract.verifier.config.framework.CustomDefinition; import org.springframework.cloud.contract.verifier.config.framework.JUnit5Definition; import org.springframework.cloud.contract.verifier.config.framework.JUnitDefinition; @@ -62,92 +60,6 @@ public enum TestFramework { this.testFrameworkDefinition = testFrameworkDefinition; } - /** - * @deprecated use{@link #TestFramework(TestFrameworkDefinition)} - * @param classModifier class modifier - * @param methodModifier method modifier - * @param lineSuffix line suffix - * @param classExtension class extension - * @param classNameSuffix class name suffix - * @param ignoreClass ignore class - * @param orderAnnotationImports order annotation imports - * @param orderAnnotation order annotation - */ - @Deprecated - TestFramework(final String classModifier, final String methodModifier, final String lineSuffix, - final String classExtension, final String classNameSuffix, final String ignoreClass, - final List orderAnnotationImports, final String orderAnnotation) { - testFrameworkDefinition = new TestFrameworkDefinition() { - @Override - public String getClassModifier() { - return classModifier; - } - - @Override - public String getMethodModifier() { - return methodModifier; - } - - @Override - public String getLineSuffix() { - return lineSuffix; - } - - @Override - public String getClassExtension() { - return classExtension; - } - - @Override - public String getClassNameSuffix() { - return classNameSuffix; - } - - @Override - public String getIgnoreClass() { - return ignoreClass; - } - - @Override - public List getOrderAnnotationImports() { - return orderAnnotationImports; - } - - @Override - public String getOrderAnnotation() { - return orderAnnotation; - } - - @Override - public String getIgnoreAnnotation() { - return "@Ignore"; - } - - @Override - public boolean annotationLevelRules() { - return false; - } - - @Override - public String getRuleAnnotation(String annotationValue) { - throw new UnsupportedOperationException("Not available in framework."); - } - - }; - } - - public String getClassModifier() { - return this.testFrameworkDefinition.getClassModifier(); - } - - public String getMethodModifier() { - return this.testFrameworkDefinition.getMethodModifier(); - } - - public String getLineSuffix() { - return this.testFrameworkDefinition.getLineSuffix(); - } - public String getClassExtension() { return this.testFrameworkDefinition.getClassExtension(); } @@ -160,24 +72,8 @@ public enum TestFramework { return this.testFrameworkDefinition.getIgnoreClass(); } - public List getOrderAnnotationImports() { - return this.testFrameworkDefinition.getOrderAnnotationImports(); - } - - public String getOrderAnnotation() { - return this.testFrameworkDefinition.getOrderAnnotation(); - } - public String getIgnoreAnnotation() { return this.testFrameworkDefinition.getIgnoreAnnotation(); } - public boolean annotationLevelRules() { - return this.testFrameworkDefinition.annotationLevelRules(); - } - - public String getRuleAnnotation(String annotationValue) { - return this.testFrameworkDefinition.getRuleAnnotation(annotationValue); - } - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/CustomDefinition.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/CustomDefinition.java index f5f210f6d4..16b814a624 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/CustomDefinition.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/CustomDefinition.java @@ -16,9 +16,6 @@ package org.springframework.cloud.contract.verifier.config.framework; -import java.util.ArrayList; -import java.util.List; - /** * Defines elements characteristic of Custom test framework to be used during test class * construction. @@ -28,21 +25,6 @@ import java.util.List; */ public class CustomDefinition implements TestFrameworkDefinition { - @Override - public String getClassModifier() { - return ""; - } - - @Override - public String getMethodModifier() { - return ""; - } - - @Override - public String getLineSuffix() { - return ""; - } - @Override public String getClassExtension() { return ""; @@ -58,29 +40,9 @@ public class CustomDefinition implements TestFrameworkDefinition { return ""; } - @Override - public List getOrderAnnotationImports() { - return new ArrayList(); - } - - @Override - public String getOrderAnnotation() { - return ""; - } - @Override public String getIgnoreAnnotation() { return "@Ignore"; } - @Override - public boolean annotationLevelRules() { - return false; - } - - @Override - public String getRuleAnnotation(String annotationValue) { - throw new UnsupportedOperationException("Not available in framework."); - } - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnit5Definition.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnit5Definition.java index 38122edf69..5bd068d948 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnit5Definition.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnit5Definition.java @@ -16,9 +16,6 @@ package org.springframework.cloud.contract.verifier.config.framework; -import java.util.Arrays; -import java.util.List; - /** * Defines elements characteristic of JUnit5 test framework to be used during test class * construction. @@ -28,21 +25,6 @@ import java.util.List; */ public class JUnit5Definition implements TestFrameworkDefinition { - @Override - public String getClassModifier() { - return "public "; - } - - @Override - public String getMethodModifier() { - return "public void "; - } - - @Override - public String getLineSuffix() { - return ";"; - } - @Override public String getClassExtension() { return ".java"; @@ -58,29 +40,9 @@ public class JUnit5Definition implements TestFrameworkDefinition { return "org.junit.jupiter.api.Disabled"; } - @Override - public List getOrderAnnotationImports() { - return Arrays.asList("org.junit.jupiter.api.TestMethodOrder", "org.junit.jupiter.api.MethodOrderer"); - } - - @Override - public String getOrderAnnotation() { - return "@TestMethodOrder(MethodOrderer.Alphanumeric.class)"; - } - @Override public String getIgnoreAnnotation() { return "@Disabled"; } - @Override - public boolean annotationLevelRules() { - return true; - } - - @Override - public String getRuleAnnotation(final String annotationValue) { - return ("@ExtendWith(" + annotationValue + ".class)"); - } - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnitDefinition.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnitDefinition.java index d0f0beba85..970256bd10 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnitDefinition.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/JUnitDefinition.java @@ -16,10 +16,6 @@ package org.springframework.cloud.contract.verifier.config.framework; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * Defines elements characteristic of JUnit test framework to be used during test class * construction. @@ -29,21 +25,6 @@ import java.util.List; */ public class JUnitDefinition implements TestFrameworkDefinition { - @Override - public String getClassModifier() { - return "public "; - } - - @Override - public String getMethodModifier() { - return "public void "; - } - - @Override - public String getLineSuffix() { - return ";"; - } - @Override public String getClassExtension() { return ".java"; @@ -59,29 +40,9 @@ public class JUnitDefinition implements TestFrameworkDefinition { return "org.junit.Ignore"; } - @Override - public List getOrderAnnotationImports() { - return new ArrayList(Arrays.asList("org.junit.FixMethodOrder", "org.junit.runners.MethodSorters")); - } - - @Override - public String getOrderAnnotation() { - return "@FixMethodOrder(MethodSorters.NAME_ASCENDING)"; - } - @Override public String getIgnoreAnnotation() { return "@Ignore"; } - @Override - public boolean annotationLevelRules() { - return false; - } - - @Override - public String getRuleAnnotation(String annotationValue) { - throw new UnsupportedOperationException("Not available in JUnit."); - } - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/SpockDefinition.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/SpockDefinition.java index 548fd8009b..364e20d6ee 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/SpockDefinition.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/SpockDefinition.java @@ -16,10 +16,6 @@ package org.springframework.cloud.contract.verifier.config.framework; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * Defines elements characteristic of Spock test framework to be used during test class * construction. @@ -29,21 +25,6 @@ import java.util.List; */ public class SpockDefinition implements TestFrameworkDefinition { - @Override - public String getClassModifier() { - return ""; - } - - @Override - public String getMethodModifier() { - return "def "; - } - - @Override - public String getLineSuffix() { - return ""; - } - @Override public String getClassExtension() { return ".groovy"; @@ -59,29 +40,9 @@ public class SpockDefinition implements TestFrameworkDefinition { return "spock.lang.Ignore"; } - @Override - public List getOrderAnnotationImports() { - return new ArrayList(Arrays.asList("spock.lang.Stepwise")); - } - - @Override - public String getOrderAnnotation() { - return "@Stepwise"; - } - @Override public String getIgnoreAnnotation() { return "@Ignore"; } - @Override - public boolean annotationLevelRules() { - return false; - } - - @Override - public String getRuleAnnotation(String annotationValue) { - throw new UnsupportedOperationException("Not available in Spock."); - } - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java index aa5263a167..9ae2d46794 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java @@ -16,8 +16,6 @@ package org.springframework.cloud.contract.verifier.config.framework; -import java.util.List; - /** * @deprecated appropriate implementations of * org.springframework.cloud.contract.verifier.builder.Visitor should be used @@ -31,24 +29,6 @@ import java.util.List; @Deprecated public interface TestFrameworkDefinition { - /** - * @return the class access level modifier. E.g. for Java tests that would mean - * {@code public} - */ - String getClassModifier(); - - /** - * @return the method access level modifier along with the return type. E.g. for Java - * tests that would mean {@code public void} - */ - String getMethodModifier(); - - /** - * @return the characters that should end each line. E.g. for Java tests that would - * mean {@code ;} - */ - String getLineSuffix(); - /** * @return the file extension. E.g. for Java tests that would be {@code .java} */ @@ -65,36 +45,10 @@ public interface TestFrameworkDefinition { */ String getIgnoreClass(); - /** - * @return the qualified names of the classes that are used for arranging tests into - * scenarios. E.g. for JUnit 4 tests that would be {@code 'org.junit.FixMethodOrder'}, - * {@code 'org.junit.runners.MethodSorters'} - */ - List getOrderAnnotationImports(); - - /** - * @return the annotation used for arranging tests into scenarios. E.g. for JUnit test - * that would be {@code @FixMethodOrder(MethodSorters.NAME_ASCENDING)} - */ - String getOrderAnnotation(); - /** * @return the annotation used for ignoring or disabling tests. E.g. for JUnit tests * that would mean {@code @Ignore} */ String getIgnoreAnnotation(); - /** - * @return a boolean indicating whether an annotation-type rule or extension is being - * used or not. E.g. for JUnit 5 tests that would return {@code true} - */ - boolean annotationLevelRules(); - - /** - * @param annotationValue value of the annotation - * @return the test rule or extension annotation with the annotationValue passed as an - * argument. E.g. for JUnit 5 tests that could be {@code @ExtendWith(Example.class)} - */ - String getRuleAnnotation(String annotationValue); - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestNGDefinition.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestNGDefinition.java index c05e0a66b1..1b971ac1d4 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestNGDefinition.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/config/framework/TestNGDefinition.java @@ -16,8 +16,6 @@ package org.springframework.cloud.contract.verifier.config.framework; -import java.util.List; - /** * Defines elements characteristic of TestNG test framework to be used during test class * construction. @@ -27,21 +25,6 @@ import java.util.List; */ public class TestNGDefinition implements TestFrameworkDefinition { - @Override - public String getClassModifier() { - return "public "; - } - - @Override - public String getMethodModifier() { - return "public void "; - } - - @Override - public String getLineSuffix() { - return ";"; - } - @Override public String getClassExtension() { return ".java"; @@ -58,30 +41,10 @@ public class TestNGDefinition implements TestFrameworkDefinition { "There is no @Ignore annotation for TestNG. A test can be disabled directly in the @Test annotation"); } - @Override - public List getOrderAnnotationImports() { - throw new UnsupportedOperationException("Not implemented yet in TestNG"); - } - - @Override - public String getOrderAnnotation() { - throw new UnsupportedOperationException("Not implemented yet in TestNG"); - } - @Override public String getIgnoreAnnotation() { throw new UnsupportedOperationException( "There is no @Ignore annotation for TestNG. A test can be disabled directly in the @Test annotation"); } - @Override - public boolean annotationLevelRules() { - return false; - } - - @Override - public String getRuleAnnotation(String annotationValue) { - throw new UnsupportedOperationException("Not available in TestNG."); - } - } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java index b0514b2458..35a9ee96a2 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java @@ -73,15 +73,6 @@ public class SpringAmqpStubMessages implements MessageVerifier { private RabbitProperties rabbitProperties; - @Deprecated - public SpringAmqpStubMessages(RabbitTemplate rabbitTemplate, MessageListenerAccessor messageListenerAccessor) { - Assert.notNull(rabbitTemplate, "RabbitTemplate must be set"); - Assert.isTrue(mockingDetails(rabbitTemplate).isSpy() || mockingDetails(rabbitTemplate).isMock(), - "StubRunner AMQP will work only if RabbiTemplate is a spy"); - this.rabbitTemplate = rabbitTemplate; - this.messageListenerAccessor = messageListenerAccessor; - } - @Autowired public SpringAmqpStubMessages(RabbitTemplate rabbitTemplate, MessageListenerAccessor messageListenerAccessor, RabbitProperties rabbitProperties) { diff --git a/spring-cloud-contract-verifier/src/test/resources/directory/with/common-messaging/social-service/src/main/resources/contracts/facebook_client/rest/shouldUpdateUserInfo.groovy b/spring-cloud-contract-verifier/src/test/resources/directory/with/common-messaging/social-service/src/main/resources/contracts/facebook_client/rest/shouldUpdateUserInfo.groovy index d6e0afe8d4..37993db6a9 100644 --- a/spring-cloud-contract-verifier/src/test/resources/directory/with/common-messaging/social-service/src/main/resources/contracts/facebook_client/rest/shouldUpdateUserInfo.groovy +++ b/spring-cloud-contract-verifier/src/test/resources/directory/with/common-messaging/social-service/src/main/resources/contracts/facebook_client/rest/shouldUpdateUserInfo.groovy @@ -29,7 +29,7 @@ User's information should be update if has appropriate age firstName: "asd", lastName : "asd" ]) - stubMatchers { + bodyMatchers { jsonPath('$.userId', byRegex("[1-9]{1}([0-9]{7})")) jsonPath('$.age', byRegex("(1[89]|[2-9][0-9])")) jsonPath('$.firstName', byRegex("[a-zA-Z]{2,20}")) @@ -47,7 +47,7 @@ User's information should be update if has appropriate age firstName: fromRequest().body("firstName"), lastName : fromRequest().body("lastName") ]) - testMatchers { + bodyMatchers { jsonPath('$.userId', byEquality()) jsonPath('$.age', byEquality()) jsonPath('$.firstName', byEquality()) diff --git a/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy b/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy index dd648994f2..d781f2eae9 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy +++ b/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy @@ -23,7 +23,7 @@ import groovy.transform.CompileStatic import groovy.util.logging.Commons import org.springframework.cloud.contract.stubrunner.HttpServerStub -import org.springframework.util.SocketUtils +import org.springframework.cloud.contract.stubrunner.HttpServerStubConfiguration @Commons @CompileStatic @@ -47,13 +47,8 @@ class MocoHttpServerStub implements HttpServerStub { } @Override - HttpServerStub start() { - return start(SocketUtils.findAvailableTcpPort()) - } - - @Override - HttpServerStub start(int port) { - this.port = port + HttpServerStub start(HttpServerStubConfiguration configuration) { + this.port = configuration.port return this }