refactor: move key to constant

Author: jeqo

commons/src/test/java/io/aiven/kafka/tieredstorage/commons/storage/filesystem/FileSystemStorageTest.java

@@ -30,6 +30,8 @@
 
 class FileSystemStorageTest {
 
+    static final String TOPIC_PARTITION_SEGMENT_KEY = "topic/partition/log";
+
     @TempDir
     Path root;
 
@@ -57,59 +59,61 @@ void testRootCannotBeNonWritableDirectory() throws IOException {
     void testUploadANewFile() throws IOException {
         final FileSystemStorage storage = new FileSystemStorage(root, false);
         final String content = "content";
-        final String key = "key";
-        storage.upload(new ByteArrayInputStream(content.getBytes()), key);
+        storage.upload(new ByteArrayInputStream(content.getBytes()), TOPIC_PARTITION_SEGMENT_KEY);
 
-        assertThat(content).isEqualTo(Files.readString(root.resolve(key)));
+        assertThat(content).isEqualTo(Files.readString(root.resolve(TOPIC_PARTITION_SEGMENT_KEY)));
     }
 
     @Test
     void testUploadFailsWhenFileExists() throws IOException {
-        final String key = "key";
-        final Path previous = root.resolve(key);
+        final Path previous = root.resolve(TOPIC_PARTITION_SEGMENT_KEY);
+        Files.createDirectories(previous.getParent());
         Files.writeString(previous, "previous");
         final FileSystemStorage storage = new FileSystemStorage(root, false);
         final String content = "content";
 
-        assertThatThrownBy(() -> storage.upload(new ByteArrayInputStream(content.getBytes()), key))
+        assertThatThrownBy(() -> storage.upload(new ByteArrayInputStream(content.getBytes()),
+            TOPIC_PARTITION_SEGMENT_KEY))
             .isInstanceOf(IOException.class)
             .hasMessage("File " + previous + " already exists");
     }
 
     @Test
     void testUploadWithOverridesWhenFileExists() throws IOException {
-        final String key = "key";
-        final Path previous = root.resolve(key);
+        final Path previous = root.resolve(TOPIC_PARTITION_SEGMENT_KEY);
+        Files.createDirectories(previous.getParent());
         Files.writeString(previous, "previous");
         final FileSystemStorage storage = new FileSystemStorage(root, true);
         final String content = "content";
-        storage.upload(new ByteArrayInputStream(content.getBytes()), key);
-        assertThat(content).isEqualTo(Files.readString(root.resolve(key)));
+        storage.upload(new ByteArrayInputStream(content.getBytes()), TOPIC_PARTITION_SEGMENT_KEY);
+        assertThat(content).isEqualTo(Files.readString(root.resolve(TOPIC_PARTITION_SEGMENT_KEY)));
     }
 
     @Test
     void testFetchAll() throws IOException {
-        final String key = "key";
         final String content = "content";
-        Files.writeString(root.resolve(key), content);
+        final Path keyPath = root.resolve(TOPIC_PARTITION_SEGMENT_KEY);
+        Files.createDirectories(keyPath.getParent());
+        Files.writeString(keyPath, content);
         final FileSystemStorage storage = new FileSystemStorage(root, true);
 
-        try (final InputStream fetch = storage.fetch(key)) {
+        try (final InputStream fetch = storage.fetch(TOPIC_PARTITION_SEGMENT_KEY)) {
             assertThat(content.getBytes()).isEqualTo(fetch.readAllBytes());
         }
     }
 
     @Test
     void testFetchWithOffsetRange() throws IOException {
-        final String key = "key";
         final String content = "AABBBBAA";
         final int from = 2;
         final int to = 6;
         final String range = content.substring(from, to + 1); // exclusive
-        Files.writeString(root.resolve(key), content);
+        final Path keyPath = root.resolve(TOPIC_PARTITION_SEGMENT_KEY);
+        Files.createDirectories(keyPath.getParent());
+        Files.writeString(keyPath, content);
         final FileSystemStorage storage = new FileSystemStorage(root, true);
 
-        try (final InputStream fetch = storage.fetch(key, from, to)) {
+        try (final InputStream fetch = storage.fetch(TOPIC_PARTITION_SEGMENT_KEY, from, to)) {
             assertThat(range.getBytes()).isEqualTo(fetch.readAllBytes());
         }
     }
@@ -118,51 +122,38 @@ void testFetchWithOffsetRange() throws IOException {
     void testFetchWithFailsWithWrongOffsets() {
         final FileSystemStorage storage = new FileSystemStorage(root, true);
 
-        assertThatThrownBy(() -> storage.fetch("key", -1, 1))
+        assertThatThrownBy(() -> storage.fetch(TOPIC_PARTITION_SEGMENT_KEY, -1, 1))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessage("from cannot be negative, -1 given");
-        assertThatThrownBy(() -> storage.fetch("key", 2, 1))
+        assertThatThrownBy(() -> storage.fetch(TOPIC_PARTITION_SEGMENT_KEY, 2, 1))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessage("from cannot be more than to, from=2, to=1 given");
     }
 
     @Test
     void testFetchWithOffsetRangeLargerThanFileSize() throws IOException {
-        final String key = "key";
         final String content = "content";
-        Files.writeString(root.resolve(key), content);
+        final Path keyPath = root.resolve(TOPIC_PARTITION_SEGMENT_KEY);
+        Files.createDirectories(keyPath.getParent());
+        Files.writeString(keyPath, content);
         final FileSystemStorage storage = new FileSystemStorage(root, true);
 
-        assertThatThrownBy(() -> storage.fetch(key, 0, content.length() + 1))
+        assertThatThrownBy(() -> storage.fetch(TOPIC_PARTITION_SEGMENT_KEY, 0, content.length() + 1))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessage("to cannot be bigger than file size, to=8, file size=7 given");
     }
 
     @Test
     void testDelete() throws IOException {
-        final String key = "key";
-        final Path keyPath = root.resolve(key);
+        final Path keyPath = root.resolve(TOPIC_PARTITION_SEGMENT_KEY);
+        Files.createDirectories(keyPath.getParent());
         Files.writeString(keyPath, "test");
         final FileSystemStorage storage = new FileSystemStorage(root, false);
-        storage.delete(key);
-
-        assertThat(Files.exists(keyPath)).isFalse();
-        assertThat(Files.exists(root)).isTrue();
-    }
+        storage.delete(TOPIC_PARTITION_SEGMENT_KEY);
 
-    @Test
-    void testDeleteRemoveParentEmptyDir() throws IOException {
-        final String parent = "parent";
-        final String key = "key";
-        final Path parentPath = root.resolve(parent);
-        Files.createDirectories(parentPath);
-        final Path keyPath = parentPath.resolve(key);
-        Files.writeString(keyPath, "test");
-        final FileSystemStorage storage = new FileSystemStorage(root, false);
-        storage.delete(parent + "/" + key);
-
-        assertThat(Files.exists(keyPath)).isFalse();
-        assertThat(Files.exists(parentPath)).isFalse();
+        assertThat(Files.exists(keyPath)).isFalse(); // segment key
+        assertThat(Files.exists(keyPath.getParent())).isFalse(); // partition dir
+        assertThat(Files.exists(keyPath.getParent().getParent())).isFalse(); // topic dir
         assertThat(Files.exists(root)).isTrue();
     }