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

Fixed RestDocs setup

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-10-18 10:30:29 +02:00
parent ab362a3224
commit 96f8d2db5c
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/standalone/pom.xml
View File

@@ -24,8 +24,7 @@
<modules>
<module>contracts</module>
<!-- FIXME: 4.0 -->
<!--<module>restdocs</module>-->
<module>restdocs</module>
<module>dsl</module>
<module>webclient</module>
</modules>

3
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippet.java
View File

@@ -33,6 +33,7 @@ import org.springframework.restdocs.RestDocumentationContext;
import org.springframework.restdocs.operation.Operation;
import org.springframework.restdocs.operation.OperationRequest;
import org.springframework.restdocs.operation.OperationResponse;
import org.springframework.restdocs.operation.QueryParameters;
import org.springframework.restdocs.snippet.RestDocumentationContextPlaceholderResolver;
import org.springframework.restdocs.snippet.TemplatedSnippet;
import org.springframework.restdocs.templates.TemplateEngine;
@@ -121,7 +122,7 @@ public class ContractDslSnippet extends TemplatedSnippet {
model.put("request_urlpath_present", urlPathPresent);
if (urlPathPresent) {
// TODO: Add support for multiple values
model.put("request_queryparams", request.getParameters().toSingleValueMap().entrySet());
model.put("request_queryparams", QueryParameters.from(request).toSingleValueMap().entrySet());
}
model.put("request_body_present", request.getContent().length > 0);
model.put("request_body", request.getContentAsString());

5
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java
View File

@@ -319,4 +319,9 @@ class WireMockHttpRequestAdapter implements Request {
return Optional.absent();
}
@Override
public String getProtocol() {
return this.result.getUrl().getScheme();
}
}

5
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
View File

@@ -272,6 +272,11 @@ public class ContractResultHandler extends WireMockVerifyHelper<MvcResult, Contr
public Optional<Request> getOriginalRequest() {
return Optional.absent();
}
@Override
public String getProtocol() {
return result.getRequest().getProtocol();
}
};
}