@@ -72,11 +72,11 @@ public class WireMockToDslConverter {
7272 private static final JsonPointer RESPONSE_HEADERS_POINTER = JsonPointer .compile ("/response/headers" );
7373
7474 private static final JsonMapper OBJECT_MAPPER = JsonMapper .builder ()
75- .configure (ALLOW_JAVA_COMMENTS , true )
76- .configure (ALLOW_YAML_COMMENTS , true )
77- .configure (ALLOW_UNQUOTED_PROPERTY_NAMES , true )
78- .configure (ALLOW_SINGLE_QUOTES , true )
79- .build ();
75+ .configure (ALLOW_JAVA_COMMENTS , true )
76+ .configure (ALLOW_YAML_COMMENTS , true )
77+ .configure (ALLOW_UNQUOTED_PROPERTY_NAMES , true )
78+ .configure (ALLOW_SINGLE_QUOTES , true )
79+ .build ();
8080
8181 /**
8282 * Returns the string content of the contract.
@@ -174,12 +174,10 @@ private String buildRequestHeaders(JsonNode wireMockStub) {
174174 fields .forEach (c -> {
175175 requestHeadersBuilder .append ("header('" ).append (c .getKey ()).append ("'," );
176176 ObjectNode headersNode = (ObjectNode ) c .getValue ().deepCopy ();
177- Iterator <Map .Entry <String , JsonNode >> headersNodeIterator = headersNode .properties ()
178- .iterator ();
177+ Iterator <Map .Entry <String , JsonNode >> headersNodeIterator = headersNode .properties ().iterator ();
179178 if (headersNodeIterator .hasNext ()) {
180179 Map .Entry <String , JsonNode > headerValue = headersNodeIterator .next ();
181- String header = buildHeader (headerValue .getKey (), headerValue .getValue ()
182- .asString ());
180+ String header = buildHeader (headerValue .getKey (), headerValue .getValue ().asString ());
183181 requestHeadersBuilder .append (header ).append (")" ).append ("\n " );
184182 }
185183 });
@@ -190,13 +188,13 @@ private String buildRequestHeaders(JsonNode wireMockStub) {
190188
191189 private String buildHeader (String method , String value ) {
192190 switch (method ) {
193- case "equalTo" :
194- return "'" + value + "'" ;
195- case "contains" :
196- String regex = "^.*" + value + ".*$" ;
197- return "c(regex('" + escapeJava (regex ) + "'))" ;
198- default :
199- return "c(regex('" + escapeJava (value ) + "'))" ;
191+ case "equalTo" :
192+ return "'" + value + "'" ;
193+ case "contains" :
194+ String regex = "^.*" + value + ".*$" ;
195+ return "c(regex('" + escapeJava (regex ) + "'))" ;
196+ default :
197+ return "c(regex('" + escapeJava (value ) + "'))" ;
200198 }
201199 }
202200
@@ -209,29 +207,26 @@ private String buildRequestBody(JsonNode wireMockStub) {
209207 List <Map .Entry <String , JsonNode >> requestBodyObjectNodes = new ArrayList <>();
210208
211209 elements .stream ()
212- .filter (f -> f instanceof ObjectNode )
213- .map (f -> (ObjectNode ) f )
214- .map (ObjectNode ::properties )
215- .forEachOrdered (requestBodyObjectNodes ::addAll );
210+ .filter (f -> f instanceof ObjectNode )
211+ .map (f -> (ObjectNode ) f )
212+ .map (ObjectNode ::properties )
213+ .forEachOrdered (requestBodyObjectNodes ::addAll );
216214 requestBodyObjectNodes .stream ()
217- .filter (b -> b .getKey ().equals ("equalTo" ))
218- .findFirst ()
219- .ifPresent (b -> requestBody .append ("body ('" )
220- .append (b .getValue ().asString ()).append ("')" ));
215+ .filter (b -> b .getKey ().equals ("equalTo" ))
216+ .findFirst ()
217+ .ifPresent (b -> requestBody .append ("body ('" ).append (b .getValue ().asString ()).append ("')" ));
221218 requestBodyObjectNodes .stream ()
222- .filter (b -> b .getKey ().equals ("equalToJson" ))
223- .findFirst ()
224- .ifPresent (b -> requestBody .append ("body ('" )
225- .append (b .getValue ().asString ()).append ("')" ));
219+ .filter (b -> b .getKey ().equals ("equalToJson" ))
220+ .findFirst ()
221+ .ifPresent (b -> requestBody .append ("body ('" ).append (b .getValue ().asString ()).append ("')" ));
226222 requestBodyObjectNodes .stream ()
227- .filter (b -> b .getKey ().equals ("matches" ))
228- .findFirst ()
229- .ifPresent (b -> requestBody .append ("body $(consumer(regex('" )
230- .append (escapeJava (b .getValue ().asString ()))
231- .append ("')), producer('" )
232- .append (new Xeger (escapeJava (b .getValue ()
233- .asString ())).generate ())
234- .append ("'))" ));
223+ .filter (b -> b .getKey ().equals ("matches" ))
224+ .findFirst ()
225+ .ifPresent (b -> requestBody .append ("body $(consumer(regex('" )
226+ .append (escapeJava (b .getValue ().asString ()))
227+ .append ("')), producer('" )
228+ .append (new Xeger (escapeJava (b .getValue ().asString ())).generate ())
229+ .append ("'))" ));
235230 }
236231 return requestBody .toString ();
237232 }
@@ -266,14 +261,12 @@ private String buildPrettyPrintResponseBody(IntNode node) {
266261 private String buildPrettyPrintResponseBody (StringNode node ) {
267262 try {
268263 String stringNode = node .asString ();
269- Object intermediateObjectForPrettyPrinting = OBJECT_MAPPER .readerFor (Object .class )
270- .readValue (stringNode );
264+ Object intermediateObjectForPrettyPrinting = OBJECT_MAPPER .readerFor (Object .class ).readValue (stringNode );
271265
272266 DefaultIndenter customIndenter = new DefaultIndenter (" " , "\n " );
273267 return OBJECT_MAPPER .writer ()
274- .with (new DefaultPrettyPrinter ().withArrayIndenter (customIndenter )
275- .withObjectIndenter (customIndenter ))
276- .writeValueAsString (intermediateObjectForPrettyPrinting );
268+ .with (new DefaultPrettyPrinter ().withArrayIndenter (customIndenter ).withObjectIndenter (customIndenter ))
269+ .writeValueAsString (intermediateObjectForPrettyPrinting );
277270 }
278271 catch (Exception e ) {
279272 throw new RuntimeException ("WireMock response body could not be pretty printed" , e );
@@ -289,11 +282,11 @@ private String buildResponseHeaders(JsonNode wireMockStub) {
289282 JsonNode responseHeadersObjectNode = requestHeadersNode .deepCopy ();
290283 Set <Map .Entry <String , JsonNode >> fields = responseHeadersObjectNode .properties ();
291284 fields .forEach (c -> responseHeadersBuilder .append ("header('" )
292- .append (c .getKey ())
293- .append ("'," )
294- .append ("'" )
295- .append (c .getValue ().asString ())
296- .append ("')\n " ));
285+ .append (c .getKey ())
286+ .append ("'," )
287+ .append ("'" )
288+ .append (c .getValue ().asString ())
289+ .append ("')\n " ));
297290 responseHeadersBuilder .append ("}" );
298291 }
299292 return responseHeadersBuilder .toString ();
0 commit comments