Plugin system to choose StorageManager implementation

#281

Author: abdessamad-abdoun

src/main/java/fr/inria/corese/core/next/storagemanager/api/plugin/StoragePlugin.java

@@ -24,7 +24,15 @@ default String getDescription() {
         return "StorageManager plugin: " + getName();
     }
 
-
+    /**
+     * Checks if this plugin supports the given configuration.
+     *
+     *
+     * @param config the storage configuration to check (never null)
+     * @return {@code true} if this plugin can create a StorageManager for this config
+     * @throws IllegalArgumentException if config is null
+     */
+    boolean supports(StorageConfig config);
 
     /**
      * Creates a StorageManager instance from the given configuration.
@@ -44,5 +52,4 @@ default String getDescription() {
     default int getPriority() {
         return 0;
     }
-
-}
+}

src/main/java/fr/inria/corese/core/next/storagemanager/api/plugin/StoragePluginManager.java

@@ -2,6 +2,8 @@
 
 import fr.inria.corese.core.next.storagemanager.api.StorageManager;
 import fr.inria.corese.core.next.storagemanager.api.support.config.StorageConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -12,6 +14,8 @@
  */
 public class StoragePluginManager {
 
+    private static final Logger logger = LoggerFactory.getLogger(StoragePluginManager.class);
+
     /**
      * ServiceLoader for discovering plugins
      */
@@ -55,6 +59,7 @@ public static StorageManager create(StorageConfig config) throws PluginException
 
         // Find plugins that support this configuration
         List<StoragePlugin> supportingPlugins = allPlugins.stream()
+                .filter(plugin -> plugin.supports(config))
                 .sorted(Comparator.comparingInt(StoragePlugin::getPriority).reversed())
                 .toList();
 
@@ -65,26 +70,26 @@ public static StorageManager create(StorageConfig config) throws PluginException
 
             throw new PluginNotFoundException(
                     String.format("No plugin found for storage type '%s'. Available types: [%s]",
-                            config.getType(), availableTypes)
+                            config.getType().orElse("not specified"), availableTypes)
             );
         }
 
         // Select plugin with highest priority
         StoragePlugin selectedPlugin = supportingPlugins.getFirst();
 
-        // Log warning if multiple plugins match
         if (supportingPlugins.size() > 1) {
             String otherPlugins = supportingPlugins.stream()
                     .skip(1)
                     .map(p -> p.getName() + " (priority=" + p.getPriority() + ")")
                     .collect(Collectors.joining(", "));
 
-            System.out.println("WARNING: Multiple plugins support this configuration. " +
-                    "Selected '" + selectedPlugin.getName() + "' (priority=" +
-                    selectedPlugin.getPriority() + "). Ignored: " + otherPlugins);
+            logger.warn("Multiple plugins support this configuration. " +
+                            "Selected '{}' (priority={}). Ignored: {}",
+                    selectedPlugin.getName(),
+                    selectedPlugin.getPriority(),
+                    otherPlugins);
         }
 
-        // Create StorageManager
         try {
             return selectedPlugin.create(config);
         } catch (PluginException e) {
@@ -146,7 +151,6 @@ public static Optional<StoragePlugin> findPlugin(String name) {
         return Optional.ofNullable(pluginsByName.get(name));
     }
 
-
     /**
      * Returns the names of all available plugins.
      *
@@ -170,6 +174,4 @@ public static void reload() {
             pluginsByName.clear();
         }
     }
-
-
-}
+}

src/main/java/fr/inria/corese/core/next/storagemanager/impl/graph/plugin/GraphStoragePlugin.java

@@ -23,15 +23,24 @@ public String getDescription() {
         return "Legacy Corese Graph backend (production-ready, indexed, thread-safe)";
     }
 
+    @Override
+    public boolean supports(StorageConfig config) {
+        if (config == null) {
+            return false;
+        }
+        return config.getType()
+                .map("graph"::equalsIgnoreCase)
+                .orElse(false);
+    }
 
     @Override
     public StorageManager create(StorageConfig config) throws PluginException {
         try {
             Graph graph = config.getProperty("graph", Graph.class)
-                    .orElseThrow(() -> new PluginException("Graph instance required"));
+                    .orElseThrow(() -> new PluginException("Graph instance required in config properties"));
 
             ValueFactory factory = config.getProperty("valueFactory", ValueFactory.class)
-                    .orElseThrow(() -> new PluginException("ValueFactory required"));
+                    .orElseThrow(() -> new PluginException("ValueFactory required in config properties"));
 
             GraphStorageManager storage = GraphStorageManager.builder()
                     .graph(graph)
@@ -52,4 +61,4 @@ public StorageManager create(StorageConfig config) throws PluginException {
     public int getPriority() {
         return 100;
     }
-}
+}

src/main/java/fr/inria/corese/core/next/storagemanager/impl/memory/plugin/MemoryStoragePlugin.java

@@ -21,6 +21,15 @@ public String getDescription() {
         return "In-memory HashMap backend (testing only, no persistence)";
     }
 
+    @Override
+    public boolean supports(StorageConfig config) {
+        if (config == null) {
+            return false;
+        }
+        return config.getType()
+                .map("memory"::equalsIgnoreCase)
+                .orElse(false);
+    }
 
     @Override
     public StorageManager create(StorageConfig config) throws PluginException {
@@ -30,7 +39,6 @@ public StorageManager create(StorageConfig config) throws PluginException {
 
 
         try {
-            // Build MemoryStorageManager (no dependencies required)
             MemoryStorageManager storage = MemoryStorageManager.builder().build();
 
             // Initialize lifecycle

src/test/java/fr/inria/corese/core/next/data/impl/io/serialization/turtle/TurtleSerializerTest.java

@@ -344,7 +344,8 @@ void testBlankNodeSerializarionWithoutId() {
 
         turtleSerializer.write(writer);
         String actual = writer.toString().replace("\r\n", "\n");
-        System.out.println(actual);
+        logger.debug("Serialized Turtle output:\n{}", actual);
+
     }
 
     /**