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

Fixed compilation issues

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-07-07 08:52:13 +02:00
parent fee2fe729f
commit a37b35800d
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java
View File

@@ -73,8 +73,7 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
}
BasicMappingBuilder(String customRequestMatcherName, Parameters parameters) {
this.requestPatternBuilder = new RequestPatternBuilder(customRequestMatcherName,
parameters);
this.requestPatternBuilder = new RequestPatternBuilder(customRequestMatcherName, parameters);
}
@Override
@@ -83,6 +82,24 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
return this;
}
@Override
public BasicMappingBuilder withScheme(String scheme) {
this.requestPatternBuilder.withScheme(scheme);
return this;
}
@Override
public BasicMappingBuilder withHost(StringValuePattern hostPattern) {
this.requestPatternBuilder.withHost(hostPattern);
return this;
}
@Override
public BasicMappingBuilder withPort(int port) {
this.requestPatternBuilder.withPort(port);
return this;
}
@Override
public BasicMappingBuilder atPriority(Integer priority) {
this.priority = priority;
@@ -96,22 +113,19 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
}
@Override
public BasicMappingBuilder withCookie(String name,
StringValuePattern cookieValuePattern) {
public BasicMappingBuilder withCookie(String name, StringValuePattern cookieValuePattern) {
this.requestPatternBuilder.withCookie(name, cookieValuePattern);
return this;
}
@Override
public BasicMappingBuilder withQueryParam(String key,
StringValuePattern queryParamPattern) {
public BasicMappingBuilder withQueryParam(String key, StringValuePattern queryParamPattern) {
this.requestPatternBuilder.withQueryParam(key, queryParamPattern);
return this;
}
@Override
public ScenarioMappingBuilder withQueryParams(
Map<String, StringValuePattern> queryParams) {
public ScenarioMappingBuilder withQueryParams(Map<String, StringValuePattern> queryParams) {
for (Map.Entry<String, StringValuePattern> entry : queryParams.entrySet()) {
this.requestPatternBuilder.withQueryParam(entry.getKey(), entry.getValue());
}
@@ -125,8 +139,7 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
}
@Override
public ScenarioMappingBuilder withMultipartRequestBody(
MultipartValuePatternBuilder multipartPatternBuilder) {
public ScenarioMappingBuilder withMultipartRequestBody(MultipartValuePatternBuilder multipartPatternBuilder) {
this.requestPatternBuilder.withRequestBodyPart(multipartPatternBuilder.build());
return this;
}
@@ -169,16 +182,13 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
@Override
public BasicMappingBuilder withBasicAuth(String username, String password) {
this.requestPatternBuilder
.withBasicAuth(new BasicCredentials(username, password));
this.requestPatternBuilder.withBasicAuth(new BasicCredentials(username, password));
return this;
}
@Override
public <P> BasicMappingBuilder withPostServeAction(String extensionName,
P parameters) {
Parameters params = parameters instanceof Parameters ? (Parameters) parameters
: Parameters.of(parameters);
public <P> BasicMappingBuilder withPostServeAction(String extensionName, P parameters) {
Parameters params = parameters instanceof Parameters ? (Parameters) parameters : Parameters.of(parameters);
this.postServeActions.put(extensionName, params);
return this;
}
@@ -214,22 +224,18 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
}
@Override
public MappingBuilder andMatching(String customRequestMatcherName,
Parameters parameters) {
public MappingBuilder andMatching(String customRequestMatcherName, Parameters parameters) {
this.requestPatternBuilder.andMatching(customRequestMatcherName, parameters);
return this;
}
@Override
public StubMapping build() {
if (this.scenarioName == null && (this.requiredScenarioState != null
|| this.newScenarioState != null)) {
throw new IllegalStateException(
"Scenario name must be specified to require or set a new scenario state");
if (this.scenarioName == null && (this.requiredScenarioState != null || this.newScenarioState != null)) {
throw new IllegalStateException("Scenario name must be specified to require or set a new scenario state");
}
RequestPattern requestPattern = this.requestPatternBuilder.build();
ResponseDefinition response = (this.responseDefBuilder != null
? this.responseDefBuilder : aResponse()).build();
ResponseDefinition response = (this.responseDefBuilder != null ? this.responseDefBuilder : aResponse()).build();
StubMapping mapping = new StubMapping(requestPattern, response);
mapping.setPriority(this.priority);
mapping.setScenarioName(this.scenarioName);
@@ -238,8 +244,7 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
mapping.setUuid(this.id);
mapping.setName(this.name);
mapping.setPersistent(this.isPersistent);
mapping.setPostServeActions(
this.postServeActions.isEmpty() ? null : this.postServeActions);
mapping.setPostServeActions(this.postServeActions.isEmpty() ? null : this.postServeActions);
mapping.setMetadata(this.metadata);
return mapping;
}