Creating config dir when it is absent (mageddo#700)

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 5.9.1
+* Creating the config file dir when it not exists, #699.
+
 ## 5.9.0
 * Answer all docker service replicas IPs, see #434.
 

gradle.properties

@@ -1 +1 @@
-version=5.9.0-snapshot
+version=5.9.1-snapshot

src/main/java/com/mageddo/dnsproxyserver/config/dataformat/v3/file/ConfigFileDAOImpl.java

@@ -16,9 +16,16 @@
 
 import lombok.RequiredArgsConstructor;
 
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.io.FileUtils;
+
+import static com.mageddo.utils.Files.createDirectories;
+import static com.mageddo.utils.Files.createParentDirectories;
 import static com.mageddo.utils.Files.deleteQuietly;
 import static com.mageddo.utils.Files.findExtension;
 
+@Slf4j
 @Singleton
 @RequiredArgsConstructor(onConstructor_ = @Inject)
 public class ConfigFileDAOImpl implements ConfigFileDAO {
@@ -64,11 +71,17 @@ public void delete() {
     deleteQuietly(this.configFilePathDAO.find());
   }
 
-  private Path findFilePath() {
-    return this.configFilePathDAO.find();
+  Path findFilePath() {
+    final var path = this.configFilePathDAO.find();
+    final var dir = path.getParent();
+    if (!Files.exists(dir)) {
+      createDirectories(dir);
+      log.info("status=createdConfigPath, path={}", path);
+    }
+    return path;
   }
 
-  private Converter findConverter(Path path) {
+  Converter findConverter(Path path) {
     final var extension = findExtension(path);
     return this.converterFactory.find(extension);
   }

src/main/java/com/mageddo/utils/Files.java

@@ -75,4 +75,20 @@ public static String findExtension(Path path) {
   public static void deleteQuietly(Path path) {
     FileUtils.deleteQuietly(path.toFile());
   }
+
+  public static void createParentDirectories(Path path) {
+    try {
+      FileUtils.createParentDirectories(path.toFile());
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
+  public static void createDirectories(Path dir) {
+    try {
+      java.nio.file.Files.createDirectories(dir);
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
 }

src/test/java/com/mageddo/dnsproxyserver/config/dataformat/v3/file/ConfigFileDAOImplTest.java

@@ -0,0 +1,51 @@
+package com.mageddo.dnsproxyserver.config.dataformat.v3.file;
+
+import dagger.sheath.InjectMock;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.doReturn;
+
+@ExtendWith(MockitoExtension.class)
+class ConfigFileDAOImplTest {
+
+  @Mock
+  ConfigFilePathDAO configFilePathDAO;
+
+  @Spy
+  @InjectMocks
+  ConfigFileDAOImpl dao;
+
+  @Test
+  void mustHaveSureThePathExistsBeforeReturnIt(@TempDir Path tempDir) {
+
+
+    final var confDir = tempDir.resolve(String.valueOf(UUID.randomUUID()))
+        .resolve("conf.json");
+
+    doReturn(confDir)
+        .when(this.configFilePathDAO)
+        .find()
+    ;
+
+    final var path = this.dao.findFilePath();
+
+    assertThat(path.getParent()).exists();
+
+  }
+
+}