From a37b35800dbda9efebeab39a6e54fb7881ec0a65 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 7 Jul 2020 08:52:13 +0200 Subject: [PATCH] Fixed compilation issues --- .../restdocs/BasicMappingBuilder.java | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java index d579471f37..b88aebe723 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java @@ -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 queryParams) { + public ScenarioMappingBuilder withQueryParams(Map queryParams) { for (Map.Entry 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

BasicMappingBuilder withPostServeAction(String extensionName, - P parameters) { - Parameters params = parameters instanceof Parameters ? (Parameters) parameters - : Parameters.of(parameters); + public

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; }