Remove Unused DB Files

Author: Ezequiel-Valencia

vcell-rest/src/main/java/org/vcell/restq/services/Exports/ExportService.java

@@ -33,8 +33,6 @@
 
 @ApplicationScoped
 public class ExportService {
-    private final DatabaseServerImpl databaseServer;
-
     @Inject
     ExportStatusCreator exportStatusCreator;
 
@@ -44,24 +42,15 @@ public class ExportService {
     @Inject
     ObjectMapper jsonMapper;
 
-
-
-    private final static Logger lg = LogManager.getLogger(ExportService.class);
-
     @Inject
-    public ExportService(AgroalConnectionFactory connectionFactory, ExportStatusCreator exportStatusCreator) throws DataAccessException, FileNotFoundException {
-        this.databaseServer = new DatabaseServerImpl(connectionFactory, connectionFactory.getKeyFactory());
+    public ExportService(ExportStatusCreator exportStatusCreator) throws DataAccessException, FileNotFoundException {
         this.exportStatusCreator = exportStatusCreator;
     }
 
     public ExportResource.ExportHistory getExportHistory(User user) throws DataAccessException {
         return new ExportResource.ExportHistory("Hello");
     }
 
-    public void addExportHistory(User user, ExportResource.ExportHistory history) throws DataAccessException {
-        databaseServer.addExportHistory(user, history.exportHistory());
-    }
-
     public Multi<ExportEvent> getExportStatuses(User user, long jobID) throws ObjectNotFoundException {
         return exportStatusCreator.getUsersExportStatus(user, jobID);
     }

vcell-server/src/main/java/cbit/vcell/modeldb/DBTopLevel.java

@@ -53,7 +53,6 @@ public class DBTopLevel extends AbstractDBTopLevel{
 	private final BioModelDbDriver bioModelDB;
 	private final MathModelDbDriver mathModelDB;
 	private final UserDbDriver userDB;
-	private final ExportHistoryDBDriver exportHistoryDB;
 //	private DBCacheTable dbCacheTable = null;
 
 	private static final int SQL_ERROR_CODE_BADCONNECTION = 1010; //??????????????????????????????????????
@@ -76,7 +75,6 @@ public class DBTopLevel extends AbstractDBTopLevel{
 	this.userDB = new UserDbDriver(); 
 	this.bioModelDB = new BioModelDbDriver(databaseSyntax,keyFactory);
 	this.mathModelDB = new MathModelDbDriver(databaseSyntax, keyFactory);
-	this.exportHistoryDB = new ExportHistoryDBDriver(databaseSyntax, keyFactory);
 }
 
 
@@ -2257,27 +2255,4 @@ public SimulationRep getSimulationRep(KeyValue simKey, boolean bEnableRetry) thr
 	}
 }
 
-	public void insertExportHistory(User user, String exportHistoryValues, boolean bEnableRetry) throws SQLException, DataAccessException {
-		Object lock = new Object();
-		Connection con = conFactory.getConnection(lock);
-		try {
-			exportHistoryDB.addExportHistory(con, user, exportHistoryValues);
-		} catch (Throwable e) {
-			lg.error(e.getMessage(),e);
-			try {
-				con.rollback();
-			}catch (Throwable rbe){
-				lg.error("exception during rollback, bEnableRetry = "+bEnableRetry, rbe);
-			}
-			if (bEnableRetry && isBadConnection(con)) {
-				conFactory.failed(con,lock);
-				insertExportHistory(user, exportHistoryValues, false);
-			}else{
-				handle_DataAccessException_SQLException(e);
-			}
-		}finally{
-			conFactory.release(con,lock);
-		}
-	}
-
 }

vcell-server/src/main/java/cbit/vcell/modeldb/DatabaseServerImpl.java

@@ -1355,12 +1355,4 @@ public BigString saveVCImageAs(User user, BigString vcImageXML, java.lang.String
 	}
 }
 
-public void addExportHistory(User user, String exportHistory) throws DataAccessException {
-    try {
-        dbTop.insertExportHistory(user, exportHistory, true);
-    } catch (SQLException e) {
-        throw new DataAccessException(e);
-    }
-}
-
 }