Refactored internals

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Headers.java

@@ -42,10 +42,6 @@ public class Headers {
 	private static final BiFunction<String, Header, Object> SERVER_SIDE = (s,
 			header) -> ContractUtils.convertTestSideRecursively(header);
 
-	private MediaTypes mediaTypes = new MediaTypes();
-
-	private MessagingHeaders messagingHeaders = new MessagingHeaders();
-
 	private Set<Header> entries = new LinkedHashSet<>();
 
 	public void header(Map<String, Object> singleHeader) {
@@ -75,11 +71,11 @@ public class Headers {
 	}
 
 	public void contentType(String contentType) {
-		header(HttpHeaders.contentType(), matching(contentType));
+		header(HttpHeaders.CONTENT_TYPE, matching(contentType));
 	}
 
 	public void messagingContentType(String contentType) {
-		header(messagingHeaders.messagingContentType(), matching(contentType));
+		header(MessagingHeaders.MESSAGING_CONTENT_TYPE, matching(contentType));
 	}
 
 	/**
@@ -144,22 +140,6 @@ public class Headers {
 		return "Headers{" + "\nentries=" + entries + '}';
 	}
 
-	public MediaTypes getMediaTypes() {
-		return mediaTypes;
-	}
-
-	public void setMediaTypes(MediaTypes mediaTypes) {
-		this.mediaTypes = mediaTypes;
-	}
-
-	public MessagingHeaders getMessagingHeaders() {
-		return messagingHeaders;
-	}
-
-	public void setMessagingHeaders(MessagingHeaders messagingHeaders) {
-		this.messagingHeaders = messagingHeaders;
-	}
-
 	public Set<Header> getEntries() {
 		return entries;
 	}
@@ -169,315 +149,315 @@ public class Headers {
 	}
 
 	public String messagingContentType() {
-		return messagingHeaders.messagingContentType();
+		return MessagingHeaders.MESSAGING_CONTENT_TYPE;
 	}
 
 	public String accept() {
-		return HttpHeaders.accept();
+		return HttpHeaders.ACCEPT;
 	}
 
 	public String acceptCharset() {
-		return HttpHeaders.acceptCharset();
+		return HttpHeaders.ACCEPT_CHARSET;
 	}
 
 	public String acceptEncoding() {
-		return HttpHeaders.acceptEncoding();
+		return HttpHeaders.ACCEPT_ENCODING;
 	}
 
 	public String acceptLanguage() {
-		return HttpHeaders.acceptLanguage();
+		return HttpHeaders.ACCEPT_LANGUAGE;
 	}
 
 	public String acceptRanges() {
-		return HttpHeaders.acceptRanges();
+		return HttpHeaders.ACCEPT_RANGES;
 	}
 
 	public String accessControlAllowCredentials() {
-		return HttpHeaders.accessControlAllowCredentials();
+		return HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS;
 	}
 
 	public String accessControlAllowHeaders() {
-		return HttpHeaders.accessControlAllowHeaders();
+		return HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS;
 	}
 
 	public String accessControlAllowMethods() {
-		return HttpHeaders.accessControlAllowMethods();
+		return HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS;
 	}
 
 	public String accessControlAllowOrigin() {
-		return HttpHeaders.accessControlAllowOrigin();
+		return HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN;
 	}
 
 	public String accessControlExposeHeaders() {
-		return HttpHeaders.accessControlExposeHeaders();
+		return HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS;
 	}
 
 	public String accessControlMaxAge() {
-		return HttpHeaders.accessControlMaxAge();
+		return HttpHeaders.ACCESS_CONTROL_MAX_AGE;
 	}
 
 	public String accessControlRequestHeaders() {
-		return HttpHeaders.accessControlRequestHeaders();
+		return HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS;
 	}
 
 	public String accessControlRequestMethod() {
-		return HttpHeaders.accessControlRequestMethod();
+		return HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD;
 	}
 
 	public String age() {
-		return HttpHeaders.age();
+		return HttpHeaders.AGE;
 	}
 
 	public String allow() {
-		return HttpHeaders.allow();
+		return HttpHeaders.ALLOW;
 	}
 
 	public String authorization() {
-		return HttpHeaders.authorization();
+		return HttpHeaders.AUTHORIZATION;
 	}
 
 	public String cacheControl() {
-		return HttpHeaders.cacheControl();
+		return HttpHeaders.CACHE_CONTROL;
 	}
 
 	public String connection() {
-		return HttpHeaders.connection();
+		return HttpHeaders.CONNECTION;
 	}
 
 	public String contentEncoding() {
-		return HttpHeaders.contentEncoding();
+		return HttpHeaders.CONTENT_ENCODING;
 	}
 
 	public String contentDisposition() {
-		return HttpHeaders.contentDisposition();
+		return HttpHeaders.CONTENT_DISPOSITION;
 	}
 
 	public String contentLanguage() {
-		return HttpHeaders.contentLanguage();
+		return HttpHeaders.CONTENT_LANGUAGE;
 	}
 
 	public String contentLength() {
-		return HttpHeaders.contentLength();
+		return HttpHeaders.CONTENT_LENGTH;
 	}
 
 	public String contentLocation() {
-		return HttpHeaders.contentLocation();
+		return HttpHeaders.CONTENT_LOCATION;
 	}
 
 	public String contentRange() {
-		return HttpHeaders.contentRange();
+		return HttpHeaders.CONTENT_RANGE;
 	}
 
 	public String contentType() {
-		return HttpHeaders.contentType();
+		return HttpHeaders.CONTENT_TYPE;
 	}
 
 	public String cookie() {
-		return HttpHeaders.cookie();
+		return HttpHeaders.COOKIE;
 	}
 
 	public String date() {
-		return HttpHeaders.date();
+		return HttpHeaders.DATE;
 	}
 
 	public String etag() {
-		return HttpHeaders.etag();
+		return HttpHeaders.ETAG;
 	}
 
 	public String expect() {
-		return HttpHeaders.expect();
+		return HttpHeaders.EXPECT;
 	}
 
 	public String expires() {
-		return HttpHeaders.expires();
+		return HttpHeaders.EXPIRES;
 	}
 
 	public String from() {
-		return HttpHeaders.from();
+		return HttpHeaders.FROM;
 	}
 
 	public String host() {
-		return HttpHeaders.host();
+		return HttpHeaders.HOST;
 	}
 
 	public String ifMatch() {
-		return HttpHeaders.ifMatch();
+		return HttpHeaders.IF_MATCH;
 	}
 
 	public String ifModifiedSince() {
-		return HttpHeaders.ifModifiedSince();
+		return HttpHeaders.IF_MODIFIED_SINCE;
 	}
 
 	public String ifNoneMatch() {
-		return HttpHeaders.ifNoneMatch();
+		return HttpHeaders.IF_NONE_MATCH;
 	}
 
 	public String ifRange() {
-		return HttpHeaders.ifRange();
+		return HttpHeaders.IF_RANGE;
 	}
 
 	public String ifUnmodifiedSince() {
-		return HttpHeaders.ifUnmodifiedSince();
+		return HttpHeaders.IF_UNMODIFIED_SINCE;
 	}
 
 	public String lastModified() {
-		return HttpHeaders.lastModified();
+		return HttpHeaders.LAST_MODIFIED;
 	}
 
 	public String link() {
-		return HttpHeaders.link();
+		return HttpHeaders.LINK;
 	}
 
 	public String location() {
-		return HttpHeaders.location();
+		return HttpHeaders.LOCATION;
 	}
 
 	public String max_forwards() {
-		return HttpHeaders.max_forwards();
+		return HttpHeaders.MAX_FORWARDS;
 	}
 
 	public String origin() {
-		return HttpHeaders.origin();
+		return HttpHeaders.ORIGIN;
 	}
 
 	public String pragma() {
-		return HttpHeaders.pragma();
+		return HttpHeaders.PRAGMA;
 	}
 
 	public String proxyAuthenticate() {
-		return HttpHeaders.proxyAuthenticate();
+		return HttpHeaders.PROXY_AUTHENTICATE;
 	}
 
 	public String proxyAuthorization() {
-		return HttpHeaders.proxyAuthorization();
+		return HttpHeaders.PROXY_AUTHORIZATION;
 	}
 
 	public String range() {
-		return HttpHeaders.range();
+		return HttpHeaders.RANGE;
 	}
 
 	public String referer() {
-		return HttpHeaders.referer();
+		return HttpHeaders.REFERER;
 	}
 
 	public String retryAfter() {
-		return HttpHeaders.retryAfter();
+		return HttpHeaders.RETRY_AFTER;
 	}
 
 	public String server() {
-		return HttpHeaders.server();
+		return HttpHeaders.SERVER;
 	}
 
 	public String setCookie() {
-		return HttpHeaders.setCookie();
+		return HttpHeaders.SET_COOKIE;
 	}
 
 	public String setCookie2() {
-		return HttpHeaders.setCookie2();
+		return HttpHeaders.SET_COOKIE_2;
 	}
 
 	public String te() {
-		return HttpHeaders.te();
+		return HttpHeaders.TE;
 	}
 
 	public String trailer() {
-		return HttpHeaders.trailer();
+		return HttpHeaders.TRAILER;
 	}
 
 	public String transferEncoding() {
-		return HttpHeaders.transferEncoding();
+		return HttpHeaders.TRANSFER_ENCODING;
 	}
 
 	public String upgrade() {
-		return HttpHeaders.upgrade();
+		return HttpHeaders.UPGRADE;
 	}
 
 	public String user_agent() {
-		return HttpHeaders.user_agent();
+		return HttpHeaders.USER_AGENT;
 	}
 
 	public String vary() {
-		return HttpHeaders.vary();
+		return HttpHeaders.VARY;
 	}
 
 	public String via() {
-		return HttpHeaders.via();
+		return HttpHeaders.VIA;
 	}
 
 	public String warning() {
-		return HttpHeaders.warning();
+		return HttpHeaders.WARNING;
 	}
 
 	public String wwwAuthenticate() {
-		return HttpHeaders.wwwAuthenticate();
+		return HttpHeaders.WWW_AUTHENTICATE;
 	}
 
 	public String allValue() {
-		return mediaTypes.allValue();
+		return MediaTypes.ALL_VALUE;
 	}
 
 	public String applicationAtomXml() {
-		return mediaTypes.applicationAtomXml();
+		return MediaTypes.APPLICATION_ATOM_XML;
 	}
 
 	public String applicationFormUrlencoded() {
-		return mediaTypes.applicationFormUrlencoded();
+		return MediaTypes.APPLICATION_FORM_URLENCODED;
 	}
 
 	public String applicationJson() {
-		return mediaTypes.applicationJson();
+		return MediaTypes.APPLICATION_JSON;
 	}
 
 	public String applicationJsonUtf8() {
-		return mediaTypes.applicationJsonUtf8();
+		return MediaTypes.APPLICATION_JSON_UTF8;
 	}
 
 	public String applicationOctetStream() {
-		return mediaTypes.applicationOctetStream();
+		return MediaTypes.APPLICATION_OCTET_STREAM;
 	}
 
 	public String applicationPdf() {
-		return mediaTypes.applicationPdf();
+		return MediaTypes.APPLICATION_PDF;
 	}
 
 	public String applicationXhtmlXml() {
-		return mediaTypes.applicationXhtmlXml();
+		return MediaTypes.APPLICATION_XHTML_XML;
 	}
 
 	public String applicationXml() {
-		return mediaTypes.applicationXml();
+		return MediaTypes.APPLICATION_XML;
 	}
 
 	public String imageGif() {
-		return mediaTypes.imageGif();
+		return MediaTypes.IMAGE_GIF;
 	}
 
 	public String imageJpeg() {
-		return mediaTypes.imageJpeg();
+		return MediaTypes.IMAGE_JPEG;
 	}
 
 	public String imagePng() {
-		return mediaTypes.imagePng();
+		return MediaTypes.IMAGE_PNG;
 	}
 
 	public String multipartFormData() {
-		return mediaTypes.multipartFormData();
+		return MediaTypes.MULTIPART_FORM_DATA;
 	}
 
 	public String textHtml() {
-		return mediaTypes.textHtml();
+		return MediaTypes.TEXT_HTML;
 	}
 
 	public String textMarkdown() {
-		return mediaTypes.textMarkdown();
+		return MediaTypes.TEXT_MARKDOWN;
 	}
 
 	public String textPlain() {
-		return mediaTypes.textPlain();
+		return MediaTypes.TEXT_PLAIN;
 	}
 
 	public String textXml() {
-		return mediaTypes.textXml();
+		return MediaTypes.TEXT_XML;
 	}
 
 }

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/HttpMethods.java

@@ -25,69 +25,134 @@ package org.springframework.cloud.contract.spec.internal;
  */
 public final class HttpMethods {
 
-	public HttpMethods() {
-		System.out.println("WARNING: HttpMethods shouldn't be instantiated");
-	}
-
 	/**
 	 * @return {@code GET}.
 	 */
-	public static HttpMethod GET() {
+	public static String GET = "GET";
+
+	/**
+	 * @return {@code HEAD}.
+	 */
+	public static String HEAD = "HEAD";
+
+	/**
+	 * @return {@code POST}.
+	 */
+	public static String POST = "POST";
+
+	/**
+	 * @return {@code PUT}.
+	 */
+	public static String PUT = "PUT";
+
+	/**
+	 * @return {@code PATCH}.
+	 */
+	public static String PATCH = "PATCH";
+
+	/**
+	 * @return {@code DELETE}.
+	 */
+	public static String DELETE = "DELETE";
+
+	/**
+	 * @return {@code OPTIONS}.
+	 */
+	public static String OPTIONS = "OPTIONS";
+
+	/**
+	 * @return {@code TRACE}.
+	 */
+	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}.
 	 */
-	public static HttpMethod HEAD() {
+	@Deprecated
+	public HttpMethod HEAD() {
 		return HttpMethod.HEAD;
 	}
 
 	/**
 	 * @return {@code POST}.
+	 * @deprecated Replaced by {@code HttpMethods.POST}.
 	 */
-	public static HttpMethod POST() {
+	@Deprecated
+	public HttpMethod POST() {
 		return HttpMethod.POST;
 	}
 
 	/**
 	 * @return {@code PUT}.
+	 * @deprecated Replaced by {@code HttpMethods.PUT}.
 	 */
-	public static HttpMethod PUT() {
+	@Deprecated
+	public HttpMethod PUT() {
 		return HttpMethod.PUT;
 	}
 
 	/**
 	 * @return {@code PATCH}.
+	 * @deprecated Replaced by {@code HttpMethods.PATCH}.
 	 */
-	public static HttpMethod PATCH() {
+	@Deprecated
+	public HttpMethod PATCH() {
 		return HttpMethod.PATCH;
 	}
 
 	/**
 	 * @return {@code DELETE}.
+	 * @deprecated Replaced by {@code HttpMethods.DELETE}.
 	 */
-	public static HttpMethod DELETE() {
+	@Deprecated
+	public HttpMethod DELETE() {
 		return HttpMethod.DELETE;
 	}
 
 	/**
 	 * @return {@code OPTIONS}.
+	 * @deprecated Replaced by {@code HttpMethods.OPTIONS}.
 	 */
-	public static HttpMethod OPTIONS() {
+	@Deprecated
+	public HttpMethod OPTIONS() {
 		return HttpMethod.OPTIONS;
 	}
 
 	/**
 	 * @return {@code TRACE}.
+	 * @deprecated Replaced by {@code HttpMethods.TRACE}.
 	 */
-	public static HttpMethod TRACE() {
+	@Deprecated
+	public HttpMethod TRACE() {
 		return HttpMethod.TRACE;
 	}
 
 	public enum HttpMethod {
 
-		GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
+		GET(HttpMethods.GET), HEAD(HttpMethods.HEAD), POST(HttpMethods.POST), PUT(
+				HttpMethods.PUT), PATCH(HttpMethods.PATCH), DELETE(
+						HttpMethods.DELETE), OPTIONS(
+								HttpMethods.OPTIONS), TRACE(HttpMethods.TRACE),;
+
+		private final String methodName;
+
+		HttpMethod(String methodName) {
+			this.methodName = methodName;
+		}
+
+		public String getMethodName() {
+			return methodName;
+		}
 
 	}
 

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MediaTypes.java

@@ -20,76 +20,265 @@ package org.springframework.cloud.contract.spec.internal;
  * Contains most commonly used media types.
  *
  * @author Marcin Grzejszczak
+ * @author Tim Ysewyn
  * @since 1.0.2
  */
 public class MediaTypes {
 
+	/**
+	 * Public constant for that includes all media ranges (i.e. "*/*").
+	 * @return {@code */*}
+	 */
+	public static final String ALL_VALUE = "*/*";
+
+	/**
+	 * Public constant for {@code application/atom+xml}.
+	 * @return {@code application/atom+xml}
+	 */
+	public static final String APPLICATION_ATOM_XML = "application/atom+xml";
+
+	/**
+	 * Public constant for {@code application/x-www-form-urlencoded}.
+	 * @return {@code application/x-www-form-urlencoded}
+	 */
+	public static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
+
+	/**
+	 * Public constant for {@code application/json}.
+	 * @return {@code application/json}
+	 */
+	public static final String APPLICATION_JSON = "application/json";
+
+	/**
+	 * Public constant for {@code application/json;charset=UTF-8}.
+	 * @return {@code application/json;charset=UTF-8}
+	 */
+	public static final String APPLICATION_JSON_UTF8 = APPLICATION_JSON
+			+ ";charset=UTF-8";
+
+	/**
+	 * Public constant for {@code application/octet-stream}.
+	 * @return {@code application/octet-stream}
+	 */
+	public static final String APPLICATION_OCTET_STREAM = "application/octet-stream";
+
+	/**
+	 * Public constant for {@code application/pdf}.
+	 * @return {@code application/pdf}
+	 */
+	public static final String APPLICATION_PDF = "application/pdf";
+
+	/**
+	 * Public constant for {@code application/xhtml+xml}.
+	 * @return {@code application/xhtml+xml}
+	 */
+	public static final String APPLICATION_XHTML_XML = "application/xhtml+xml";
+
+	/**
+	 * Public constant for {@code application/xml}.
+	 * @return {@code application/xml}
+	 */
+	public static final String APPLICATION_XML = "application/xml";
+
+	/**
+	 * Public constant for {@code image/gif}.
+	 * @return {@code image/gif}
+	 */
+	public static final String IMAGE_GIF = "image/gif";
+
+	/**
+	 * Public constant for {@code image/jpeg}.
+	 * @return {@code image/jpeg}
+	 */
+	public static final String IMAGE_JPEG = "image/jpeg";
+
+	/**
+	 * Public constant for {@code image/png}.
+	 * @return {@code image/png}
+	 */
+	public static final String IMAGE_PNG = "image/png";
+
+	/**
+	 * Public constant for {@code multipart/form-data}.
+	 * @return {@code multipart/form-data}
+	 */
+	public static final String MULTIPART_FORM_DATA = "multipart/form-data";
+
+	/**
+	 * Public constant for {@code text/html}.
+	 * @return {@code text/html}
+	 */
+	public static final String TEXT_HTML = "text/html";
+
+	/**
+	 * Public constant for {@code text/markdown}.
+	 * @return {@code text/markdown}
+	 */
+	public static final String TEXT_MARKDOWN = "text/markdown";
+
+	/**
+	 * Public constant for {@code text/plain}.
+	 * @return {@code text/plain}
+	 */
+	public static final String TEXT_PLAIN = "text/plain";
+
+	/**
+	 * Public constant for {@code text/xml}.
+	 * @return {@code text/xml}
+	 */
+	public static final String TEXT_XML = "text/xml";
+
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.ALL_VALUE}.
+	 * @return {@code MediaTypes.ALL_VALUE}
+	 */
+	@Deprecated
 	public String allValue() {
-		return "*/*";
+		return ALL_VALUE;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_ATOM_XML}.
+	 * @return {@code MediaTypes.APPLICATION_ATOM_XML}
+	 */
+	@Deprecated
 	public String applicationAtomXml() {
-		return "application/atom+xml";
+		return APPLICATION_ATOM_XML;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_FORM_URLENCODED}.
+	 * @return {@code MediaTypes.APPLICATION_FORM_URLENCODED}
+	 */
+	@Deprecated
 	public String applicationFormUrlencoded() {
-		return "application/x-www-form-urlencoded";
+		return APPLICATION_FORM_URLENCODED;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_JSON}.
+	 * @return {@code MediaTypes.APPLICATION_JSON}
+	 */
+	@Deprecated
 	public String applicationJson() {
-		return "application/json";
+		return APPLICATION_JSON;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_JSON_UTF8}.
+	 * @return {@code MediaTypes.APPLICATION_JSON_UTF8}
+	 */
+	@Deprecated
 	public String applicationJsonUtf8() {
-		return applicationJson() + ";charset=UTF-8";
+		return APPLICATION_JSON_UTF8;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_OCTET_STREAM}.
+	 * @return {@code MediaTypes.APPLICATION_OCTET_STREAM}
+	 */
+	@Deprecated
 	public String applicationOctetStream() {
-		return "application/octet-stream";
+		return APPLICATION_OCTET_STREAM;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_PDF}.
+	 * @return {@code MediaTypes.APPLICATION_PDF}
+	 */
+	@Deprecated
 	public String applicationPdf() {
-		return "application/pdf";
+		return APPLICATION_PDF;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_XHTML_XML}.
+	 * @return {@code MediaTypes.APPLICATION_XHTML_XML}
+	 */
+	@Deprecated
 	public String applicationXhtmlXml() {
-		return "application/xhtml+xml";
+		return APPLICATION_XHTML_XML;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.APPLICATION_XML}.
+	 * @return {@code MediaTypes.APPLICATION_XML}
+	 */
+	@Deprecated
 	public String applicationXml() {
-		return "application/xml";
+		return APPLICATION_XML;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.IMAGE_GIF}.
+	 * @return {@code MediaTypes.IMAGE_GIF}
+	 */
+	@Deprecated
 	public String imageGif() {
-		return "image/gif";
+		return IMAGE_GIF;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.IMAGE_JPEG}.
+	 * @return {@code MediaTypes.IMAGE_JPEG}
+	 */
+	@Deprecated
 	public String imageJpeg() {
-		return "image/jpeg";
+		return IMAGE_JPEG;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.IMAGE_PNG}.
+	 * @return {@code MediaTypes.IMAGE_PNG}
+	 */
+	@Deprecated
 	public String imagePng() {
-		return "image/png";
+		return IMAGE_PNG;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.MULTIPART_FORM_DATA}.
+	 * @return {@code MediaTypes.MULTIPART_FORM_DATA}
+	 */
+	@Deprecated
 	public String multipartFormData() {
-		return "multipart/form-data";
+		return MULTIPART_FORM_DATA;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.TEXT_HTML}.
+	 * @return {@code MediaTypes.TEXT_HTML}
+	 */
+	@Deprecated
 	public String textHtml() {
-		return "text/html";
+		return TEXT_HTML;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.TEXT_MARKDOWN}.
+	 * @return {@code MediaTypes.TEXT_MARKDOWN}
+	 */
+	@Deprecated
 	public String textMarkdown() {
-		return "text/markdown";
+		return TEXT_MARKDOWN;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.TEXT_PLAIN}.
+	 * @return {@code MediaTypes.TEXT_PLAIN}
+	 */
+	@Deprecated
 	public String textPlain() {
-		return "text/plain";
+		return TEXT_PLAIN;
 	}
 
+	/**
+	 * @deprecated Replaced by {@code MediaTypes.TEXT_XML}.
+	 * @return {@code MediaTypes.TEXT_XML}
+	 */
+	@Deprecated
 	public String textXml() {
-		return "text/xml";
+		return TEXT_XML;
 	}
 
 }

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/MessagingHeaders.java

@@ -20,6 +20,7 @@ package org.springframework.cloud.contract.spec.internal;
  * Contains most commonly used messaging headers.
  *
  * @author Marcin Grzejszczak
+ * @author Tim Ysewyn
  * @since 1.1.2
  */
 public class MessagingHeaders {
@@ -28,8 +29,16 @@ public class MessagingHeaders {
 	 * The Content Type of a message.
 	 * @return messaging content type
 	 */
+	public static final String MESSAGING_CONTENT_TYPE = "contentType";
+
+	/**
+	 * The Content Type of a message.
+	 * @return messaging content type
+	 * @deprecated Replaced by {@code MessagingHeaders.MESSAGING_CONTENT_TYPE}.
+	 */
+	@Deprecated
 	public String messagingContentType() {
-		return "contentType";
+		return MESSAGING_CONTENT_TYPE;
 	}
 
 }

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Request.java

@@ -82,9 +82,11 @@ public class Request extends Common implements RegexCreatingProperty<ClientDslPr
 	/**
 	 * Name of the HTTP method.
 	 * @param httpMethod HTTP method name
+	 * @deprecated In favor of {@code method(String method)}
 	 */
+	@Deprecated
 	public void method(HttpMethods.HttpMethod httpMethod) {
-		this.method = toDslProperty(httpMethod.toString());
+		this.method = toDslProperty(httpMethod.getMethodName());
 	}
 
 	/**
@@ -549,36 +551,36 @@ public class Request extends Common implements RegexCreatingProperty<ClientDslPr
 		return property.anyOf(values);
 	}
 
-	public HttpMethods.HttpMethod GET() {
-		return HttpMethods.GET();
+	public String GET() {
+		return HttpMethods.GET;
 	}
 
-	public HttpMethods.HttpMethod HEAD() {
-		return HttpMethods.HEAD();
+	public String HEAD() {
+		return HttpMethods.HEAD;
 	}
 
-	public HttpMethods.HttpMethod POST() {
-		return HttpMethods.POST();
+	public String POST() {
+		return HttpMethods.POST;
 	}
 
-	public HttpMethods.HttpMethod PUT() {
-		return HttpMethods.PUT();
+	public String PUT() {
+		return HttpMethods.PUT;
 	}
 
-	public HttpMethods.HttpMethod PATCH() {
-		return HttpMethods.PATCH();
+	public String PATCH() {
+		return HttpMethods.PATCH;
 	}
 
-	public HttpMethods.HttpMethod DELETE() {
-		return HttpMethods.DELETE();
+	public String DELETE() {
+		return HttpMethods.DELETE;
 	}
 
-	public HttpMethods.HttpMethod OPTIONS() {
-		return HttpMethods.OPTIONS();
+	public String OPTIONS() {
+		return HttpMethods.OPTIONS;
 	}
 
-	public HttpMethods.HttpMethod TRACE() {
-		return HttpMethods.TRACE();
+	public String TRACE() {
+		return HttpMethods.TRACE;
 	}
 
 	@Override

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Response.java

@@ -415,278 +415,278 @@ public class Response extends Common implements RegexCreatingProperty<ServerDslP
 	}
 
 	public int CONTINUE() {
-		return HttpStatus.CONTINUE();
+		return HttpStatus.CONTINUE;
 	}
 
 	public int SWITCHING_PROTOCOLS() {
-		return HttpStatus.SWITCHING_PROTOCOLS();
+		return HttpStatus.SWITCHING_PROTOCOLS;
 	}
 
 	public int PROCESSING() {
-		return HttpStatus.PROCESSING();
+		return HttpStatus.PROCESSING;
 	}
 
 	public int CHECKPOINT() {
-		return HttpStatus.CHECKPOINT();
+		return HttpStatus.CHECKPOINT;
 	}
 
 	public int OK() {
-		return HttpStatus.OK();
+		return HttpStatus.OK;
 	}
 
 	public int CREATED() {
-		return HttpStatus.CREATED();
+		return HttpStatus.CREATED;
 	}
 
 	public int ACCEPTED() {
-		return HttpStatus.ACCEPTED();
+		return HttpStatus.ACCEPTED;
 	}
 
 	public int NON_AUTHORITATIVE_INFORMATION() {
-		return HttpStatus.NON_AUTHORITATIVE_INFORMATION();
+		return HttpStatus.NON_AUTHORITATIVE_INFORMATION;
 	}
 
 	public int NO_CONTENT() {
-		return HttpStatus.NO_CONTENT();
+		return HttpStatus.NO_CONTENT;
 	}
 
 	public int RESET_CONTENT() {
-		return HttpStatus.RESET_CONTENT();
+		return HttpStatus.RESET_CONTENT;
 	}
 
 	public int PARTIAL_CONTENT() {
-		return HttpStatus.PARTIAL_CONTENT();
+		return HttpStatus.PARTIAL_CONTENT;
 	}
 
 	public int MULTI_STATUS() {
-		return HttpStatus.MULTI_STATUS();
+		return HttpStatus.MULTI_STATUS;
 	}
 
 	public int ALREADY_REPORTED() {
-		return HttpStatus.ALREADY_REPORTED();
+		return HttpStatus.ALREADY_REPORTED;
 	}
 
 	public int IM_USED() {
-		return HttpStatus.IM_USED();
+		return HttpStatus.IM_USED;
 	}
 
 	public int MULTIPLE_CHOICES() {
-		return HttpStatus.MULTIPLE_CHOICES();
+		return HttpStatus.MULTIPLE_CHOICES;
 	}
 
 	public int MOVED_PERMANENTLY() {
-		return HttpStatus.MOVED_PERMANENTLY();
+		return HttpStatus.MOVED_PERMANENTLY;
 	}
 
 	public int FOUND() {
-		return HttpStatus.FOUND();
+		return HttpStatus.FOUND;
 	}
 
 	@Deprecated
 	public int MOVED_TEMPORARILY() {
-		return HttpStatus.MOVED_TEMPORARILY();
+		return HttpStatus.MOVED_TEMPORARILY;
 	}
 
 	public int SEE_OTHER() {
-		return HttpStatus.SEE_OTHER();
+		return HttpStatus.SEE_OTHER;
 	}
 
 	public int NOT_MODIFIED() {
-		return HttpStatus.NOT_MODIFIED();
+		return HttpStatus.NOT_MODIFIED;
 	}
 
 	@Deprecated
 	public int USE_PROXY() {
-		return HttpStatus.USE_PROXY();
+		return HttpStatus.USE_PROXY;
 	}
 
 	public int TEMPORARY_REDIRECT() {
-		return HttpStatus.TEMPORARY_REDIRECT();
+		return HttpStatus.TEMPORARY_REDIRECT;
 	}
 
 	public int PERMANENT_REDIRECT() {
-		return HttpStatus.PERMANENT_REDIRECT();
+		return HttpStatus.PERMANENT_REDIRECT;
 	}
 
 	public int BAD_REQUEST() {
-		return HttpStatus.BAD_REQUEST();
+		return HttpStatus.BAD_REQUEST;
 	}
 
 	public int UNAUTHORIZED() {
-		return HttpStatus.UNAUTHORIZED();
+		return HttpStatus.UNAUTHORIZED;
 	}
 
 	public int PAYMENT_REQUIRED() {
-		return HttpStatus.PAYMENT_REQUIRED();
+		return HttpStatus.PAYMENT_REQUIRED;
 	}
 
 	public int FORBIDDEN() {
-		return HttpStatus.FORBIDDEN();
+		return HttpStatus.FORBIDDEN;
 	}
 
 	public int NOT_FOUND() {
-		return HttpStatus.NOT_FOUND();
+		return HttpStatus.NOT_FOUND;
 	}
 
 	public int METHOD_NOT_ALLOWED() {
-		return HttpStatus.METHOD_NOT_ALLOWED();
+		return HttpStatus.METHOD_NOT_ALLOWED;
 	}
 
 	public int NOT_ACCEPTABLE() {
-		return HttpStatus.NOT_ACCEPTABLE();
+		return HttpStatus.NOT_ACCEPTABLE;
 	}
 
 	public int PROXY_AUTHENTICATION_REQUIRED() {
-		return HttpStatus.PROXY_AUTHENTICATION_REQUIRED();
+		return HttpStatus.PROXY_AUTHENTICATION_REQUIRED;
 	}
 
 	public int REQUEST_TIMEOUT() {
-		return HttpStatus.REQUEST_TIMEOUT();
+		return HttpStatus.REQUEST_TIMEOUT;
 	}
 
 	public int CONFLICT() {
-		return HttpStatus.CONFLICT();
+		return HttpStatus.CONFLICT;
 	}
 
 	public int GONE() {
-		return HttpStatus.GONE();
+		return HttpStatus.GONE;
 	}
 
 	public int LENGTH_REQUIRED() {
-		return HttpStatus.LENGTH_REQUIRED();
+		return HttpStatus.LENGTH_REQUIRED;
 	}
 
 	public int PRECONDITION_FAILED() {
-		return HttpStatus.PRECONDITION_FAILED();
+		return HttpStatus.PRECONDITION_FAILED;
 	}
 
 	public int PAYLOAD_TOO_LARGE() {
-		return HttpStatus.PAYLOAD_TOO_LARGE();
+		return HttpStatus.PAYLOAD_TOO_LARGE;
 	}
 
 	@Deprecated
 	public int REQUEST_ENTITY_TOO_LARGE() {
-		return HttpStatus.REQUEST_ENTITY_TOO_LARGE();
+		return HttpStatus.REQUEST_ENTITY_TOO_LARGE;
 	}
 
 	public int URI_TOO_LONG() {
-		return HttpStatus.URI_TOO_LONG();
+		return HttpStatus.URI_TOO_LONG;
 	}
 
 	@Deprecated
 	public int REQUEST_URI_TOO_LONG() {
-		return HttpStatus.REQUEST_URI_TOO_LONG();
+		return HttpStatus.REQUEST_URI_TOO_LONG;
 	}
 
 	public int UNSUPPORTED_MEDIA_TYPE() {
-		return HttpStatus.UNSUPPORTED_MEDIA_TYPE();
+		return HttpStatus.UNSUPPORTED_MEDIA_TYPE;
 	}
 
 	public int REQUESTED_RANGE_NOT_SATISFIABLE() {
-		return HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE();
+		return HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE;
 	}
 
 	public int EXPECTATION_FAILED() {
-		return HttpStatus.EXPECTATION_FAILED();
+		return HttpStatus.EXPECTATION_FAILED;
 	}
 
 	public int I_AM_A_TEAPOT() {
-		return HttpStatus.I_AM_A_TEAPOT();
+		return HttpStatus.I_AM_A_TEAPOT;
 	}
 
 	@Deprecated
 	public int INSUFFICIENT_SPACE_ON_RESOURCE() {
-		return HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE();
+		return HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE;
 	}
 
 	@Deprecated
 	public int METHOD_FAILURE() {
-		return HttpStatus.METHOD_FAILURE();
+		return HttpStatus.METHOD_FAILURE;
 	}
 
 	@Deprecated
 	public int DESTINATION_LOCKED() {
-		return HttpStatus.DESTINATION_LOCKED();
+		return HttpStatus.DESTINATION_LOCKED;
 	}
 
 	public int UNPROCESSABLE_ENTITY() {
-		return HttpStatus.UNPROCESSABLE_ENTITY();
+		return HttpStatus.UNPROCESSABLE_ENTITY;
 	}
 
 	public int LOCKED() {
-		return HttpStatus.LOCKED();
+		return HttpStatus.LOCKED;
 	}
 
 	public int FAILED_DEPENDENCY() {
-		return HttpStatus.FAILED_DEPENDENCY();
+		return HttpStatus.FAILED_DEPENDENCY;
 	}
 
 	public int UPGRADE_REQUIRED() {
-		return HttpStatus.UPGRADE_REQUIRED();
+		return HttpStatus.UPGRADE_REQUIRED;
 	}
 
 	public int PRECONDITION_REQUIRED() {
-		return HttpStatus.PRECONDITION_REQUIRED();
+		return HttpStatus.PRECONDITION_REQUIRED;
 	}
 
 	public int TOO_MANY_REQUESTS() {
-		return HttpStatus.TOO_MANY_REQUESTS();
+		return HttpStatus.TOO_MANY_REQUESTS;
 	}
 
 	public int REQUEST_HEADER_FIELDS_TOO_LARGE() {
-		return HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE();
+		return HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE;
 	}
 
 	public int UNAVAILABLE_FOR_LEGAL_REASONS() {
-		return HttpStatus.UNAVAILABLE_FOR_LEGAL_REASONS();
+		return HttpStatus.UNAVAILABLE_FOR_LEGAL_REASONS;
 	}
 
 	public int INTERNAL_SERVER_ERROR() {
-		return HttpStatus.INTERNAL_SERVER_ERROR();
+		return HttpStatus.INTERNAL_SERVER_ERROR;
 	}
 
 	public int NOT_IMPLEMENTED() {
-		return HttpStatus.NOT_IMPLEMENTED();
+		return HttpStatus.NOT_IMPLEMENTED;
 	}
 
 	public int BAD_GATEWAY() {
-		return HttpStatus.BAD_GATEWAY();
+		return HttpStatus.BAD_GATEWAY;
 	}
 
 	public int SERVICE_UNAVAILABLE() {
-		return HttpStatus.SERVICE_UNAVAILABLE();
+		return HttpStatus.SERVICE_UNAVAILABLE;
 	}
 
 	public int GATEWAY_TIMEOUT() {
-		return HttpStatus.GATEWAY_TIMEOUT();
+		return HttpStatus.GATEWAY_TIMEOUT;
 	}
 
 	public int HTTP_VERSION_NOT_SUPPORTED() {
-		return HttpStatus.HTTP_VERSION_NOT_SUPPORTED();
+		return HttpStatus.HTTP_VERSION_NOT_SUPPORTED;
 	}
 
 	public int VARIANT_ALSO_NEGOTIATES() {
-		return HttpStatus.VARIANT_ALSO_NEGOTIATES();
+		return HttpStatus.VARIANT_ALSO_NEGOTIATES;
 	}
 
 	public int INSUFFICIENT_STORAGE() {
-		return HttpStatus.INSUFFICIENT_STORAGE();
+		return HttpStatus.INSUFFICIENT_STORAGE;
 	}
 
 	public int LOOP_DETECTED() {
-		return HttpStatus.LOOP_DETECTED();
+		return HttpStatus.LOOP_DETECTED;
 	}
 
 	public int BANDWIDTH_LIMIT_EXCEEDED() {
-		return HttpStatus.BANDWIDTH_LIMIT_EXCEEDED();
+		return HttpStatus.BANDWIDTH_LIMIT_EXCEEDED;
 	}
 
 	public int NOT_EXTENDED() {
-		return HttpStatus.NOT_EXTENDED();
+		return HttpStatus.NOT_EXTENDED;
 	}
 
 	public int NETWORK_AUTHENTICATION_REQUIRED() {
-		return HttpStatus.NETWORK_AUTHENTICATION_REQUIRED();
+		return HttpStatus.NETWORK_AUTHENTICATION_REQUIRED;
 	}
 
 	@Override