From af053db669f3d420bdcc6c9140ff1ae65cc539a8 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 28 Feb 2017 16:16:34 +0000 Subject: [PATCH] Removed ScopeProvider calls git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@144440 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 5 + pom.xml | 2 +- .../drmalgorithms/GetTableDetails.java | 138 ++++----- .../algorithms/drmalgorithms/ListDBInfo.java | 268 +++++++++--------- .../algorithms/drmalgorithms/ListNames.java | 41 +-- .../algorithms/drmalgorithms/ListSchemas.java | 85 +++--- .../algorithms/drmalgorithms/ListTables.java | 78 ++--- .../drmalgorithms/RandomSampleOnTable.java | 71 ++--- .../drmalgorithms/SampleOnTable.java | 73 +++-- .../drmalgorithms/SmartSampleOnTable.java | 76 +++-- .../algorithms/drmalgorithms/SubmitQuery.java | 207 +++++++------- target/apidocs/allclasses-frame.html | 6 +- target/apidocs/allclasses-noframe.html | 6 +- target/apidocs/constant-values.html | 10 +- target/apidocs/deprecated-list.html | 10 +- target/apidocs/help-doc.html | 10 +- target/apidocs/index-all.html | 10 +- target/apidocs/index.html | 4 +- .../drmalgorithms/GetTableDetails.html | 24 +- .../algorithms/drmalgorithms/ListDBInfo.html | 24 +- .../algorithms/drmalgorithms/ListNames.html | 24 +- .../algorithms/drmalgorithms/ListSchemas.html | 24 +- .../algorithms/drmalgorithms/ListTables.html | 24 +- .../drmalgorithms/RandomSampleOnTable.html | 24 +- .../drmalgorithms/SampleOnTable.html | 24 +- .../drmalgorithms/SmartCorrectionEnum.html | 10 +- .../drmalgorithms/SmartSampleOnTable.html | 24 +- .../algorithms/drmalgorithms/SubmitQuery.html | 24 +- .../drmalgorithms/SubmitQueryEnum.html | 10 +- .../class-use/GetTableDetails.html | 10 +- .../drmalgorithms/class-use/ListDBInfo.html | 10 +- .../drmalgorithms/class-use/ListNames.html | 10 +- .../drmalgorithms/class-use/ListSchemas.html | 10 +- .../drmalgorithms/class-use/ListTables.html | 10 +- .../class-use/RandomSampleOnTable.html | 10 +- .../class-use/SampleOnTable.html | 10 +- .../class-use/SmartCorrectionEnum.html | 10 +- .../class-use/SmartSampleOnTable.html | 10 +- .../drmalgorithms/class-use/SubmitQuery.html | 10 +- .../class-use/SubmitQueryEnum.html | 10 +- .../drmalgorithms/package-frame.html | 6 +- .../drmalgorithms/package-summary.html | 10 +- .../drmalgorithms/package-tree.html | 14 +- .../algorithms/drmalgorithms/package-use.html | 10 +- .../AbsoluteSpeciesBarChartsAlgorithm.html | 10 +- .../algorithms/examples/SimpleAlg.html | 10 +- .../algorithms/examples/TestSimpleAlg.html | 10 +- .../algorithms/examples/TestTransducers.html | 10 +- .../AbsoluteSpeciesBarChartsAlgorithm.html | 10 +- .../examples/class-use/SimpleAlg.html | 10 +- .../examples/class-use/TestSimpleAlg.html | 10 +- .../examples/class-use/TestTransducers.html | 10 +- .../algorithms/examples/package-frame.html | 6 +- .../algorithms/examples/package-summary.html | 10 +- .../algorithms/examples/package-tree.html | 10 +- .../algorithms/examples/package-use.html | 10 +- .../algorithms/test/TestListDBInfo.html | 10 +- .../algorithms/test/TestListNames.html | 10 +- .../algorithms/test/TestListSchemas.html | 10 +- .../algorithms/test/TestListTables.html | 10 +- .../algorithms/test/TestSubmitQuery.html | 10 +- .../algorithms/test/TestTableDetails.html | 10 +- .../test/class-use/TestListDBInfo.html | 10 +- .../test/class-use/TestListNames.html | 10 +- .../test/class-use/TestListSchemas.html | 10 +- .../test/class-use/TestListTables.html | 10 +- .../test/class-use/TestSubmitQuery.html | 10 +- .../test/class-use/TestTableDetails.html | 10 +- .../algorithms/test/package-frame.html | 6 +- .../algorithms/test/package-summary.html | 10 +- .../algorithms/test/package-tree.html | 10 +- .../algorithms/test/package-use.html | 10 +- .../regressiontest/RegressionListDBInfo.html | 10 +- .../regressiontest/RegressionListNames.html | 10 +- .../regressiontest/RegressionListSchemas.html | 10 +- .../regressiontest/RegressionListTables.html | 10 +- .../RegressionRandomSampleOnTable.html | 10 +- .../RegressionSampleOnTable.html | 10 +- .../RegressionSmartSampleOnTable.html | 10 +- .../regressiontest/RegressionSubmitQuery.html | 10 +- .../RegressionTableDetails.html | 10 +- .../class-use/RegressionListDBInfo.html | 10 +- .../class-use/RegressionListNames.html | 10 +- .../class-use/RegressionListSchemas.html | 10 +- .../class-use/RegressionListTables.html | 10 +- .../RegressionRandomSampleOnTable.html | 10 +- .../class-use/RegressionSampleOnTable.html | 10 +- .../RegressionSmartSampleOnTable.html | 10 +- .../class-use/RegressionSubmitQuery.html | 10 +- .../class-use/RegressionTableDetails.html | 10 +- .../test/regressiontest/package-frame.html | 6 +- .../test/regressiontest/package-summary.html | 10 +- .../test/regressiontest/package-tree.html | 10 +- .../test/regressiontest/package-use.html | 10 +- target/apidocs/overview-frame.html | 6 +- target/apidocs/overview-summary.html | 12 +- target/apidocs/overview-tree.html | 16 +- ...e-rm-algorithms-1.4.0-SNAPSHOT-javadoc.jar | Bin 183979 -> 0 bytes ...ithms-1.4.0-SNAPSHOT-servicearchive.tar.gz | Bin 84703 -> 0 bytes ...e-rm-algorithms-1.4.0-SNAPSHOT-sources.jar | Bin 55111 -> 0 bytes .../database-rm-algorithms-1.4.0-SNAPSHOT.jar | Bin 83454 -> 0 bytes ...e-rm-algorithms-1.5.0-SNAPSHOT-javadoc.jar | Bin 0 -> 184380 bytes ...ithms-1.5.0-SNAPSHOT-servicearchive.tar.gz | Bin 0 -> 83179 bytes ...e-rm-algorithms-1.5.0-SNAPSHOT-sources.jar | Bin 0 -> 54117 bytes .../database-rm-algorithms-1.5.0-SNAPSHOT.jar | Bin 0 -> 81979 bytes target/maven-archiver/pom.properties | 4 +- 106 files changed, 1009 insertions(+), 1003 deletions(-) delete mode 100644 target/database-rm-algorithms-1.4.0-SNAPSHOT-javadoc.jar delete mode 100644 target/database-rm-algorithms-1.4.0-SNAPSHOT-servicearchive.tar.gz delete mode 100644 target/database-rm-algorithms-1.4.0-SNAPSHOT-sources.jar delete mode 100644 target/database-rm-algorithms-1.4.0-SNAPSHOT.jar create mode 100644 target/database-rm-algorithms-1.5.0-SNAPSHOT-javadoc.jar create mode 100644 target/database-rm-algorithms-1.5.0-SNAPSHOT-servicearchive.tar.gz create mode 100644 target/database-rm-algorithms-1.5.0-SNAPSHOT-sources.jar create mode 100644 target/database-rm-algorithms-1.5.0-SNAPSHOT.jar diff --git a/distro/changelog.xml b/distro/changelog.xml index 8591ed3..08f2466 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,9 @@ + + Removed ScopeProvider calls + diff --git a/pom.xml b/pom.xml index 0b5917d..f5e6f7f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.dataaccess.algorithms database-rm-algorithms - 1.4.0-SNAPSHOT + 1.5.0-SNAPSHOT DatabasesResourcesManagerAlgorithms Databases Resources Manager Algorithms diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java index 9e88bb5..150266d 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java @@ -7,7 +7,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -15,13 +14,13 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; /** Class that allows to retrieve some information about the chosen table */ -public class GetTableDetails extends StandardLocalExternalAlgorithm { +public class GetTableDetails extends StandardLocalInfraAlgorithm { private static final String ROWS_NUMBER = "Rows Number"; private static final String NAME_OF_COLUMNS = "Name Of Columns"; @@ -38,7 +37,7 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { private String schemaName = null; private String tableName = null; - //private SessionFactory sf; + // private SessionFactory sf; @Override public void init() throws Exception { @@ -46,26 +45,11 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { mgt = new DatabaseManagement(config.getConfigPath()); AnalysisLogger.getLogger().debug("In GetTableDetails->Initialization"); - + String scope = config.getGcubeScope(); - - AnalysisLogger.getLogger().debug("In GetTableDetails->scope set by config: " + scope); - -// AnalysisLogger.getLogger().debug("In TableDetails->scope set by config: " + config.getGcubeScope()); - - if (scope == null || scope.length() == 0) { - - - scope = ScopeProvider.instance.get(); - - AnalysisLogger.getLogger().debug("In GetTableDetails->scope set by ScopeProvider: " + scope); - - - } else { - ScopeProvider.instance.set(scope); - - } + AnalysisLogger.getLogger().debug( + "In GetTableDetails->scope set by config: " + scope); } @@ -154,7 +138,7 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { @Override protected void setInputParameters() { -// AnalysisLogger.getLogger().debug("In GetTableDetails->setting inputs"); + // AnalysisLogger.getLogger().debug("In GetTableDetails->setting inputs"); // parameters specified by the user addStringInput("ResourceName", "The name of the resource", ""); @@ -173,13 +157,15 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { @Override public StatisticalType getOutput() { - AnalysisLogger.getLogger().debug("In GetTableDetails->retrieving outputs"); + AnalysisLogger.getLogger().debug( + "In GetTableDetails->retrieving outputs"); // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap" + UUID.randomUUID(), + "Results Map"); - return output; + return output; } @@ -196,9 +182,8 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); - mgt.createConnection(DatabaseUserName, - DatabasePassword, DatabaseDriver, DatabaseDialect, DatabaseURL, - DatabaseName); + mgt.createConnection(DatabaseUserName, DatabasePassword, + DatabaseDriver, DatabaseDialect, DatabaseURL, DatabaseName); AnalysisLogger.getLogger().debug( "In GetTableDetails->database " + DatabaseName + ": connected"); @@ -209,8 +194,8 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { IllegalStateException, DiscoveryException, InvalidResultException { resourceName = getInputParameter("ResourceName"); - - if(resourceName != null){ + + if (resourceName != null) { resourceName = getInputParameter("ResourceName").trim(); } @@ -218,10 +203,9 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { throw new Exception("Warning: insert the resource name"); } - databaseName = getInputParameter("DatabaseName"); - - if(databaseName != null){ + + if (databaseName != null) { databaseName = getInputParameter("DatabaseName").trim(); } if ((databaseName == null) || (databaseName.equals(""))) { @@ -250,7 +234,8 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { check: for (int i = 0; i < resources.size(); i++) { - if (resources.get(i).getResourceName().toLowerCase().equals(resourceName.toLowerCase())) { + if (resources.get(i).getResourceName().toLowerCase() + .equals(resourceName.toLowerCase())) { normalizeDBInfo(resources.get(i)); @@ -294,7 +279,8 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { // } if (resources.get(i).getAccessPoints().get(j) - .getDatabaseName().toLowerCase().equals(databaseName.toLowerCase())) { + .getDatabaseName().toLowerCase() + .equals(databaseName.toLowerCase())) { info.add(resources.get(i).getAccessPoints().get(j) .getUsername()); @@ -372,20 +358,19 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { private LinkedHashMap getDetails() throws Exception { - tableName = getInputParameter("TableName"); - - if(tableName != null){ - tableName = getInputParameter("TableName").trim(); + + if (tableName != null) { + tableName = getInputParameter("TableName").trim(); } if ((tableName == null) || (tableName.equals(""))) { throw new Exception("Warning: insert the table name"); } if (driverInfo.toLowerCase().contains("postgres")) { - + schemaName = getInputParameter("SchemaName"); - if(schemaName != null){ + if (schemaName != null) { schemaName = getInputParameter("SchemaName").trim(); } if ((schemaName == null) || (schemaName.equals(""))) { @@ -394,7 +379,8 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { } AnalysisLogger.getLogger().debug( - "In GetTableDetails->getting details on the table: " + tableName); + "In GetTableDetails->getting details on the table: " + + tableName); // recover metadata of the table @@ -413,7 +399,6 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { createTable = mgt.getCreateTable(tableName, databaseName); } - PrimitiveType valCreateTable = new PrimitiveType( String.class.getName(), createTable, PrimitiveTypes.STRING, @@ -440,10 +425,9 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { } } - + AnalysisLogger.getLogger().debug( - "In GetTableDetails->column names: " - + ColumnName); + "In GetTableDetails->column names: " + ColumnName); PrimitiveType valListColumnNamesTable = new PrimitiveType( String.class.getName(), ColumnName, PrimitiveTypes.STRING, @@ -457,34 +441,34 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { // recover the number of rows // BigInteger rows = mgt.getNumberOfRows(tableName); - + long rows = 0; - + if ((driverInfo.toLowerCase().contains("postgres"))) { AnalysisLogger.getLogger().debug( - "In GetTableDetails->schemaName:" + schemaName);; + "In GetTableDetails->schemaName:" + schemaName); + ; rows = mgt.getNumberOfRows(tableName, schemaName); } if ((driverInfo.toLowerCase().contains("mysql"))) { - + AnalysisLogger.getLogger().debug( - "In GetTableDetails->*databasename:" + databaseName);; + "In GetTableDetails->*databasename:" + databaseName); + ; rows = mgt.getNumberOfRows(tableName, databaseName); } - PrimitiveType valRows = new PrimitiveType(String.class.getName(), Long.toString(rows), PrimitiveTypes.STRING, ROWS_NUMBER, ROWS_NUMBER); map.put(ROWS_NUMBER, valRows); - AnalysisLogger.getLogger().debug( "In GetTableDetails->getting the number of rows: " + Long.toString(rows)); @@ -494,40 +478,40 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { } private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In GetTableDetails->: Error in normalization process" + e.getMessage()); - + throw e; } -// int ap = resource.getAccessPoints().size(); -// -// for (int i = 0; i < ap; i++) { -// -// try { -// resource.normalize(i); -// } catch (IOException e) { -// -// // e.printStackTrace(); -// AnalysisLogger.getLogger().debug( -// "In GetTableDetails->: Error in normalization process" -// + e.getMessage()); -// -// throw e; -// -// } -// -// } + // int ap = resource.getAccessPoints().size(); + // + // for (int i = 0; i < ap; i++) { + // + // try { + // resource.normalize(i); + // } catch (IOException e) { + // + // // e.printStackTrace(); + // AnalysisLogger.getLogger().debug( + // "In GetTableDetails->: Error in normalization process" + // + e.getMessage()); + // + // throw e; + // + // } + // + // } } } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java index 77ca290..4d4f2b5 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java @@ -6,7 +6,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -14,19 +13,18 @@ import org.gcube.dataaccess.databases.resources.DBResource.AccessPoint; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; /** Class that allows to retrieve information about the chosen resource */ -public class ListDBInfo extends StandardLocalExternalAlgorithm { +public class ListDBInfo extends StandardLocalInfraAlgorithm { private static final String PLATFORM_VERSION = "Platform Version "; private static final String DIALECT_NAME = "Dialect Name "; private static final String DATABASE_NAME = "Database Name "; private static final String DRIVER_NAME = "Driver Name "; private static final String URL_NAME = "URL "; - - + private LinkedHashMap map = new LinkedHashMap(); // database's parameters specified by the user @@ -34,7 +32,7 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { // list that contains information about the resource private List ap = new ArrayList(); - + // variable that keeps track of database platform version private String platformVersion = ""; @@ -42,24 +40,12 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { public void init() throws Exception { AnalysisLogger.getLogger().debug("In ListDBInfo->Initialization"); - + String scope = config.getGcubeScope(); - - AnalysisLogger.getLogger().debug("In ListDBInfo->scope set by config object: " + scope); - - - - if (scope == null || scope.length() == 0) { - - scope = ScopeProvider.instance.get(); - AnalysisLogger.getLogger().debug("In ListDBInfo->scope set by ScopeProvider: " + scope); - - - }else{ - - ScopeProvider.instance.set(scope); - - } + + AnalysisLogger.getLogger().debug( + "In ListDBInfo->scope set by config object: " + scope); + } @Override @@ -69,127 +55,124 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { } @Override - protected void process() throws Exception, IOException, IllegalStateException, DiscoveryException, InvalidResultException { + protected void process() throws Exception, IOException, + IllegalStateException, DiscoveryException, InvalidResultException { AnalysisLogger.getLogger().debug("In ListDBInfo->Processing"); - - AnalysisLogger.getLogger().debug("Scope: " + ScopeProvider.instance.get()); - - - try{ - // retrieve information - List apInfo = retrieveInfo(); - - AnalysisLogger.getLogger().debug("access point dimension: " + apInfo.size()); - - for (int i = 0; i < apInfo.size(); i++) { - String name = DATABASE_NAME+(i+1); - PrimitiveType DBName = new PrimitiveType(String.class.getName(), - apInfo.get(i).getDatabaseName(), PrimitiveTypes.STRING, - name - , name); - - - - map.put(name, DBName); + + try { + // retrieve information + List apInfo = retrieveInfo(); AnalysisLogger.getLogger().debug( - "In ListDBInfo->Database Name: " - + apInfo.get(i).getDatabaseName()); - String urlId=URL_NAME+(i+1); - PrimitiveType url = new PrimitiveType(String.class.getName(), - apInfo.get(i).address(), PrimitiveTypes.STRING, urlId, - urlId); + "access point dimension: " + apInfo.size()); - map.put(urlId, url); + for (int i = 0; i < apInfo.size(); i++) { + String name = DATABASE_NAME + (i + 1); + PrimitiveType DBName = new PrimitiveType( + String.class.getName(), + apInfo.get(i).getDatabaseName(), PrimitiveTypes.STRING, + name, name); - AnalysisLogger.getLogger().debug( - "In ListDBInfo->URL: " + apInfo.get(i).address()); + map.put(name, DBName); - String driverId=DRIVER_NAME+(i+1); - PrimitiveType driver = new PrimitiveType(String.class.getName(), - apInfo.get(i).getDriver(), PrimitiveTypes.STRING, - driverId, driverId); + AnalysisLogger.getLogger().debug( + "In ListDBInfo->Database Name: " + + apInfo.get(i).getDatabaseName()); + String urlId = URL_NAME + (i + 1); + PrimitiveType url = new PrimitiveType(String.class.getName(), + apInfo.get(i).address(), PrimitiveTypes.STRING, urlId, + urlId); - map.put(driverId, driver); + map.put(urlId, url); - AnalysisLogger.getLogger().debug( - "In ListDBInfo->Driver Name: " - + apInfo.get(i).getDriver()); - - String dialectId=DIALECT_NAME+(i+1); - PrimitiveType dialect = new PrimitiveType(String.class.getName(), - apInfo.get(i).getDialect(), PrimitiveTypes.STRING, - dialectId, dialectId); + AnalysisLogger.getLogger().debug( + "In ListDBInfo->URL: " + apInfo.get(i).address()); - map.put(dialectId, dialect); + String driverId = DRIVER_NAME + (i + 1); + PrimitiveType driver = new PrimitiveType( + String.class.getName(), apInfo.get(i).getDriver(), + PrimitiveTypes.STRING, driverId, driverId); - AnalysisLogger.getLogger().debug( - "In ListDBInfo->Dialect Name: " - + apInfo.get(i).getDialect()); - - String platformId=PLATFORM_VERSION+(i+1); - PrimitiveType platformVersionValue = new PrimitiveType(String.class.getName(), - platformVersion, PrimitiveTypes.STRING, - platformId, platformId); + map.put(driverId, driver); - map.put(platformId, platformVersionValue); + AnalysisLogger.getLogger().debug( + "In ListDBInfo->Driver Name: " + + apInfo.get(i).getDriver()); - AnalysisLogger.getLogger().debug( - "In ListDBInfo->Platform Version: " - + platformVersion); - - + String dialectId = DIALECT_NAME + (i + 1); + PrimitiveType dialect = new PrimitiveType( + String.class.getName(), apInfo.get(i).getDialect(), + PrimitiveTypes.STRING, dialectId, dialectId); + + map.put(dialectId, dialect); + + AnalysisLogger.getLogger().debug( + "In ListDBInfo->Dialect Name: " + + apInfo.get(i).getDialect()); + + String platformId = PLATFORM_VERSION + (i + 1); + PrimitiveType platformVersionValue = new PrimitiveType( + String.class.getName(), platformVersion, + PrimitiveTypes.STRING, platformId, platformId); + + map.put(platformId, platformVersionValue); + + AnalysisLogger.getLogger().debug( + "In ListDBInfo->Platform Version: " + platformVersion); + + } } - - } - + catch (IllegalStateException e) { -// e.printStackTrace(); - - AnalysisLogger.getLogger().debug("In ListDBInfo-> ERROR " + e.getMessage()); + // e.printStackTrace(); + + AnalysisLogger.getLogger().debug( + "In ListDBInfo-> ERROR " + e.getMessage()); throw e; } catch (DiscoveryException e1) { -// e1.printStackTrace(); - - AnalysisLogger.getLogger().debug("In ListDBInfo-> ERROR " + e1.getMessage()); - + // e1.printStackTrace(); + + AnalysisLogger.getLogger().debug( + "In ListDBInfo-> ERROR " + e1.getMessage()); + throw e1; } catch (InvalidResultException e2) { -// e2.printStackTrace(); - - AnalysisLogger.getLogger().debug("In ListDBInfo-> ERROR " + e2.getMessage()); - - + // e2.printStackTrace(); + + AnalysisLogger.getLogger().debug( + "In ListDBInfo-> ERROR " + e2.getMessage()); + throw e2; } -// catch(IOException e3){ -//// e3.printStackTrace(); -// -// AnalysisLogger.getLogger().debug("In ListDBInfo-> Exception " + e3.getMessage()); -// -// throw e3; -// } - - catch(Exception e4){ - -// e4.printStackTrace(); - AnalysisLogger.getLogger().debug("In ListDBInfo-> Exception " + e4.getMessage()); - + // catch(IOException e3){ + // // e3.printStackTrace(); + // + // AnalysisLogger.getLogger().debug("In ListDBInfo-> Exception " + + // e3.getMessage()); + // + // throw e3; + // } + + catch (Exception e4) { + + // e4.printStackTrace(); + AnalysisLogger.getLogger().debug( + "In ListDBInfo-> Exception " + e4.getMessage()); + throw e4; - + } - - + } @Override protected void setInputParameters() { -// AnalysisLogger.getLogger().debug("In ListDBInfo->setting inputs"); + // AnalysisLogger.getLogger().debug("In ListDBInfo->setting inputs"); // resource name specified by the user addStringInput("ResourceName", "The name of the resource", ""); @@ -209,13 +192,15 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap" + UUID.randomUUID(), + "Results Map"); return output; } - private List retrieveInfo() throws Exception, IllegalStateException, DiscoveryException, InvalidResultException { + private List retrieveInfo() throws Exception, + IllegalStateException, DiscoveryException, InvalidResultException { resourceName = getInputParameter("ResourceName"); @@ -238,8 +223,9 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { check: for (int i = 0; i < resources.size(); i++) { - if (resources.get(i).getResourceName().toLowerCase().equals(resourceName.toLowerCase())) { - + if (resources.get(i).getResourceName().toLowerCase() + .equals(resourceName.toLowerCase())) { + platformVersion = resources.get(i).getPlatformVersion(); // ap = resources.get(i).getAccessPoints(); @@ -258,41 +244,41 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { } private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In ListDBInfo->: Error in normalization process" + e.getMessage()); - + throw e; } -// int ap = resource.getAccessPoints().size(); -// -// for (int i = 0; i < ap; i++) { -// -// try { -// resource.normalize(i); -// } -//// catch (IOException e) { -// catch (IOException e) { -// // TODO Auto-generated catch block -//// e.printStackTrace(); -// AnalysisLogger.getLogger().debug( -// "In ListDBInfo->: Error in normalization process" -// + e.getMessage()); -// throw e; -// -// } -// -// } + // int ap = resource.getAccessPoints().size(); + // + // for (int i = 0; i < ap; i++) { + // + // try { + // resource.normalize(i); + // } + // // catch (IOException e) { + // catch (IOException e) { + // // TODO Auto-generated catch block + // // e.printStackTrace(); + // AnalysisLogger.getLogger().debug( + // "In ListDBInfo->: Error in normalization process" + // + e.getMessage()); + // throw e; + // + // } + // + // } } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java index ccdab05..ba57ea9 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java @@ -5,23 +5,22 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; /** Class that allows to retrieve a list of database resources */ -public class ListNames extends StandardLocalExternalAlgorithm { +public class ListNames extends StandardLocalInfraAlgorithm { private static final String RESOURCE_NAME = "Resource Name "; private LinkedHashMap map = new LinkedHashMap(); - + @Override public void init() throws Exception { @@ -32,18 +31,6 @@ public class ListNames extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug( "In ListNames->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - - scope = ScopeProvider.instance.get(); - - AnalysisLogger.getLogger().debug( - "In ListNames->scope set by ScopeProvider: " + scope); - - } else { - - ScopeProvider.instance.set(scope); - - } } @Override @@ -58,16 +45,6 @@ public class ListNames extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug("In ListNames->Processing"); - String scope = ScopeProvider.instance.get(); - - if (scope != null) { - - AnalysisLogger.getLogger().debug("getting scope: " + scope); - - AnalysisLogger.getLogger().debug( - "getting scope through config: " + config.getGcubeScope()); - - } try { // retrieve resources @@ -79,10 +56,10 @@ public class ListNames extends StandardLocalExternalAlgorithm { ArrayList listnames = new ArrayList(); for (int i = 0; i < resources.size(); i++) { - String name = RESOURCE_NAME+(i+1); + String name = RESOURCE_NAME + (i + 1); PrimitiveType val = new PrimitiveType(String.class.getName(), null, PrimitiveTypes.STRING, name, name); - + AnalysisLogger.getLogger().debug( "In ListNames->Resource's name: " + resources.get(i).getResourceName()); @@ -128,7 +105,7 @@ public class ListNames extends StandardLocalExternalAlgorithm { @Override protected void setInputParameters() { -// AnalysisLogger.getLogger().debug("In ListNames->setting inputs"); + // AnalysisLogger.getLogger().debug("In ListNames->setting inputs"); addStringInput("MaxNumber", "Max Number of Resources (-1 for all)", "-1"); @@ -147,13 +124,13 @@ public class ListNames extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap" + UUID.randomUUID(), + "Results Map"); return output; } - - + private List retrieveResources() throws IllegalStateException, DiscoveryException, InvalidResultException { diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java index 074c302..19b5021 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java @@ -7,7 +7,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -15,7 +14,7 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; @@ -24,7 +23,7 @@ import org.hibernate.HibernateException; * class that allows to retrieve schema's names of a chosen database. In this * case the database's type is "postgresql" */ -public class ListSchemas extends StandardLocalExternalAlgorithm { +public class ListSchemas extends StandardLocalInfraAlgorithm { private static final String SCHEMA_NAME = "Schema Name "; private LinkedHashMap map = new LinkedHashMap(); @@ -34,7 +33,7 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { private String resourceName = null; private String databaseName = null; - //private SessionFactory sf; + // private SessionFactory sf; @Override public void init() throws Exception { @@ -46,18 +45,6 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug( "In ListSchemas->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - - scope = ScopeProvider.instance.get(); - - AnalysisLogger.getLogger().debug( - "In ListSchemas->scope set by ScopeProvider: " + scope); - - } else { - - ScopeProvider.instance.set(scope); - - } } @Override @@ -97,10 +84,9 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { } for (int i = 0; i < listSchemas.size(); i++) { - String schemaId = SCHEMA_NAME+(i+1); + String schemaId = SCHEMA_NAME + (i + 1); PrimitiveType val = new PrimitiveType(String.class.getName(), - null, PrimitiveTypes.STRING, schemaId, - schemaId); + null, PrimitiveTypes.STRING, schemaId, schemaId); val.setContent(listSchemas.get(i)); @@ -217,11 +203,11 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { } -// finally { -// if (sf.isClosed() == false) { -// mgt.closeConnection(); -// } -// } + // finally { + // if (sf.isClosed() == false) { + // mgt.closeConnection(); + // } + // } return listSchemas; @@ -422,9 +408,8 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); - mgt.createConnection(DatabaseUserName, - DatabasePassword, DatabaseDriver, DatabaseDialect, DatabaseURL, - DatabaseName); + mgt.createConnection(DatabaseUserName, DatabasePassword, + DatabaseDriver, DatabaseDialect, DatabaseURL, DatabaseName); // if (sf.isClosed()){ @@ -434,40 +419,40 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { } private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In ListSchemas->: Error in normalization process" + e.getMessage()); - + throw e; } -// int ap = resource.getAccessPoints().size(); -// -// for (int i = 0; i < ap; i++) { -// -//// try { -// resource.normalize(i); -//// } catch (IOException e) { -// -// // e.printStackTrace(); -//// AnalysisLogger.getLogger().debug( -//// "In ListTables->: Error in normalization process" -//// + e.getMessage()); -// -//// throw e; -// -//// } -// -// } + // int ap = resource.getAccessPoints().size(); + // + // for (int i = 0; i < ap; i++) { + // + // // try { + // resource.normalize(i); + // // } catch (IOException e) { + // + // // e.printStackTrace(); + // // AnalysisLogger.getLogger().debug( + // // "In ListTables->: Error in normalization process" + // // + e.getMessage()); + // + // // throw e; + // + // // } + // + // } } } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java index a935372..12afc43 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java @@ -7,7 +7,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -15,13 +14,13 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; /** Class that allows to retrieve the tables's names of a chosen database */ -public class ListTables extends StandardLocalExternalAlgorithm { +public class ListTables extends StandardLocalInfraAlgorithm { private static final String TABLE_NAME = "Table Name "; private LinkedHashMap map = new LinkedHashMap(); @@ -34,7 +33,7 @@ public class ListTables extends StandardLocalExternalAlgorithm { private String databaseName = null; private String schemaName = null; - //private SessionFactory sf; + // private SessionFactory sf; @Override public void init() throws Exception { @@ -46,19 +45,6 @@ public class ListTables extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug( "In ListTables->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - - scope = ScopeProvider.instance.get(); - - AnalysisLogger.getLogger().debug( - "In ListTables->scope set by ScopeProvider: " + scope); - - } else { - - ScopeProvider.instance.set(scope); - - } - } @Override @@ -92,7 +78,7 @@ public class ListTables extends StandardLocalExternalAlgorithm { if (driverInfo.toLowerCase().contains("postgres")) { schemaName = getInputParameter("SchemaName"); - if(schemaName != null){ + if (schemaName != null) { schemaName = getInputParameter("SchemaName").trim(); } if ((schemaName == null) || (schemaName.equals(""))) { @@ -137,12 +123,11 @@ public class ListTables extends StandardLocalExternalAlgorithm { } else { for (int i = 0; i < listTables.size(); i++) { - String tableId = TABLE_NAME+(i+1); - + String tableId = TABLE_NAME + (i + 1); + PrimitiveType val = new PrimitiveType( String.class.getName(), null, - PrimitiveTypes.STRING, tableId, - tableId); + PrimitiveTypes.STRING, tableId, tableId); val.setContent(listTables.get(i)); @@ -414,48 +399,47 @@ public class ListTables extends StandardLocalExternalAlgorithm { String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); - mgt.createConnection(DatabaseUserName, - DatabasePassword, DatabaseDriver, DatabaseDialect, DatabaseURL, - DatabaseName); + mgt.createConnection(DatabaseUserName, DatabasePassword, + DatabaseDriver, DatabaseDialect, DatabaseURL, DatabaseName); AnalysisLogger.getLogger().debug( "In ListTables->database " + DatabaseName + ": connected"); } private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In ListTables->: Error in normalization process" + e.getMessage()); - + throw e; } -// int ap = resource.getAccessPoints().size(); -// -// for (int i = 0; i < ap; i++) { -// -// try { -// resource.normalize(i); -// } catch (IOException e) { -// // e.printStackTrace(); -// -// AnalysisLogger.getLogger().debug( -// "In ListTables->: Error in normalization process" -// + e.getMessage()); -// -// throw e; -// } -// -// } + // int ap = resource.getAccessPoints().size(); + // + // for (int i = 0; i < ap; i++) { + // + // try { + // resource.normalize(i); + // } catch (IOException e) { + // // e.printStackTrace(); + // + // AnalysisLogger.getLogger().debug( + // "In ListTables->: Error in normalization process" + // + e.getMessage()); + // + // throw e; + // } + // + // } } } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java index 27cc931..a79a1a7 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java @@ -9,7 +9,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -17,7 +16,7 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; @@ -27,7 +26,7 @@ import org.hibernate.HibernateException; * database. It retrieves 100 rows of a table randomly. */ -public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { +public class RandomSampleOnTable extends StandardLocalInfraAlgorithm { private LinkedHashMap map = new LinkedHashMap(); @@ -39,7 +38,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { private String schemaName = null; private String tableName = null; - //private SessionFactory sf; + // private SessionFactory sf; // variable that keeps track of the driver information private String driverInfo; @@ -55,14 +54,6 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { "In RandomSmartSampleOnTable->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - scope = ScopeProvider.instance.get(); - AnalysisLogger.getLogger().debug( - "In RandomSmartSampleOnTable->scope set by ScopeProvider: " - + scope); - } else { - ScopeProvider.instance.set(scope); - } } @Override @@ -81,7 +72,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // check on table name field tableName = getInputParameter("TableName"); - if(tableName != null){ + if (tableName != null) { tableName = getInputParameter("TableName").trim(); } if ((tableName == null) || (tableName.equals(""))) { @@ -91,7 +82,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // check on schema name field if (driverInfo.toLowerCase().contains("postgres")) { schemaName = getInputParameter("SchemaName"); - if(schemaName != null){ + if (schemaName != null) { schemaName = getInputParameter("SchemaName").trim(); } if ((schemaName == null) || (schemaName.equals(""))) { @@ -104,7 +95,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // smart sample operation on table map = randomSampleOnTable(); - + } catch (HibernateException h) { AnalysisLogger.getLogger().debug( "In RandomSmartSampleOnTable-> ERROR " + h.getMessage()); @@ -278,34 +269,34 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // to normalize the information related to a database private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In RandomSampleOnTable->: Error in normalization process" + e.getMessage()); - + throw e; } - -// int ap = resource.getAccessPoints().size(); -// for (int i = 0; i < ap; i++) { -// try { -// resource.normalize(i); -// } catch (IOException e) { -// // e.printStackTrace(); -// AnalysisLogger.getLogger().debug( -// "In RandomSampleOnTable->: Error in normalization process" -// + e.getMessage()); -// throw e; -// } -// } + + // int ap = resource.getAccessPoints().size(); + // for (int i = 0; i < ap; i++) { + // try { + // resource.normalize(i); + // } catch (IOException e) { + // // e.printStackTrace(); + // AnalysisLogger.getLogger().debug( + // "In RandomSampleOnTable->: Error in normalization process" + // + e.getMessage()); + // throw e; + // } + // } } // create the database's connection @@ -321,9 +312,8 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); - mgt.createConnection(DatabaseUserName, - DatabasePassword, DatabaseDriver, DatabaseDialect, DatabaseURL, - DatabaseName); + mgt.createConnection(DatabaseUserName, DatabasePassword, + DatabaseDriver, DatabaseDialect, DatabaseURL, DatabaseName); AnalysisLogger.getLogger().debug( "In RandomSampleOnTable->database " + DatabaseName @@ -386,7 +376,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // // check the encoded value // AnalysisLogger.getLogger().debug( // "In RandomSampleOnTable->string encoded: " + encoded); - String row="Row "+Integer.toString(i+1); + String row = "Row " + Integer.toString(i + 1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); @@ -398,10 +388,9 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { } // to add the file - PrimitiveType fileResult = new PrimitiveType(File.class.getName(), - mgt.getFile(), PrimitiveTypes.FILE, "File", - "File"); - mapResults.put("File", fileResult); + PrimitiveType fileResult = new PrimitiveType(File.class.getName(), + mgt.getFile(), PrimitiveTypes.FILE, "File", "File"); + mapResults.put("File", fileResult); return mapResults; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java index 7189058..8a23afd 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java @@ -9,7 +9,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -17,7 +16,7 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; @@ -26,7 +25,7 @@ import org.hibernate.HibernateException; * Class that allows to perform a sample operation on a table of a chosen * database. It retrieves the first 100 rows of a table. */ -public class SampleOnTable extends StandardLocalExternalAlgorithm { +public class SampleOnTable extends StandardLocalInfraAlgorithm { private LinkedHashMap map = new LinkedHashMap(); @@ -38,7 +37,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { private String schemaName = null; private String tableName = null; - //private SessionFactory sf; + // private SessionFactory sf; // variable that keeps track of the driver information private String driverInfo; @@ -52,13 +51,6 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug( "In SampleOnTable->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - scope = ScopeProvider.instance.get(); - AnalysisLogger.getLogger().debug( - "In SampleOnTable->scope set by ScopeProvider: " + scope); - } else { - ScopeProvider.instance.set(scope); - } } @Override @@ -76,7 +68,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // check on table name field tableName = getInputParameter("TableName"); - if(tableName != null){ + if (tableName != null) { tableName = getInputParameter("TableName").trim(); } if ((tableName == null) || (tableName.equals(""))) { @@ -86,7 +78,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // check on schema name field if (driverInfo.toLowerCase().contains("postgres")) { schemaName = getInputParameter("SchemaName"); - if(schemaName != null){ + if (schemaName != null) { schemaName = getInputParameter("SchemaName").trim(); } if ((schemaName == null) || (schemaName.equals(""))) { @@ -99,7 +91,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // sample operation on table map = sampleOnTable(); - + } catch (HibernateException h) { AnalysisLogger.getLogger().debug( "In SampleOnTable-> ERROR " + h.getMessage()); @@ -159,7 +151,8 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap" + UUID.randomUUID(), + "Results Map"); return output; } @@ -274,34 +267,34 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // to normalize the information related to a database private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In SampleOnTable->: Error in normalization process" + e.getMessage()); - + throw e; } - -// int ap = resource.getAccessPoints().size(); -// for (int i = 0; i < ap; i++) { -// try { -// resource.normalize(i); -// } catch (IOException e) { -// // e.printStackTrace(); -// AnalysisLogger.getLogger().debug( -// "In SampleOnTable->: Error in normalization process" -// + e.getMessage()); -// throw e; -// } -// } + + // int ap = resource.getAccessPoints().size(); + // for (int i = 0; i < ap; i++) { + // try { + // resource.normalize(i); + // } catch (IOException e) { + // // e.printStackTrace(); + // AnalysisLogger.getLogger().debug( + // "In SampleOnTable->: Error in normalization process" + // + e.getMessage()); + // throw e; + // } + // } } // create the database's connection @@ -317,9 +310,8 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); - mgt.createConnection(DatabaseUserName, - DatabasePassword, DatabaseDriver, DatabaseDialect, DatabaseURL, - DatabaseName); + mgt.createConnection(DatabaseUserName, DatabasePassword, + DatabaseDriver, DatabaseDialect, DatabaseURL, DatabaseName); AnalysisLogger.getLogger().debug( "In SampleOnTable->database " + DatabaseName + ": connected"); @@ -356,7 +348,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // to add the results to the variable map // to add the map - + HashMap mapResult = new HashMap(); mapResult = mgt.getMapSampleTableResult(); @@ -379,8 +371,8 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // // check encoded value // AnalysisLogger.getLogger().debug( // "In SampleOnTable->string encoded: " + encoded); - - String row="Row "+Integer.toString(i+1); + + String row = "Row " + Integer.toString(i + 1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); @@ -394,8 +386,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // to add the file PrimitiveType fileResult = new PrimitiveType(File.class.getName(), - mgt.getFile(), PrimitiveTypes.FILE, "File", - "File"); + mgt.getFile(), PrimitiveTypes.FILE, "File", "File"); mapResults.put("File", fileResult); return mapResults; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java index 4fff4e7..93436cd 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java @@ -9,7 +9,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.resources.DBResource; @@ -17,7 +16,7 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; @@ -28,7 +27,7 @@ import org.hibernate.HibernateException; * number of columns not null. */ -public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { +public class SmartSampleOnTable extends StandardLocalInfraAlgorithm { private LinkedHashMap map = new LinkedHashMap(); @@ -40,7 +39,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { private String schemaName = null; private String tableName = null; - //private SessionFactory sf; + // private SessionFactory sf; // variable that keeps track of the driver information private String driverInfo; @@ -55,14 +54,6 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug( "In SmartSampleOnTable->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - scope = ScopeProvider.instance.get(); - AnalysisLogger.getLogger().debug( - "In SmartSampleOnTable->scope set by ScopeProvider: " - + scope); - } else { - ScopeProvider.instance.set(scope); - } } @Override @@ -75,13 +66,13 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug("In SmartSampleOnTable->Processing"); try { - + // retrieve information List Info = retrieveInfo(); // check on table name field tableName = getInputParameter("TableName"); - if(tableName != null){ + if (tableName != null) { tableName = getInputParameter("TableName").trim(); } if ((tableName == null) || (tableName.equals(""))) { @@ -91,7 +82,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // check on schema name field if (driverInfo.toLowerCase().contains("postgres")) { schemaName = getInputParameter("SchemaName"); - if(schemaName != null){ + if (schemaName != null) { schemaName = getInputParameter("SchemaName").trim(); } if ((schemaName == null) || (schemaName.equals(""))) { @@ -104,7 +95,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // smart sample operation on table map = smartSampleOnTable(); - + } catch (HibernateException h) { AnalysisLogger.getLogger().debug( "In SmartSampleOnTable-> ERROR " + h.getMessage()); @@ -162,7 +153,8 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap" + UUID.randomUUID(), + "Results Map"); return output; } @@ -204,7 +196,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // list that contains information useful for the connection List info = new ArrayList(); - + check: for (int i = 0; i < resources.size(); i++) { if (resources.get(i).getResourceName().toLowerCase() @@ -278,34 +270,34 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // to normalize the information related to a database private void normalizeDBInfo(DBResource resource) throws Exception { - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In SmartSampleOnTable->: Error in normalization process" + e.getMessage()); - + throw e; } - -// int ap = resource.getAccessPoints().size(); -// for (int i = 0; i < ap; i++) { -// try { -// resource.normalize(i); -// } catch (IOException e) { -// // e.printStackTrace(); -// AnalysisLogger.getLogger().debug( -// "In SmartSampleOnTable->: Error in normalization process" -// + e.getMessage()); -// throw e; -// } -// } + + // int ap = resource.getAccessPoints().size(); + // for (int i = 0; i < ap; i++) { + // try { + // resource.normalize(i); + // } catch (IOException e) { + // // e.printStackTrace(); + // AnalysisLogger.getLogger().debug( + // "In SmartSampleOnTable->: Error in normalization process" + // + e.getMessage()); + // throw e; + // } + // } } // create the database's connection @@ -321,14 +313,13 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); - mgt.createConnection(DatabaseUserName, - DatabasePassword, DatabaseDriver, DatabaseDialect, DatabaseURL, - DatabaseName); + mgt.createConnection(DatabaseUserName, DatabasePassword, + DatabaseDriver, DatabaseDialect, DatabaseURL, DatabaseName); AnalysisLogger.getLogger().debug( "In SmartSampleOnTable->database " + DatabaseName + ": connected"); - } + } // to perform the sample operation on the table private LinkedHashMap smartSampleOnTable() @@ -385,7 +376,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // // check encoded value // AnalysisLogger.getLogger().debug( // "In SmartSampleOnTable->string encoded: " + encoded); - String row="Row "+Integer.toString(i+1); + String row = "Row " + Integer.toString(i + 1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); @@ -399,8 +390,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // to add the file PrimitiveType fileResult = new PrimitiveType(File.class.getName(), - mgt.getFile(), PrimitiveTypes.FILE, "File", - "File"); + mgt.getFile(), PrimitiveTypes.FILE, "File", "File"); mapResults.put("File", fileResult); return mapResults; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java index 534069f..fcd93ed 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java @@ -13,7 +13,6 @@ import java.util.Timer; import java.util.TimerTask; import java.util.UUID; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataaccess.databases.access.DatabasesDiscoverer; import org.gcube.dataaccess.databases.lexer.MySQLLexicalAnalyzer; @@ -23,7 +22,7 @@ import org.gcube.dataaccess.databases.utils.DatabaseManagement; import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.datatypes.enumtypes.PrimitiveTypes; -import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm; +import org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; import org.hibernate.HibernateException; @@ -35,12 +34,13 @@ import com.adventnet.swissqlapi.sql.parser.ParseException; * Class that allows to submit a query. It retrieves results in a file and in a * map. */ -public class SubmitQuery extends StandardLocalExternalAlgorithm { - +public class SubmitQuery extends StandardLocalInfraAlgorithm { + private static final String FILE = "File"; private static final String TOTAL_ROWS = "Total Rows"; - - static long maximum_execution_time = 30*60*1000; //time to stop execution query + + static long maximum_execution_time = 30 * 60 * 1000; // time to stop + // execution query private LinkedHashMap map = new LinkedHashMap(); // object that allows to manage some operations on a database private DatabaseManagement mgt; @@ -51,8 +51,8 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // database's parameters specified by the user private String resourceName = null; private String databaseName = null; - //private String schemaName = null; - //private String tableName = null; + // private String schemaName = null; + // private String tableName = null; private String query = null; private String valueReadOnly = "Read-Only Query"; @@ -66,16 +66,16 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // variable used to filter the disallowed queries private boolean NotAllowedQuery = false; - //class for the timer to stop execution query + // class for the timer to stop execution query private class ExecutionStopper extends TimerTask { @Override public void run() { - AnalysisLogger.getLogger().debug("ExecutionStopper: Stopping execution"); + AnalysisLogger.getLogger().debug( + "ExecutionStopper: Stopping execution"); shutdown(); } - } - - + } + @Override public void init() throws Exception { @@ -86,14 +86,6 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug( "In SubmitQuery->scope set by config object: " + scope); - if (scope == null || scope.length() == 0) { - scope = ScopeProvider.instance.get(); - AnalysisLogger.getLogger().debug( - "In SubmitQuery->scope set by ScopeProvider: " + scope); - } else { - ScopeProvider.instance.set(scope); - } - valueRO = config.getParam(valueReadOnly); valueSC = config.getParam(smartCorrection); } @@ -109,10 +101,10 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { HibernateException { AnalysisLogger.getLogger().debug("In SubmitQuery->Processing"); - + Timer stopper = new Timer(); - stopper.schedule(new ExecutionStopper(),maximum_execution_time); - + stopper.schedule(new ExecutionStopper(), maximum_execution_time); + try { // retrieve information List Info = retrieveInfo(); @@ -123,8 +115,8 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // submit a query map = submitQuery(); -// // close the connection -// dbconnection.close(); + // // close the connection + // dbconnection.close(); } catch (HibernateException h) { @@ -182,19 +174,23 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { throw e4; } finally { - if (dbconnection!=null) { + if (dbconnection != null) { dbconnection.close(); - AnalysisLogger.getLogger().debug("In SubmitQuery-> Connection closed"); - dbconnection=null; + AnalysisLogger.getLogger().debug( + "In SubmitQuery-> Connection closed"); + dbconnection = null; } - //remove the timer if the execution query has already terminated - if (stopper!=null){ - try{ - stopper.cancel(); - stopper.purge(); - AnalysisLogger.getLogger().debug("In SubmitQuery-> Execution stopper terminated"); - }catch(Exception e){ - AnalysisLogger.getLogger().debug("In SubmitQuery-> Could not stop execution stopper "+e.getMessage() ); + // remove the timer if the execution query has already terminated + if (stopper != null) { + try { + stopper.cancel(); + stopper.purge(); + AnalysisLogger.getLogger().debug( + "In SubmitQuery-> Execution stopper terminated"); + } catch (Exception e) { + AnalysisLogger.getLogger().debug( + "In SubmitQuery-> Could not stop execution stopper " + + e.getMessage()); } } } @@ -205,7 +201,8 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug("In SubmitQuery->retrieving outputs"); // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap" + UUID.randomUUID(), + "Results Map"); return output; } @@ -295,16 +292,19 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { @Override public void shutdown() { - + AnalysisLogger.getLogger().debug("In SubmitQuery->Shutdown"); - try{ - if (dbconnection!=null) { - dbconnection.close(); - AnalysisLogger.getLogger().debug("In SubmitQuery-> Connection closed"); - dbconnection=null; - } - }catch(Exception e){ - AnalysisLogger.getLogger().debug("In SubmitQuery->Unable to close connection "+e.getMessage()); + try { + if (dbconnection != null) { + dbconnection.close(); + AnalysisLogger.getLogger().debug( + "In SubmitQuery-> Connection closed"); + dbconnection = null; + } + } catch (Exception e) { + AnalysisLogger.getLogger().debug( + "In SubmitQuery->Unable to close connection " + + e.getMessage()); } } @@ -345,7 +345,7 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { .equals(resourceName.toLowerCase())) { normalizeDBInfo(resources.get(i)); for (int j = 0; j < resources.get(i).getAccessPoints().size(); j++) { - + if (resources.get(i).getAccessPoints().get(j) .getDatabaseName().toLowerCase() .equals(databaseName.toLowerCase())) { @@ -423,12 +423,13 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { String DatabaseName = iterator.next(); // Load the database driver - Class.forName(DatabaseDriver) ; + Class.forName(DatabaseDriver); // Get a connection to the database - Connection conn = DriverManager.getConnection(DatabaseURL,DatabaseUserName,DatabasePassword) ; - if (conn!=null){ + Connection conn = DriverManager.getConnection(DatabaseURL, + DatabaseUserName, DatabasePassword); + if (conn != null) { AnalysisLogger.getLogger().debug( - "In SubmitQuery->database " + DatabaseName + ": connected"); + "In SubmitQuery->database " + DatabaseName + ": connected"); } return conn; } @@ -553,8 +554,8 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // result = mgt.submitQuery(query, tableName, schemaName, // sf, config.getPersistencePath()); - result = mgt - .submitQuery(query, dbconnection, config.getPersistencePath()); + result = mgt.submitQuery(query, dbconnection, + config.getPersistencePath()); } if (driverInfo.toLowerCase().contains("mysql")) { @@ -564,8 +565,8 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // result = mgt.submitQuery(query, tableName, databaseName, // sf, config.getPersistencePath()); - result = mgt - .submitQuery(query, dbconnection, config.getPersistencePath()); + result = mgt.submitQuery(query, dbconnection, + config.getPersistencePath()); } if (result == null) { @@ -577,8 +578,9 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { HashMap mapResult = new HashMap(); mapResult = mgt.getMapQueryResult(); -// System.out.println("map size alg with header: " + mapResult.size()); - + // System.out.println("map size alg with header: " + + // mapResult.size()); + String encoded = null; encoded = new String(mapResult.get("HEADERS").getBytes(), "UTF-8"); @@ -597,33 +599,31 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { .getBytes(), "UTF-8"); // // check the encoded value -// AnalysisLogger.getLogger().debug( -// "In RandomSampleOnTable->string encoded: " + encoded); - String row="Row "+Integer.toString(i+1); + // AnalysisLogger.getLogger().debug( + // "In RandomSampleOnTable->string encoded: " + encoded); + String row = "Row " + Integer.toString(i + 1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); // //check value contained in map // String value = (String) val1.getContent(); // -// AnalysisLogger.getLogger().debug( -// "In RandomSampleOnTable->value: " + value); + // AnalysisLogger.getLogger().debug( + // "In RandomSampleOnTable->value: " + value); } // to add the file - PrimitiveType fileResult = new - PrimitiveType(File.class.getName(), - mgt.getFile(), PrimitiveTypes.FILE, FILE, - FILE); - mapResults.put(FILE, fileResult); - - -// //to add the number of total rows for a result of a submit query operation - PrimitiveType totalRows = new PrimitiveType(String.class.getName(), - String.valueOf(mgt.getSubmitQueryTotalRows()), PrimitiveTypes.STRING, TOTAL_ROWS,TOTAL_ROWS - ); + PrimitiveType fileResult = new PrimitiveType(File.class.getName(), + mgt.getFile(), PrimitiveTypes.FILE, FILE, FILE); + mapResults.put(FILE, fileResult); + + // //to add the number of total rows for a result of a submit query + // operation + PrimitiveType totalRows = new PrimitiveType(String.class.getName(), + String.valueOf(mgt.getSubmitQueryTotalRows()), + PrimitiveTypes.STRING, TOTAL_ROWS, TOTAL_ROWS); mapResults.put(TOTAL_ROWS, totalRows); - + } return mapResults; } @@ -650,45 +650,44 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { } private void normalizeDBInfo(DBResource resource) throws Exception { - - - try{ + + try { int ap = resource.getAccessPoints().size(); for (int i = 0; i < ap; i++) { resource.normalize(i); } - - }catch (Exception e) { + + } catch (Exception e) { AnalysisLogger.getLogger().debug( "In SubmitQuery->: Error in normalization process" + e.getMessage()); - + throw e; } - -// int ap = resource.getAccessPoints().size(); -// for (int i = 0; i < ap; i++) { -// try { -// resource.normalize(i); -// } catch (IOException e) { -// // e.printStackTrace(); -// AnalysisLogger.getLogger().debug( -// "In SubmitQuery->: Error in normalization process" -// + e.getMessage()); -// throw e; -// } -// } + + // int ap = resource.getAccessPoints().size(); + // for (int i = 0; i < ap; i++) { + // try { + // resource.normalize(i); + // } catch (IOException e) { + // // e.printStackTrace(); + // AnalysisLogger.getLogger().debug( + // "In SubmitQuery->: Error in normalization process" + // + e.getMessage()); + // throw e; + // } + // } } -// private void formatWithQuotes(String Query) { -// if (driverInfo.toLowerCase().contains("postgres")) { -// if (Query.contains(tableName)) { -// query = Query.replaceAll(tableName, "\"" + tableName + "\""); -// } -// if (driverInfo.toLowerCase().contains("mysql")) { -// query = Query.replaceAll(tableName, "\"" + tableName + "\""); -// } -// } -// } + // private void formatWithQuotes(String Query) { + // if (driverInfo.toLowerCase().contains("postgres")) { + // if (Query.contains(tableName)) { + // query = Query.replaceAll(tableName, "\"" + tableName + "\""); + // } + // if (driverInfo.toLowerCase().contains("mysql")) { + // query = Query.replaceAll(tableName, "\"" + tableName + "\""); + // } + // } + // } } diff --git a/target/apidocs/allclasses-frame.html b/target/apidocs/allclasses-frame.html index 6691497..937e647 100644 --- a/target/apidocs/allclasses-frame.html +++ b/target/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +All Classes (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + diff --git a/target/apidocs/allclasses-noframe.html b/target/apidocs/allclasses-noframe.html index 1e872f8..808b60d 100644 --- a/target/apidocs/allclasses-noframe.html +++ b/target/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +All Classes (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + diff --git a/target/apidocs/constant-values.html b/target/apidocs/constant-values.html index 713fd9b..9227805 100644 --- a/target/apidocs/constant-values.html +++ b/target/apidocs/constant-values.html @@ -2,16 +2,16 @@ - + -Constant Field Values (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Constant Field Values (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

Copyright © 2016. All Rights Reserved.

+

Copyright © 2017. All Rights Reserved.

diff --git a/target/apidocs/deprecated-list.html b/target/apidocs/deprecated-list.html index 2b45573..9a27b05 100644 --- a/target/apidocs/deprecated-list.html +++ b/target/apidocs/deprecated-list.html @@ -2,16 +2,16 @@ - + -Deprecated List (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Deprecated List (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

Copyright © 2016. All Rights Reserved.

+

Copyright © 2017. All Rights Reserved.

diff --git a/target/apidocs/help-doc.html b/target/apidocs/help-doc.html index af6a440..23f95f1 100644 --- a/target/apidocs/help-doc.html +++ b/target/apidocs/help-doc.html @@ -2,16 +2,16 @@ - + -API Help (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +API Help (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -217,6 +217,6 @@ -

Copyright © 2016. All Rights Reserved.

+

Copyright © 2017. All Rights Reserved.

diff --git a/target/apidocs/index-all.html b/target/apidocs/index-all.html index c2fba59..ef12293 100644 --- a/target/apidocs/index-all.html +++ b/target/apidocs/index-all.html @@ -2,16 +2,16 @@ - + -Index (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Index (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -524,6 +524,6 @@ the order they are declared. -

Copyright © 2016. All Rights Reserved.

+

Copyright © 2017. All Rights Reserved.

diff --git a/target/apidocs/index.html b/target/apidocs/index.html index ae7d178..8fb279a 100644 --- a/target/apidocs/index.html +++ b/target/apidocs/index.html @@ -2,9 +2,9 @@ - + -DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API +DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.GetTableDetails
  • + +
    • @@ -107,7 +112,7 @@

      public class GetTableDetails
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to retrieve some information about the chosen table
    @@ -185,6 +190,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
      +
    • + + +

      Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

      +sendNotification
    • +
    +
    • @@ -396,6 +408,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.html index 42aedae..c43c6c3 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.html @@ -2,16 +2,16 @@ - + -ListDBInfo (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +ListDBInfo (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.ListDBInfo
  • + +
    • @@ -107,7 +112,7 @@

      public class ListDBInfo
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to retrieve information about the chosen resource
    @@ -185,6 +190,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
      +
    • + + +

      Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

      +sendNotification
    • +
    +
    • @@ -394,6 +406,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.html index c20dd46..d706462 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.html @@ -2,16 +2,16 @@ - + -ListNames (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +ListNames (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.ListNames
  • + +
    • @@ -107,7 +112,7 @@

      public class ListNames
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to retrieve a list of database resources
    @@ -185,6 +190,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
      +
    • + + +

      Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

      +sendNotification
    • +
    +
    • @@ -386,6 +398,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.html index b4bfd8c..4f2c34c 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.html @@ -2,16 +2,16 @@ - + -ListSchemas (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +ListSchemas (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.ListSchemas
  • + +
    • @@ -107,7 +112,7 @@

      public class ListSchemas
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      class that allows to retrieve schema's names of a chosen database. In this case the database's type is "postgresql"
    • @@ -186,6 +191,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
        +
      • + + +

        Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

        +sendNotification
      • +
      +
      • @@ -397,6 +409,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.html index 2bb31d3..ed31eb2 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.html @@ -2,16 +2,16 @@ - + -ListTables (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +ListTables (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.ListTables
  • + +
    • @@ -107,7 +112,7 @@

      public class ListTables
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to retrieve the tables's names of a chosen database
    @@ -185,6 +190,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
      +
    • + + +

      Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

      +sendNotification
    • +
    +
    • @@ -396,6 +408,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.html index be76dcc..d9454d0 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.html @@ -2,16 +2,16 @@ - + -RandomSampleOnTable (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +RandomSampleOnTable (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.RandomSampleOnTable
  • + +
    • @@ -107,7 +112,7 @@

      public class RandomSampleOnTable
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to perform a random sample operation on a table of a chosen database. It retrieves 100 rows of a table randomly.
    • @@ -186,6 +191,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
        +
      • + + +

        Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

        +sendNotification
      • +
      +
      • @@ -387,6 +399,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.html index 5b9888b..bda8a6e 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.html @@ -2,16 +2,16 @@ - + -SampleOnTable (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +SampleOnTable (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.SampleOnTable
  • + +
    • @@ -107,7 +112,7 @@

      public class SampleOnTable
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to perform a sample operation on a table of a chosen database. It retrieves the first 100 rows of a table.
    • @@ -186,6 +191,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
        +
      • + + +

        Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

        +sendNotification
      • +
      +
      • @@ -387,6 +399,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartCorrectionEnum.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartCorrectionEnum.html index b155f97..f64f625 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartCorrectionEnum.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartCorrectionEnum.html @@ -2,16 +2,16 @@ - + -SmartCorrectionEnum (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +SmartCorrectionEnum (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -328,6 +328,6 @@ not permitted.) -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.html index bd6bfac..a706ebc 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.html @@ -2,16 +2,16 @@ - + -SmartSampleOnTable (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +SmartSampleOnTable (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.SmartSampleOnTable
  • + +
    • @@ -107,7 +112,7 @@

      public class SmartSampleOnTable
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to perform a smart sample operation on a table of a chosen database. It retrieves 100 rows of a table randomly that have the maximum number of columns not null.
      @@ -187,6 +192,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
        +
      • + + +

        Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

        +sendNotification
      • +
      +
      • @@ -388,6 +400,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.html index 63d67ec..9bdd570 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.html @@ -2,16 +2,16 @@ - + -SubmitQuery (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +SubmitQuery (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -91,12 +91,17 @@
  • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
    • +
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
    • +
    • +
      • org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQuery
  • + +
    • @@ -107,7 +112,7 @@

      public class SubmitQuery
      -extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm
      +extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm
      Class that allows to submit a query. It retrieves results in a file and in a map.
    • @@ -190,6 +195,13 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
        +
      • + + +

        Methods inherited from class org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm

        +sendNotification
      • +
      +
      • @@ -416,6 +428,6 @@ extends org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorit
    -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQueryEnum.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQueryEnum.html index 44e63df..7ffdabc 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQueryEnum.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQueryEnum.html @@ -2,16 +2,16 @@ - + -SubmitQueryEnum (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +SubmitQueryEnum (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -316,6 +316,6 @@ not permitted.) -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/GetTableDetails.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/GetTableDetails.html index ee79b11..27f2b32 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/GetTableDetails.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/GetTableDetails.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.GetTableDetails (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.GetTableDetails (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListDBInfo.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListDBInfo.html index b3d8b6f..2a73a1d 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListDBInfo.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListDBInfo.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListDBInfo (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListDBInfo (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListNames.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListNames.html index 919dbe0..820e30a 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListNames.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListNames.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListNames (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListNames (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListSchemas.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListSchemas.html index c07e1c8..708d71d 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListSchemas.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListSchemas.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListSchemas (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListSchemas (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListTables.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListTables.html index 44efb37..e442541 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListTables.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/ListTables.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListTables (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.ListTables (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/RandomSampleOnTable.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/RandomSampleOnTable.html index 2eec8c6..ef35825 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/RandomSampleOnTable.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/RandomSampleOnTable.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.RandomSampleOnTable (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.RandomSampleOnTable (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SampleOnTable.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SampleOnTable.html index 14405fa..9489f20 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SampleOnTable.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SampleOnTable.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SampleOnTable (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SampleOnTable (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartCorrectionEnum.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartCorrectionEnum.html index 0ac4db7..b76ef31 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartCorrectionEnum.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartCorrectionEnum.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SmartCorrectionEnum (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SmartCorrectionEnum (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -161,6 +161,6 @@ the order they are declared. -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartSampleOnTable.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartSampleOnTable.html index 7cd9125..1e3aff9 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartSampleOnTable.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SmartSampleOnTable.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SmartSampleOnTable (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SmartSampleOnTable (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQuery.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQuery.html index b4153e6..c6f1a62 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQuery.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQuery.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQuery (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQuery (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -112,6 +112,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQueryEnum.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQueryEnum.html index 7d3c610..2dbc2a3 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQueryEnum.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/class-use/SubmitQueryEnum.html @@ -2,16 +2,16 @@ - + -Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQueryEnum (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +Uses of Class org.gcube.dataaccess.algorithms.drmalgorithms.SubmitQueryEnum (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -161,6 +161,6 @@ the order they are declared. -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-frame.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-frame.html index 1dc9d76..9859db6 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-frame.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-frame.html @@ -2,10 +2,10 @@ - + -org.gcube.dataaccess.algorithms.drmalgorithms (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +org.gcube.dataaccess.algorithms.drmalgorithms (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-summary.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-summary.html index 228f1ae..f810c55 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-summary.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-summary.html @@ -2,16 +2,16 @@ - + -org.gcube.dataaccess.algorithms.drmalgorithms (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +org.gcube.dataaccess.algorithms.drmalgorithms (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -202,6 +202,6 @@ -

    Copyright © 2016. All Rights Reserved.

    +

    Copyright © 2017. All Rights Reserved.

    diff --git a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-tree.html b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-tree.html index c17aa9f..491f607 100644 --- a/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-tree.html +++ b/target/apidocs/org/gcube/dataaccess/algorithms/drmalgorithms/package-tree.html @@ -2,16 +2,16 @@ - + -org.gcube.dataaccess.algorithms.drmalgorithms Class Hierarchy (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - +org.gcube.dataaccess.algorithms.drmalgorithms Class Hierarchy (DatabasesResourcesManagerAlgorithms 1.5.0-SNAPSHOT API) + @@ -77,6 +77,8 @@
    • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalExternalAlgorithm (implements org.gcube.dataanalysis.ecoengine.interfaces.Transducerer)
        +
      • org.gcube.dataanalysis.ecoengine.interfaces.StandardLocalInfraAlgorithm +
        • org.gcube.dataaccess.algorithms.drmalgorithms.GetTableDetails
        • org.gcube.dataaccess.algorithms.drmalgorithms.ListDBInfo
        • org.gcube.dataaccess.algorithms.drmalgorithms.ListNames
        • @@ -91,6 +93,8 @@
      +
    • +

    Enum Hierarchy