WIP Clean AbstractAppStorageTest

afs-cassandra/src/test/java/com/powsybl/afs/cassandra/CassandraAppStorageTest.java

@@ -19,6 +19,7 @@
 import com.powsybl.afs.storage.check.FileSystemCheckOptionsBuilder;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.testcontainers.containers.CassandraContainer;
@@ -47,12 +48,12 @@ class CassandraAppStorageTest extends AbstractAppStorageTest {
     private static CqlSession cassandraSession;
 
     @BeforeAll
-    public static void dontRunOnWindows() {
+    static void dontRunOnWindows() {
         assumeFalse(SystemUtils.IS_OS_WINDOWS);
     }
 
     @BeforeAll
-    public static void setUpCassandra() {
+    static void setUpCassandra() {
         // Create container
         cassandra = new CassandraContainer<>("cassandra:3.11.5")
             .withInitScript("afs.cql");
@@ -69,7 +70,7 @@ public static void setUpCassandra() {
     }
 
     @AfterAll
-    public static void tearDownCassandra() {
+    static void tearDownCassandra() {
         if (cassandraSession != null) {
             cassandraSession.close();
             if (cassandra != null) {
@@ -78,12 +79,19 @@ public static void tearDownCassandra() {
         }
     }
 
+//    @Override
+//    @BeforeEach
+//    public void setUp() {
+//        eventStack = new LinkedBlockingQueue<>();
+//        this.storage = createStorage();
+//        this.storage.getEventsBus().addListener(l);
+//    }
+
+    @AfterEach
     @Override
-    @BeforeEach
-    public void setUp() {
-        eventStack = new LinkedBlockingQueue<>();
-        this.storage = createStorage();
-        this.storage.getEventsBus().addListener(l);
+    public void tearDown() {
+        super.tearDown();
+        clear();
     }
 
     @Override

afs-mapdb-storage/src/main/java/com/powsybl/afs/mapdb/storage/MapDbAppStorage.java

@@ -483,6 +483,11 @@ public void setMetadata(String nodeId, NodeGenericMetadata metadata) {
     @Override
     public void renameNode(String nodeId, String name) {
         UUID nodeUuid = checkNodeId(nodeId);
+        Objects.requireNonNull(name);
+        if (name.isEmpty()) {
+            throw new IllegalArgumentException("Impossible to rename node '" + nodeId + "' with an empty name");
+        }
+
         NodeInfo nodeInfo = getNodeInfo(nodeId);
         getParentNode(nodeId).ifPresent(parentNode -> {
             UUID parentNodeUuid = checkNodeId(parentNode.getId());

afs-spring-server/src/main/java/com/powsybl/afs/server/StorageServer.java

@@ -44,16 +44,57 @@
 @Tag(name = "afs")
 public class StorageServer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(StorageServer.class);
     public static final String API_VERSION = "v1";
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(StorageServer.class);
     private final AppDataWrapper appDataWrapper;
 
     @Autowired
     public StorageServer(AppDataWrapper appDataWrapper) {
         this.appDataWrapper = appDataWrapper;
     }
 
+    private static StreamingResponseBody copyToBodyAndClose(InputStream inputStream) {
+        return outputStream -> {
+            try (InputStream toClose = inputStream) {
+                IOUtils.copy(toClose, outputStream);
+            }
+        };
+    }
+
+    private static <T> ResponseEntity<T> ok() {
+        return ResponseEntity.ok().build();
+    }
+
+    private static <T> ResponseEntity<T> noContent() {
+        return ResponseEntity.noContent().build();
+    }
+
+    private static <T> ResponseEntity<T> ok(T body) {
+        return ResponseEntity.ok(body);
+    }
+
+    private static <T> ResponseEntity<T> okIfPresent(Optional<T> body) {
+        return body
+            .map(StorageServer::ok)
+            .orElseGet(StorageServer::noContent);
+    }
+
+    private static void logInfo(String message, Object... params) {
+        if (LOGGER.isInfoEnabled()) {
+            Object[] objects = Arrays.stream(params)
+                .map(StorageServer::encode)
+                .toArray();
+            LOGGER.info(message, objects);
+        }
+    }
+
+    private static Object encode(Object input) {
+        if (input instanceof String s) {
+            return s.replaceAll("[\n\r\t]", "_");
+        }
+        return input;
+    }
+
     @GetMapping(value = "fileSystems")
     @Operation(summary = "Get file system list", responses = {
         @ApiResponse(content = @Content(schema = @Schema(implementation = List.class))),
@@ -418,14 +459,6 @@ public ResponseEntity<StreamingResponseBody> readBinaryAttribute(@Parameter(desc
         return okIfPresent(storage.readBinaryData(nodeId, name).map(StorageServer::copyToBodyAndClose));
     }
 
-    private static StreamingResponseBody copyToBodyAndClose(InputStream inputStream) {
-        return outputStream -> {
-            try (InputStream toClose = inputStream) {
-                IOUtils.copy(toClose, outputStream);
-            }
-        };
-    }
-
     @GetMapping(value = "fileSystems/{fileSystemName}/nodes/{nodeId}/data/{name}", produces = MediaType.TEXT_PLAIN_VALUE)
     @Operation(summary = "", responses = {
         @ApiResponse(content = @Content(schema = @Schema(implementation = String.class))),
@@ -698,38 +731,4 @@ public ResponseEntity<String> setMetadata(@Parameter(description = "File system
         storage.setMetadata(nodeId, nodeMetadata);
         return ok();
     }
-
-    private static <T> ResponseEntity<T> ok() {
-        return ResponseEntity.ok().build();
-    }
-
-    private static <T> ResponseEntity<T> noContent() {
-        return ResponseEntity.noContent().build();
-    }
-
-    private static <T> ResponseEntity<T> ok(T body) {
-        return ResponseEntity.ok(body);
-    }
-
-    private static <T> ResponseEntity<T> okIfPresent(Optional<T> body) {
-        return body
-            .map(StorageServer::ok)
-            .orElseGet(StorageServer::noContent);
-    }
-
-    private static void logInfo(String message, Object... params) {
-        if (LOGGER.isInfoEnabled()) {
-            Object[] objects = Arrays.stream(params)
-                .map(StorageServer::encode)
-                .toArray();
-            LOGGER.info(message, objects);
-        }
-    }
-
-    private static Object encode(Object input) {
-        if (input instanceof String s) {
-            return s.replaceAll("[\n\r\t]", "_");
-        }
-        return input;
-    }
 }

afs-spring-server/src/test/java/com/powsybl/afs/server/StorageServerTest.java

@@ -20,6 +20,7 @@
 import com.powsybl.computation.ComputationManager;
 import jakarta.servlet.ServletContext;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
@@ -79,6 +80,12 @@ public AppData getAppData() {
         }
     }
 
+    @AfterEach
+    public void tearDown() {
+        clearAllNodes();
+        super.tearDown();
+    }
+
     private URI getRestUri() {
         try {
             String sheme = "http";