Groundwork for jira ticket TANGOARCH-908

archivingmanager/src/main/java/org/tango/archiving/server/manager/ArchivingManager.java

@@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory;
 import org.tango.DeviceState;
 import org.tango.server.ServerManager;
 import org.tango.server.annotation.*;
+import org.tango.utils.DevFailedUtils;
 
-import javax.xml.crypto.Data;
 import java.util.ResourceBundle;
 import java.util.Set;
 
@@ -526,4 +526,30 @@ public class ArchivingManager {
         return databaseAccess.getStatus(argin);
     }
 
+    /**
+     * Create a new context in the database and returns the corresponding id
+     *
+     * @param argin contextName,contextDescription
+     * @return contextId
+     * @throws DevFailed if the context cannot be created or if you are using HDB or TDB
+     */
+    @Command(name = "CreateNewContext", inTypeDesc = "contextName,contextDescription", outTypeDesc = "contextId")
+    public int createNewContext(final String[] argin) throws DevFailed {
+        if (argin.length != 2) {
+            throw DevFailedUtils.newDevFailed("Invalid number of arguments");
+        }
+        return databaseAccess.createNewContext(argin[0], argin[1]);
+    }
+
+    /**
+     * Get all the contexts declared in the database.
+     *
+     * @return the array of contexts
+     * @throws DevFailed if you are using HDB or TDB
+     */
+    @Command(name = "GetAllContexts", outTypeDesc = "Every contexts declared")
+    public String[] getAllContexts() throws DevFailed {
+        return databaseAccess.getAllContexts();
+    }
+
 }

archivingmanager/src/main/java/org/tango/archiving/server/manager/HDBTDBAccess.java

@@ -9,18 +9,14 @@ import fr.soleil.archiving.hdbtdb.api.manager.ArchivingManagerApiRefFactory;
 import fr.soleil.archiving.hdbtdb.api.manager.IArchivingManagerApiRef;
 import fr.soleil.archiving.hdbtdb.api.tools.ArchivingMessConfig;
 import fr.soleil.archiving.hdbtdb.api.tools.AttributeLightMode;
-import fr.soleil.archiving.hdbtdb.api.tools.mode.EventMode;
-import fr.soleil.archiving.hdbtdb.api.tools.mode.Mode;
-import fr.soleil.archiving.hdbtdb.api.tools.mode.ModeAbsolu;
-import fr.soleil.archiving.hdbtdb.api.tools.mode.ModeDifference;
-import fr.soleil.archiving.hdbtdb.api.tools.mode.ModePeriode;
-import fr.soleil.archiving.hdbtdb.api.tools.mode.ModeRelatif;
+import fr.soleil.archiving.hdbtdb.api.tools.mode.*;
 import fr.soleil.database.connection.AbstractDataBaseConnector;
 import fr.soleil.database.connection.DataBaseParameters;
 import fr.soleil.tango.archiving.build.DatabaseConnectionConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tango.archiving.server.manager.configuration.ArchivingStartConfig;
+import org.tango.utils.DevFailedUtils;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -211,4 +207,14 @@ public class HDBTDBAccess implements IArchivingAccess {
     public Set<String> getExportedArchiverList() {
         return new HashSet<>(Arrays.asList(dbManager.getMExportedArchiverList()));
     }
+
+    @Override
+    public String[] getAllContexts() throws DevFailed {
+        throw DevFailedUtils.newDevFailed("Not supported for HDB or TDB");
+    }
+
+    @Override
+    public int createNewContext(final String contextName, String description) throws DevFailed {
+        throw DevFailedUtils.newDevFailed("Not supported for HDB or TDB");
+    }
 }

archivingmanager/src/main/java/org/tango/archiving/server/manager/IArchivingAccess.java

@@ -24,7 +24,6 @@ public interface IArchivingAccess {
 
     short[] isArchived(final String[] argin) throws DevFailed;
 
-
     String[] getArchivingMode(final String argin) throws DevFailed;
 
 
@@ -32,4 +31,7 @@ public interface IArchivingAccess {
 
     Set<String> getExportedArchiverList();
 
+    String[] getAllContexts() throws DevFailed;
+
+    int createNewContext(final String contextName, String description) throws DevFailed;
 }

archivingmanager/src/main/java/org/tango/archiving/server/manager/TimeseriesAccess.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.TangoApi.AttributeInfo;
 import fr.esrf.TangoApi.DeviceProxy;
-import fr.soleil.database.connection.DataBaseParameters;
 import fr.soleil.tango.archiving.TangoArchivingSystemConfigurationBuilder;
 import fr.soleil.tango.archiving.TangoArchivingSystemConfigurationService;
 import fr.soleil.tango.archiving.build.DatabaseConnectionConfig;
@@ -36,7 +35,7 @@ public class TimeseriesAccess implements IArchivingAccess {
     private final static String IMAGE_CHARGE = "imageCharge";
     private final static String INSERTION_RATE = "insertionRate";
     protected TangoArchivingConfigService configService;
-    private Logger logger = LoggerFactory.getLogger(TimeseriesAccess.class);
+    private final Logger logger = LoggerFactory.getLogger(TimeseriesAccess.class);
     private TangoArchivingSystemConfigurationService service;
 
     @Override
@@ -176,4 +175,14 @@ public class TimeseriesAccess implements IArchivingAccess {
     public Set<String> getExportedArchiverList() {
         return service.getArchivers();
     }
+
+    @Override
+    public String[] getAllContexts() throws DevFailed {
+        return new String[0]; // TODO: Implement
+    }
+
+    @Override
+    public int createNewContext(final String contextName, String description) throws DevFailed {
+        return 0; // TODO: Implement
+    }
 }