From 2d9c50571535767603e400b6b53bd018f4042d5a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 29 Jan 2018 11:23:19 +0000 Subject: [PATCH] Remove unnecessary placeholder resolution --- .../wiremock/restdocs/WireMockSnippet.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java index cec2f7ab04..59713a9178 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java @@ -16,6 +16,14 @@ package org.springframework.cloud.contract.wiremock.restdocs; +import java.io.IOException; +import java.io.Writer; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.regex.Pattern; + import com.github.tomakehurst.wiremock.client.MappingBuilder; import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; import com.github.tomakehurst.wiremock.common.Json; @@ -23,6 +31,7 @@ import com.github.tomakehurst.wiremock.http.HttpHeader; import com.github.tomakehurst.wiremock.http.HttpHeaders; import com.github.tomakehurst.wiremock.matching.UrlPattern; import com.github.tomakehurst.wiremock.stubbing.StubMapping; + import org.springframework.http.MediaType; import org.springframework.restdocs.RestDocumentationContext; import org.springframework.restdocs.operation.Operation; @@ -31,17 +40,8 @@ import org.springframework.restdocs.snippet.Snippet; import org.springframework.restdocs.snippet.StandardWriterResolver; import org.springframework.restdocs.snippet.WriterResolver; import org.springframework.restdocs.templates.TemplateFormat; -import org.springframework.util.PropertyPlaceholderHelper; import org.springframework.util.StringUtils; -import java.io.IOException; -import java.io.Writer; -import java.util.Arrays; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.regex.Pattern; - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.delete; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -72,9 +72,6 @@ public class WireMockSnippet implements Snippet { private boolean hasJsonBodyRequestToMatch = false; - private final PropertyPlaceholderHelper propertyPlaceholderHelper = new PropertyPlaceholderHelper( - "{", "}"); - private static final TemplateFormat TEMPLATE_FORMAT = new TemplateFormat() { @Override @@ -100,9 +97,8 @@ public class WireMockSnippet implements Snippet { RestDocumentationContextPlaceholderResolverFactory placeholders = new RestDocumentationContextPlaceholderResolverFactory(); WriterResolver writerResolver = new StandardWriterResolver(placeholders, "UTF-8", TEMPLATE_FORMAT); - String path = this.propertyPlaceholderHelper.replacePlaceholders(operation.getName(), - placeholders.create(context)); - try (Writer writer = writerResolver.resolve(this.snippetName, path, context)) { + try (Writer writer = writerResolver.resolve(this.snippetName, operation.getName(), + context)) { writer.append(json); } }