SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated metadata name

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-09-17 18:04:27 +02:00
parent 33c7219336
commit b839ebfa46
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/src/main/asciidoc/_project-features-flows.adoc
View File

@@ -744,7 +744,7 @@ package contracts.beer.rest
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.http.ContractVerifierHttpMetadata
import org.springframework.cloud.contract.verifier.http.ContractVerifierHttpMetaData
Contract.make {
description("""
@@ -780,7 +780,7 @@ then:
}
metadata([
"verifierHttp": [
"protocol": ContractVerifierHttpMetadata.Protocol.H2_PRIOR_KNOWLEDGE.toString()
"protocol": ContractVerifierHttpMetaData.Protocol.H2_PRIOR_KNOWLEDGE.toString()
]
])
}

4
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/CustomModeSchemeProtocolGiven.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.contract.verifier.builder;
import org.springframework.cloud.contract.spec.Contract;
import org.springframework.cloud.contract.spec.internal.Request;
import org.springframework.cloud.contract.verifier.file.SingleContractMetadata;
import org.springframework.cloud.contract.verifier.http.ContractVerifierHttpMetadata;
import org.springframework.cloud.contract.verifier.http.ContractVerifierHttpMetaData;
class CustomModeSchemeProtocolGiven implements Given {
@@ -32,7 +32,7 @@ class CustomModeSchemeProtocolGiven implements Given {
@Override
public MethodVisitor<Given> apply(SingleContractMetadata metadata) {
Contract contract = metadata.getContract();
ContractVerifierHttpMetadata httpMetadata = ContractVerifierHttpMetadata
ContractVerifierHttpMetaData httpMetadata = ContractVerifierHttpMetaData
.fromMetadata(contract.getMetadata());
this.blockBuilder
.addIndented(".scheme(\"" + httpMetadata.getScheme().name() + "\")")

6
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/ContractVerifierHttpMetadata.java → spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/ContractVerifierHttpMetaData.java
View File

@@ -32,7 +32,7 @@ import org.springframework.lang.Nullable;
* @author Marcin Grzejszczak
* @since 3.0.0
*/
public class ContractVerifierHttpMetadata implements SpringCloudContractMetadata {
public class ContractVerifierHttpMetaData implements SpringCloudContractMetadata {
/**
* Metadata entry in the contract.
@@ -50,10 +50,10 @@ public class ContractVerifierHttpMetadata implements SpringCloudContractMetadata
private Protocol protocol = Protocol.HTTP_1_1;
@NonNull
public static ContractVerifierHttpMetadata fromMetadata(
public static ContractVerifierHttpMetaData fromMetadata(
Map<String, Object> metadata) {
return MetadataUtil.fromMetadata(metadata, METADATA_KEY,
new ContractVerifierHttpMetadata());
new ContractVerifierHttpMetaData());
}
@Override

28
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/Request.java
View File

@@ -34,9 +34,9 @@ import org.springframework.cloud.contract.spec.internal.HttpMethods;
*/
public class Request {
private final ContractVerifierHttpMetadata.Protocol protocol;
private final ContractVerifierHttpMetaData.Protocol protocol;
private final ContractVerifierHttpMetadata.Scheme scheme;
private final ContractVerifierHttpMetaData.Scheme scheme;
private final HttpMethods.HttpMethod method;
@@ -50,8 +50,8 @@ public class Request {
private final Map<String, Object> cookies;
Request(ContractVerifierHttpMetadata.Protocol protocol,
ContractVerifierHttpMetadata.Scheme scheme, HttpMethods.HttpMethod method,
Request(ContractVerifierHttpMetaData.Protocol protocol,
ContractVerifierHttpMetaData.Scheme scheme, HttpMethods.HttpMethod method,
String path, List<AbstractMap.SimpleEntry<String, String>> queryParameters,
Body body, Map<String, Object> headers, Map<String, Object> cookies) {
this.protocol = protocol;
@@ -79,16 +79,16 @@ public class Request {
}
/**
* @return {@link ContractVerifierHttpMetadata.Protocol}
* @return {@link ContractVerifierHttpMetaData.Protocol}
*/
public ContractVerifierHttpMetadata.Protocol protocol() {
public ContractVerifierHttpMetaData.Protocol protocol() {
return this.protocol;
}
/**
* @return {@link ContractVerifierHttpMetadata.Scheme}
* @return {@link ContractVerifierHttpMetaData.Scheme}
*/
public ContractVerifierHttpMetadata.Scheme scheme() {
public ContractVerifierHttpMetaData.Scheme scheme() {
return this.scheme;
}
@@ -257,9 +257,9 @@ public class Request {
List<AbstractMap.SimpleEntry<String, String>> queryParameters = new LinkedList<>();
ContractVerifierHttpMetadata.Protocol protocol = ContractVerifierHttpMetadata.Protocol.HTTP_1_1;
ContractVerifierHttpMetaData.Protocol protocol = ContractVerifierHttpMetaData.Protocol.HTTP_1_1;
ContractVerifierHttpMetadata.Scheme scheme = ContractVerifierHttpMetadata.Scheme.HTTP;
ContractVerifierHttpMetaData.Scheme scheme = ContractVerifierHttpMetaData.Scheme.HTTP;
Body body;
@@ -295,7 +295,7 @@ public class Request {
* @return builder
*/
public Request.Builder scheme(String scheme) {
this.scheme = ContractVerifierHttpMetadata.Scheme.fromString(scheme);
this.scheme = ContractVerifierHttpMetaData.Scheme.fromString(scheme);
return this;
}
@@ -304,7 +304,7 @@ public class Request {
* @return builder
*/
public Request.Builder protocol(String protocol) {
this.protocol = ContractVerifierHttpMetadata.Protocol.fromString(protocol);
this.protocol = ContractVerifierHttpMetaData.Protocol.fromString(protocol);
return this;
}
@@ -312,7 +312,7 @@ public class Request {
* @param scheme representation of a scheme
* @return builder
*/
public Request.Builder scheme(ContractVerifierHttpMetadata.Scheme scheme) {
public Request.Builder scheme(ContractVerifierHttpMetaData.Scheme scheme) {
this.scheme = scheme;
return this;
}
@@ -321,7 +321,7 @@ public class Request {
* @param protocol representation of a protocol
* @return builder
*/
public Request.Builder protocol(ContractVerifierHttpMetadata.Protocol protocol) {
public Request.Builder protocol(ContractVerifierHttpMetaData.Protocol protocol) {
this.protocol = protocol;
return this;
}

6
spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/http/RequestTests.java
View File

@@ -31,8 +31,8 @@ class RequestTests {
.header("header", "header-value")
.cookie("cookie", "cookie-value")
.queryParam("query", "param-value")
.protocol(ContractVerifierHttpMetadata.Protocol.HTTP_1_1)
.scheme(ContractVerifierHttpMetadata.Scheme.HTTPS)
.protocol(ContractVerifierHttpMetaData.Protocol.HTTP_1_1)
.scheme(ContractVerifierHttpMetaData.Scheme.HTTPS)
.build();
Request changedRequest = Request.from(request)
@@ -47,6 +47,6 @@ class RequestTests {
then(changedRequest.headers()).containsEntry("header-foo", "header-bar").containsEntry("header", "header-value");
then(changedRequest.cookies()).containsEntry("cookie-foo", "cookie-bar").containsEntry("cookie", "cookie-value");
then(changedRequest.queryParams()).contains(new AbstractMap.SimpleEntry<>("query", "param-value"), new AbstractMap.SimpleEntry<>("query-foo", "query-bar"));
then(changedRequest.protocol()).isEqualTo(ContractVerifierHttpMetadata.Protocol.HTTP_1_1);
then(changedRequest.protocol()).isEqualTo(ContractVerifierHttpMetaData.Protocol.HTTP_1_1);
}
}