adapt to new commonarchivingapi for database connection

hdbarchiver/src/main/java/HdbArchiver/HdbArchiver.java

@@ -370,6 +370,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 
+import fr.soleil.database.connection.DataBaseParameters;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
 import org.slf4j.Logger;
@@ -614,23 +615,16 @@ public class HdbArchiver extends DeviceImpl implements TangoConst {
         logger.debug("init done");
     }
 
-    private void connectDatabase() {
+    private void connectDatabase() throws DevFailed{
         try {
-            HdbTdbConnectionParameters.performHDBInit(get_db_device(), true, true);
+            DataBaseParameters parameters = new DataBaseParameters();
+            parameters.setParametersFromTango(ConfigConst.TDB_CLASS_DEVICE);
 
-            String dbHost = HdbTdbConnectionParameters.getHDbHost();
-            String dbName = HdbTdbConnectionParameters.getHDbName();
-            String dbSchema = HdbTdbConnectionParameters.getHDbSchema();
-            String dbUser = HdbTdbConnectionParameters.getHDBUser();
-            String dbPassword = HdbTdbConnectionParameters.getHDBPassword();
-            boolean isRac = HdbTdbConnectionParameters.isHDbRac();
-
-            HdbTdbConnectionParameters.printHDBConnectionInfoLog();
 
             if (dbProxy != null) {
                 dbProxy.closeConnection();
             }
-            dbProxy = new DbProxy(dbHost, dbName, dbSchema, dbUser, dbPassword, isRac, logger);
+            dbProxy = new DbProxy(parameters);
             // setControlMode(safetyPeriod);
             // start archiving in a thread
             if (initDeviceTast == null) {
@@ -644,7 +638,7 @@ public class HdbArchiver extends DeviceImpl implements TangoConst {
         }
     }
 
-    private synchronized void reconnectDatabaseIfNecessary() {
+    private synchronized void reconnectDatabaseIfNecessary() throws  DevFailed{
         if (dbProxy == null) {
             connectDatabase();
         }
@@ -1060,7 +1054,7 @@ public class HdbArchiver extends DeviceImpl implements TangoConst {
                         final HdbCollector m_collector = collectorFactory.get(attributeLightMode);
                         if (m_collector == null) {
                             logger.debug("createCollectorAndAddSource " + attCompleteName);
-                            collectorFactory.createCollectorAndAddSource(attributeLightMode, dbProxy);
+                            collectorFactory.createCollectorAndAddSource(attributeLightMode, dbProxy, isUseEvents);
                         } else {
                             logger.debug("addSource " + attCompleteName);
                             m_collector.addSource(attributeLightMode);