Clean code and fix sonar issues

afs-action-dsl/src/test/java/com/powsybl/afs/action/dsl/ActionScriptTest.java

@@ -6,7 +6,6 @@
  */
 package com.powsybl.afs.action.dsl;
 
-import com.google.common.collect.ImmutableList;
 import com.powsybl.afs.AbstractProjectFileTest;
 import com.powsybl.afs.Project;
 import com.powsybl.afs.ProjectFileExtension;
@@ -39,7 +38,7 @@ protected AppStorage createStorage() {
 
     @Override
     protected List<ProjectFileExtension> getProjectFileExtensions() {
-        return ImmutableList.of(new ActionScriptExtension());
+        return List.of(new ActionScriptExtension());
     }
 
     @Test
@@ -49,13 +48,13 @@ void test() {
 
         // create contingency list
         ActionScript actionScript = project.getRootFolder().fileBuilder(ActionScriptBuilder.class)
-                .withName("contingencies")
-                .withContent(String.join(System.lineSeparator(),
-                        "contingency('c1') {",
-                        "    equipments 'l1'",
-                        "}",
-                        ""))
-                .build();
+            .withName("contingencies")
+            .withContent(String.join(System.lineSeparator(),
+                "contingency('c1') {",
+                "    equipments 'l1'",
+                "}",
+                ""))
+            .build();
         List<Contingency> contingencies = Collections.singletonList(new Contingency("c1", new LineContingency("l1")));
 
         Network network = Mockito.mock(Network.class);
@@ -75,15 +74,15 @@ void testActionScripCreationWithCustomPseudoClass() {
 
         // Build an ActionScript using the custom pseudo-class
         project.getRootFolder().fileBuilder(ActionScriptBuilder.class)
-                .withName("customScript")
-                .withContent("script content")
-                .withPseudoClass(customPseudoClass)
-                .build();
+            .withName("customScript")
+            .withContent("script content")
+            .withPseudoClass(customPseudoClass)
+            .build();
 
         // Retrieve the node info for the created script from storage
         NodeInfo nodeInfo = storage
-                .getChildNode(project.getRootFolder().getId(), "customScript")
-                .orElseThrow(() -> new AssertionError("Node 'customScript' not found"));
+            .getChildNode(project.getRootFolder().getId(), "customScript")
+            .orElseThrow(() -> new AssertionError("Node 'customScript' not found"));
 
         // Assert that the pseudo-class of the node is set to the custom value
         assertEquals(customPseudoClass, nodeInfo.getPseudoClass());
@@ -96,14 +95,14 @@ void testActionScripCreationWithDefaultPseudoClass() {
 
         // Build an ActionScript without specifying a pseudo-class
         project.getRootFolder().fileBuilder(ActionScriptBuilder.class)
-                .withName("defaultScript")
-                .withContent("script content")
-                .build();
+            .withName("defaultScript")
+            .withContent("script content")
+            .build();
 
         // Retrieve the node info for the created script from storage
         NodeInfo nodeInfo = storage
-                .getChildNode(project.getRootFolder().getId(), "defaultScript")
-                .orElseThrow(() -> new AssertionError("Node 'defaultScript' not found"));
+            .getChildNode(project.getRootFolder().getId(), "defaultScript")
+            .orElseThrow(() -> new AssertionError("Node 'defaultScript' not found"));
 
         // Assert that the pseudo-class of the node is set to the default value defined in ActionScript.PSEUDO_CLASS
         assertEquals(ActionScript.PSEUDO_CLASS, nodeInfo.getPseudoClass());

afs-contingency/src/test/java/com/powsybl/afs/contingency/ContingencyStoreTest.java

@@ -6,7 +6,6 @@
  */
 package com.powsybl.afs.contingency;
 
-import com.google.common.collect.ImmutableList;
 import com.powsybl.afs.AbstractProjectFileTest;
 import com.powsybl.afs.Project;
 import com.powsybl.afs.ProjectFileExtension;
@@ -35,7 +34,7 @@ protected AppStorage createStorage() {
 
     @Override
     protected List<ProjectFileExtension> getProjectFileExtensions() {
-        return ImmutableList.of(new ContingencyStoreExtension());
+        return List.of(new ContingencyStoreExtension());
     }
 
     @Test

afs-core/pom.xml

@@ -55,14 +55,18 @@
 
     <dependencies>
         <!-- Compilation dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>powsybl-afs-storage-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-computation-local</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>powsybl-afs-storage-api</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.owasp.encoder</groupId>
+            <artifactId>encoder</artifactId>
         </dependency>
 
         <!-- Test dependencies -->

afs-core/src/main/java/com/powsybl/afs/AppData.java

@@ -17,7 +17,7 @@
 
 /**
  * An instance of AppData is the root of an application file system.
- *
+ * <p>
  * Usually, an application will only have one instance of AppData.
  * It is the first entrypoint of AFS, through which you can access to individual {@link AppFileSystem} objects.
  *
@@ -45,28 +45,17 @@
  */
 public class AppData implements AutoCloseable {
 
-    private ComputationManager shortTimeExecutionComputationManager;
-
-    private ComputationManager longTimeExecutionComputationManager;
-
-    private Map<String, AppFileSystem> fileSystems;
-
     private final List<AppFileSystemProvider> fileSystemProviders;
-
     private final List<ServiceExtension> serviceExtensions;
-
     private final Map<Class<? extends File>, FileExtension> fileExtensions = new HashMap<>();
-
     private final Map<String, FileExtension> fileExtensionsByPseudoClass = new HashMap<>();
-
     private final Map<Class<?>, ProjectFileExtension> projectFileExtensions = new HashMap<>();
-
     private final Map<String, ProjectFileExtension> projectFileExtensionsByPseudoClass = new HashMap<>();
-
     private final Set<Class<? extends ProjectFile>> projectFileClasses = new HashSet<>();
-
     private final EventsBus eventsBus;
-
+    private ComputationManager shortTimeExecutionComputationManager;
+    private ComputationManager longTimeExecutionComputationManager;
+    private Map<String, AppFileSystem> fileSystems;
     private Map<ServiceExtension.ServiceKey, Object> services;
 
     private SecurityTokenProvider tokenProvider = () -> null;
@@ -77,31 +66,35 @@ public AppData(ComputationManager shortTimeExecutionComputationManager, Computat
 
     public AppData(ComputationManager shortTimeExecutionComputationManager, ComputationManager longTimeExecutionComputationManager, EventsBus eventsBus) {
         this(shortTimeExecutionComputationManager, longTimeExecutionComputationManager,
-                getDefaultFileSystemProviders(), getDefaultFileExtensions(), getDefaultProjectFileExtensions(), getDefaultServiceExtensions(), eventsBus);
+            getDefaultFileSystemProviders(), getDefaultFileExtensions(), getDefaultProjectFileExtensions(), getDefaultServiceExtensions(), eventsBus);
     }
 
-    public AppData(ComputationManager shortTimeExecutionComputationManager,
-                   ComputationManager longTimeExecutionComputationManager, List<AppFileSystemProvider> fileSystemProviders) {
+    public AppData(
+        ComputationManager shortTimeExecutionComputationManager,
+        ComputationManager longTimeExecutionComputationManager, List<AppFileSystemProvider> fileSystemProviders) {
         this(shortTimeExecutionComputationManager, longTimeExecutionComputationManager,
-                fileSystemProviders, getDefaultEventsBus());
+            fileSystemProviders, getDefaultEventsBus());
     }
 
-    public AppData(ComputationManager shortTimeExecutionComputationManager,
-                   ComputationManager longTimeExecutionComputationManager, List<AppFileSystemProvider> fileSystemProviders, EventsBus eventsBus) {
+    public AppData(
+        ComputationManager shortTimeExecutionComputationManager,
+        ComputationManager longTimeExecutionComputationManager, List<AppFileSystemProvider> fileSystemProviders, EventsBus eventsBus) {
         this(shortTimeExecutionComputationManager, longTimeExecutionComputationManager,
-                fileSystemProviders, getDefaultFileExtensions(), getDefaultProjectFileExtensions(), getDefaultServiceExtensions(), eventsBus);
+            fileSystemProviders, getDefaultFileExtensions(), getDefaultProjectFileExtensions(), getDefaultServiceExtensions(), eventsBus);
     }
 
-    public AppData(ComputationManager shortTimeExecutionComputationManager, ComputationManager longTimeExecutionComputationManager,
-                   List<AppFileSystemProvider> fileSystemProviders, List<FileExtension> fileExtensions,
-                   List<ProjectFileExtension> projectFileExtensions, List<ServiceExtension> serviceExtensions) {
+    public AppData(
+        ComputationManager shortTimeExecutionComputationManager, ComputationManager longTimeExecutionComputationManager,
+        List<AppFileSystemProvider> fileSystemProviders, List<FileExtension> fileExtensions,
+        List<ProjectFileExtension> projectFileExtensions, List<ServiceExtension> serviceExtensions) {
         this(shortTimeExecutionComputationManager, longTimeExecutionComputationManager, fileSystemProviders, fileExtensions,
-                projectFileExtensions, serviceExtensions, getDefaultEventsBus());
+            projectFileExtensions, serviceExtensions, getDefaultEventsBus());
     }
 
-    public AppData(ComputationManager shortTimeExecutionComputationManager, ComputationManager longTimeExecutionComputationManager,
-                   List<AppFileSystemProvider> fileSystemProviders, List<FileExtension> fileExtensions,
-                   List<ProjectFileExtension> projectFileExtensions, List<ServiceExtension> serviceExtensions, EventsBus eventsBus) {
+    public AppData(
+        ComputationManager shortTimeExecutionComputationManager, ComputationManager longTimeExecutionComputationManager,
+        List<AppFileSystemProvider> fileSystemProviders, List<FileExtension> fileExtensions,
+        List<ProjectFileExtension> projectFileExtensions, List<ServiceExtension> serviceExtensions, EventsBus eventsBus) {
         Objects.requireNonNull(fileSystemProviders);
         Objects.requireNonNull(fileExtensions);
         Objects.requireNonNull(projectFileExtensions);
@@ -110,11 +103,11 @@ public AppData(ComputationManager shortTimeExecutionComputationManager, Computat
         this.longTimeExecutionComputationManager = longTimeExecutionComputationManager;
         this.fileSystemProviders = Objects.requireNonNull(fileSystemProviders);
         this.serviceExtensions = Objects.requireNonNull(serviceExtensions);
-        for (FileExtension extension : fileExtensions) {
+        for (FileExtension<?> extension : fileExtensions) {
             this.fileExtensions.put(extension.getFileClass(), extension);
             this.fileExtensionsByPseudoClass.put(extension.getFilePseudoClass(), extension);
         }
-        for (ProjectFileExtension extension : projectFileExtensions) {
+        for (ProjectFileExtension<?, ?> extension : projectFileExtensions) {
             this.projectFileExtensions.put(extension.getProjectFileClass(), extension);
             this.projectFileExtensions.put(extension.getProjectFileBuilderClass(), extension);
             this.projectFileExtensionsByPseudoClass.put(extension.getProjectFilePseudoClass(), extension);
@@ -142,6 +135,10 @@ private static List<ServiceExtension> getDefaultServiceExtensions() {
         return new ServiceLoaderCache<>(ServiceExtension.class).getServices();
     }
 
+    private static String[] more(String[] path) {
+        return path.length > 2 ? Arrays.copyOfRange(path, 2, path.length - 1) : new String[] {};
+    }
+
     private synchronized void loadFileSystems() {
         if (fileSystems == null) {
             fileSystems = new HashMap<>();
@@ -159,7 +156,7 @@ private synchronized void loadServices() {
         if (services == null) {
             services = new HashMap<>();
             ServiceCreationContext context = new ServiceCreationContext(tokenProvider.getToken());
-            for (ServiceExtension extension : serviceExtensions) {
+            for (ServiceExtension<?> extension : serviceExtensions) {
                 services.put(extension.getServiceKey(), extension.createService(context));
             }
         }
@@ -214,10 +211,6 @@ public void setTokenProvider(SecurityTokenProvider tokenProvider) {
         services = null;
     }
 
-    private static String[] more(String[] path) {
-        return path.length > 2 ? Arrays.copyOfRange(path, 2, path.length - 1) : new String[] {};
-    }
-
     public Optional<Node> getNode(String pathStr) {
         Objects.requireNonNull(pathStr);
         loadFileSystems();
@@ -231,7 +224,7 @@ public Optional<Node> getNode(String pathStr) {
             return Optional.empty();
         }
         return path.length == 1 ? Optional.of(fileSystem.getRootFolder())
-                                : fileSystem.getRootFolder().getChild(path[1], more(path));
+            : fileSystem.getRootFolder().getChild(path[1], more(path));
     }
 
     public Set<Class<? extends ProjectFile>> getProjectFileClasses() {
@@ -240,7 +233,7 @@ public Set<Class<? extends ProjectFile>> getProjectFileClasses() {
 
     FileExtension getFileExtension(Class<? extends File> fileClass) {
         Objects.requireNonNull(fileClass);
-        FileExtension extension = fileExtensions.get(fileClass);
+        FileExtension<?> extension = fileExtensions.get(fileClass);
         if (extension == null) {
             throw new AfsException("No extension found for file class '" + fileClass.getName() + "'");
         }
@@ -254,10 +247,10 @@ FileExtension getFileExtensionByPseudoClass(String filePseudoClass) {
 
     ProjectFileExtension getProjectFileExtension(Class<?> projectFileOrProjectFileBuilderClass) {
         Objects.requireNonNull(projectFileOrProjectFileBuilderClass);
-        ProjectFileExtension extension = projectFileExtensions.get(projectFileOrProjectFileBuilderClass);
+        ProjectFileExtension<?, ?> extension = projectFileExtensions.get(projectFileOrProjectFileBuilderClass);
         if (extension == null) {
             throw new AfsException("No extension found for project file or project file builder class '"
-                    + projectFileOrProjectFileBuilderClass.getName() + "'");
+                + projectFileOrProjectFileBuilderClass.getName() + "'");
         }
         return extension;
     }
@@ -271,20 +264,27 @@ public ComputationManager getShortTimeExecutionComputationManager() {
         return shortTimeExecutionComputationManager;
     }
 
+    public void setShortTimeExecutionComputationManager(ComputationManager shortTimeExecutionComputationManager) {
+        this.shortTimeExecutionComputationManager = shortTimeExecutionComputationManager;
+    }
+
     public ComputationManager getLongTimeExecutionComputationManager() {
         return longTimeExecutionComputationManager != null ? longTimeExecutionComputationManager : shortTimeExecutionComputationManager;
     }
 
+    public void setLongTimeExecutionComputationManager(ComputationManager longTimeExecutionComputationManager) {
+        this.longTimeExecutionComputationManager = longTimeExecutionComputationManager;
+    }
+
     /**
      * Gets the list of remotely accessible file systems. Should not be used by the AFS API users.
      */
     public List<String> getRemotelyAccessibleFileSystemNames() {
         loadFileSystems();
-        return fileSystems.entrySet().stream()
-                .map(Map.Entry::getValue)
-                .filter(AppFileSystem::isRemotelyAccessible)
-                .map(AppFileSystem::getName)
-                .collect(Collectors.toList());
+        return fileSystems.values().stream()
+            .filter(AppFileSystem::isRemotelyAccessible)
+            .map(AppFileSystem::getName)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -333,12 +333,4 @@ public EventsBus getEventsBus() {
     public void close() {
         closeFileSystems();
     }
-
-    public void setShortTimeExecutionComputationManager(ComputationManager shortTimeExecutionComputationManager) {
-        this.shortTimeExecutionComputationManager = shortTimeExecutionComputationManager;
-    }
-
-    public void setLongTimeExecutionComputationManager(ComputationManager longTimeExecutionComputationManager) {
-        this.longTimeExecutionComputationManager = longTimeExecutionComputationManager;
-    }
 }

afs-core/src/main/java/com/powsybl/afs/AppFileSystem.java

@@ -6,7 +6,6 @@
  */
 package com.powsybl.afs;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.powsybl.afs.storage.AfsStorageException;
 import com.powsybl.afs.storage.AppStorage;
@@ -18,6 +17,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * An AppFileSystem instance is a tree of {@link Node} objects, starting with its root folder.
@@ -98,7 +98,7 @@ public Node createNode(NodeInfo nodeInfo) {
         } else if (Project.PSEUDO_CLASS.equals(nodeInfo.getPseudoClass())) {
             return new Project(context);
         } else {
-            FileExtension extension = data.getFileExtensionByPseudoClass(nodeInfo.getPseudoClass());
+            FileExtension<?> extension = data.getFileExtensionByPseudoClass(nodeInfo.getPseudoClass());
             if (extension != null) {
                 return extension.createFile(context);
             } else {
@@ -153,7 +153,7 @@ public AbstractNodeBase fetchNode(String nodeId, boolean connected) {
             return new ProjectFolder(context);
         }
 
-        ProjectFileExtension extension = data.getProjectFileExtensionByPseudoClass(projectFileInfo.getPseudoClass());
+        ProjectFileExtension<?, ?> extension = data.getProjectFileExtensionByPseudoClass(projectFileInfo.getPseudoClass());
         if (extension != null) {
             return extension.createProjectFile(context);
         }