Fixed wiremock#2388 - empty getPath() returned from new FileStore implementation passed to transformers

Author: tomakehurst

src/main/java/com/github/tomakehurst/wiremock/store/files/BlobStoreFileSource.java

@@ -54,6 +54,10 @@ public FileSource child(String subDirectoryName) {
 
  @Override
  public String getPath() {
+ if (blobStore instanceof PathBased) {
+ return ((PathBased) blobStore).getPath();
+ }
+
  return "";
  }
 

src/main/java/com/github/tomakehurst/wiremock/store/files/FileSourceBlobStore.java

@@ -24,7 +24,7 @@
 import org.wiremock.annotations.Beta;
 
 @Beta(justification = "Externalized State API: https://github.com/wiremock/wiremock/issues/2144")
-public class FileSourceBlobStore implements BlobStore {
+public class FileSourceBlobStore implements BlobStore, PathBased {
 
  private final FileSource fileSource;
 
@@ -73,4 +73,13 @@ public void remove(String key) {
  public void clear() {
  fileSource.listFilesRecursively().forEach(file -> fileSource.deleteFile(file.getPath()));
  }
+
+ public FileSource getFileSource() {
+ return fileSource;
+ }
+
+ @Override
+ public String getPath() {
+ return fileSource.getPath();
+ }
 }

src/main/java/com/github/tomakehurst/wiremock/store/files/PathBased.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 Thomas Akehurst
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.tomakehurst.wiremock.store.files;
+
+import org.wiremock.annotations.Beta;
+
+@Beta(justification = "Externalized State API: https://github.com/wiremock/wiremock/issues/2144")
+public interface PathBased {
+
+ String getPath();
+}

src/test/java/com/github/tomakehurst/wiremock/store/files/BlobStoreFileSourceTest.java

@@ -20,11 +20,16 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.common.InputStreamSource;
 import com.github.tomakehurst.wiremock.common.TextFile;
 import com.github.tomakehurst.wiremock.store.BlobStore;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -130,7 +135,45 @@ void delete_all_files(@TempDir Path tempDir) {
  }
 
  @Test
- void text_file_path() {
- // fileSource.getPath()
+ void returns_file_path_when_backed_by_file_source() {
+ assertThat(fileSource.getPath(), is(ROOT_PATH));
+ }
+
+ @Test
+ void returns_empty_string_when_not_backed_by_file_source() {
+ FileSource otherFileSource = new BlobStoreFileSource(new TestInMemoryBlobStore());
+ assertThat(otherFileSource.getPath(), is(""));
+ }
+
+ static class TestInMemoryBlobStore implements BlobStore {
+
+ @Override
+ public Optional<InputStream> getStream(String key) {
+ return Optional.empty();
+ }
+
+ @Override
+ public InputStreamSource getStreamSource(String key) {
+ return null;
+ }
+
+ @Override
+ public Stream<String> getAllKeys() {
+ return null;
+ }
+
+ @Override
+ public Optional<byte[]> get(String key) {
+ return Optional.empty();
+ }
+
+ @Override
+ public void put(String key, byte[] content) {}
+
+ @Override
+ public void remove(String key) {}
+
+ @Override
+ public void clear() {}
  }
 }