Fixed wiremock#2361 - saved mapping filenames missing extension when running standalone

Author: tomakehurst

src/main/java/com/github/tomakehurst/wiremock/common/filemaker/FilenameMaker.java

@@ -37,13 +37,12 @@ public class FilenameMaker {
  private final String filenameTemplate;
 
  public FilenameMaker() {
- this.templateEngine = defaultTemplateEngine();
- this.filenameTemplate = DEFAULT_FILENAME_TEMPLATE + DEFAULT_EXTENSION;
+ this(null);
  }
 
  public FilenameMaker(String filenameTemplate) {
  this.templateEngine = defaultTemplateEngine();
- this.filenameTemplate = filenameTemplate;
+ this.filenameTemplate = filenameTemplate != null ? filenameTemplate : DEFAULT_FILENAME_TEMPLATE + DEFAULT_EXTENSION;
  }
 
  public FilenameMaker(String filenameTemplate, String extension) {

src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java

@@ -19,7 +19,6 @@
 import static com.github.tomakehurst.wiremock.common.BrowserProxySettings.DEFAULT_CA_KEYSTORE_PATH;
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
 import static com.github.tomakehurst.wiremock.common.ProxySettings.NO_PROXY;
-import static com.github.tomakehurst.wiremock.common.filemaker.FilenameMaker.DEFAULT_FILENAME_TEMPLATE;
 import static com.github.tomakehurst.wiremock.core.WireMockApp.MAPPINGS_ROOT;
 import static com.github.tomakehurst.wiremock.http.CaseInsensitiveKey.TO_CASE_INSENSITIVE_KEYS;
 
@@ -415,7 +414,8 @@ private String getFilenameTemplateOption() {
  validateFilenameTemplate(filenameTemplate);
  return filenameTemplate;
  }
- return DEFAULT_FILENAME_TEMPLATE;
+
+ return null;
  }
 
  private void validateFilenameTemplate(String filenameTemplate) {

src/test/java/com/github/tomakehurst/wiremock/StandaloneAcceptanceTest.java

@@ -24,11 +24,9 @@
 import static java.nio.file.Files.createDirectories;
 import static java.nio.file.Files.write;
 import static java.util.Arrays.asList;
+import static java.util.Objects.requireNonNull;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -56,6 +54,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class StandaloneAcceptanceTest {
  private static final String FILES = "__files";
@@ -291,7 +290,7 @@ public void respondsWithPreExistingRecordingInProxyMode() throws Exception {
  }
 
  @Test
- public void recordsProxiedRequestsWhenSpecifiedOnCommandLine() throws Exception {
+ public void recordsProxiedRequestsWhenSpecifiedOnCommandLineViaLegacyRecorder() throws Exception {
  WireMock otherServerClient = startOtherServerAndClient();
  startRunner("--record-mappings");
  givenThat(
@@ -310,7 +309,7 @@ public void recordsProxiedRequestsWhenSpecifiedOnCommandLine() throws Exception
  }
 
  @Test
- public void recordsRequestHeadersWhenSpecifiedOnCommandLine() throws Exception {
+ public void recordsRequestHeadersWhenSpecifiedOnCommandLineViaLegacyRecorder() throws Exception {
  WireMock otherServerClient = startOtherServerAndClient();
  startRunner("--record-mappings", "--match-headers", "Accept");
  givenThat(
@@ -328,7 +327,7 @@ public void recordsRequestHeadersWhenSpecifiedOnCommandLine() throws Exception {
  }
 
  @Test
- public void recordsGzippedResponseBodiesDecompressed() throws Exception {
+ public void recordsGzippedResponseBodiesDecompressedViaLegacyRecorder() {
  WireMock otherServerClient = startOtherServerAndClient();
  startRunner("--record-mappings");
  givenThat(
@@ -344,6 +343,24 @@ public void recordsGzippedResponseBodiesDecompressed() throws Exception {
  assertThat(filesDirectory, containsAFileContaining("gzipped body"));
  }
 
+ @Test
+ void recordsGzippedResponseBodiesDecompressedViaNewRecorder(@TempDir Path tempFileRoot) {
+ WireMock target = startOtherServerAndClient();
+
+ startRunner("--root-dir", tempFileRoot.toString());
+
+ target.register(get("/record-this").willReturn(ok("Recorded")));
+
+ startRecording(otherServer.baseUrl());
+ testClient.get("/record-this");
+ stopRecording();
+
+ assertThat(Arrays.stream(requireNonNull(tempFileRoot.resolve("mappings").toFile().list()))
+ .filter(name -> name.contains("record-this"))
+ .findFirst()
+ .get(), endsWith(".json"));
+ }
+
  @Test
  public void matchesVeryLongHeader() {
  startRunner("--jetty-header-buffer-size", "32678");
@@ -624,7 +641,7 @@ public void describeTo(Description desc) {
 
  @Override
  public boolean matchesSafely(File dir) {
- return Arrays.stream(Objects.requireNonNull(dir.list())).noneMatch(contains(namePart));
+ return Arrays.stream(requireNonNull(dir.list())).noneMatch(contains(namePart));
  }
  };
  }
@@ -640,7 +657,7 @@ public void describeTo(Description desc) {
  @Override
  public boolean matchesSafely(File dir) {
  return (int)
- Arrays.stream(Objects.requireNonNull(dir.list())).filter(contains(namePart)).count()
+ Arrays.stream(requireNonNull(dir.list())).filter(contains(namePart)).count()
  == 1;
  }
  };