Added ImageWorkerInterface to PlatformInterface

bioinformatics-ua · Jun 20, 2022 · 695b0b5 · 695b0b5
1 parent 8738014
commit 695b0b5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/dicoogle/src/main/java/pt/ua/dicoogle/plugins/DicooglePlatformProxy.java b/dicoogle/src/main/java/pt/ua/dicoogle/plugins/DicooglePlatformProxy.java
@@ -32,6 +32,7 @@
 import pt.ua.dicoogle.sdk.datastructs.Report;
 import pt.ua.dicoogle.sdk.datastructs.SearchResult;
 import pt.ua.dicoogle.sdk.datastructs.dim.DimLevel;
+import pt.ua.dicoogle.sdk.imageworker.ImageWorkerInterface;
 import pt.ua.dicoogle.sdk.settings.server.ServerSettingsReader;
 import pt.ua.dicoogle.sdk.task.JointQueryTask;
 import pt.ua.dicoogle.sdk.task.Task;
@@ -162,6 +163,16 @@ public List<Report> indexBlocking(URI path) {
         return pluginController.indexBlocking(path);
     }
 
+    @Override
+    public ImageWorkerInterface getImageWorkerByName(String name, boolean onlyEnabled) {
+        return pluginController.getImageWorkerInterfaceByName(name, onlyEnabled);
+    }
+
+    @Override
+    public Collection<ImageWorkerInterface> getImageWorkers(boolean onlyEnabled) {
+        return pluginController.getImageWorkerPlugins(onlyEnabled);
+    }
+
     @Override
     public ServerSettingsReader getSettings() {
         return ServerSettingsManager.getSettings();

diff --git a/dicoogle/src/test/java/pt/ua/dicoogle/core/plugins/PlatformInterfaceMock.java b/dicoogle/src/test/java/pt/ua/dicoogle/core/plugins/PlatformInterfaceMock.java
@@ -26,6 +26,7 @@
 import pt.ua.dicoogle.sdk.datastructs.Report;
 import pt.ua.dicoogle.sdk.datastructs.SearchResult;
 import pt.ua.dicoogle.sdk.datastructs.dim.DimLevel;
+import pt.ua.dicoogle.sdk.imageworker.ImageWorkerInterface;
 import pt.ua.dicoogle.sdk.settings.server.ServerSettingsReader;
 import pt.ua.dicoogle.sdk.task.JointQueryTask;
 import pt.ua.dicoogle.sdk.task.Task;
@@ -125,6 +126,16 @@ public List<Report> indexBlocking(URI path) {
         return null;
     }
 
+    @Override
+    public ImageWorkerInterface getImageWorkerByName(String name, boolean onlyEnabled) {
+        return null;
+    }
+
+    @Override
+    public Collection<ImageWorkerInterface> getImageWorkers(boolean onlyEnabled) {
+        return null;
+    }
+
     @Override
     public ServerSettingsReader getSettings() {
         return null;

diff --git a/sdk/src/main/java/pt/ua/dicoogle/sdk/core/DicooglePlatformInterface.java b/sdk/src/main/java/pt/ua/dicoogle/sdk/core/DicooglePlatformInterface.java
@@ -29,6 +29,7 @@
 import pt.ua.dicoogle.sdk.datastructs.Report;
 import pt.ua.dicoogle.sdk.datastructs.SearchResult;
 import pt.ua.dicoogle.sdk.datastructs.dim.DimLevel;
+import pt.ua.dicoogle.sdk.imageworker.ImageWorkerInterface;
 import pt.ua.dicoogle.sdk.settings.server.ServerSettingsReader;
 import pt.ua.dicoogle.sdk.task.JointQueryTask;
 import pt.ua.dicoogle.sdk.task.Task;
@@ -213,6 +214,21 @@ public JointQueryTask query(JointQueryTask holder, List<String> querySources, Di
      */
     public List<Report> indexBlocking(URI path);
 
+    /** Gets the image worker with the given name.
+     *
+     * @param name the unique name of the worker
+     * @param onlyEnabled whether only enabled plugins should be retrieved (all are retrieved if {@code false})
+     * @return the image worker with the given name or null if it doesn't exist
+     */
+    public ImageWorkerInterface getImageWorkerByName(String name, boolean onlyEnabled);
+
+    /** Gets all the image workers available.
+     *
+     * @param onlyEnabled whether only enabled plugins should be retrieved (all are retrieved if {@code false})
+     * @return a collection with all image workers available
+     */
+    public Collection<ImageWorkerInterface> getImageWorkers(boolean onlyEnabled);
+
     /** Obtain access to the server's settings.
      * @return an object for read-only access to the settings
      */