From 492885ac10935620ad6d50056c00fa0cecfc5e29 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 22 Nov 2016 13:36:24 +0000 Subject: [PATCH] Fixed Algorithms to support DataMiner git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@134520 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../regressiontest/RegressionListDBInfo.java | 2 ++ .../regressiontest/RegressionListNames.java | 2 -- .../regressiontest/RegressionListSchemas.java | 2 ++ .../regressiontest/RegressionListTables.java | 4 ++++ .../RegressionRandomSampleOnTable.java | 7 +++++++ target/apidocs/allclasses-frame.html | 4 ++-- target/apidocs/allclasses-noframe.html | 4 ++-- target/apidocs/constant-values.html | 4 ++-- target/apidocs/deprecated-list.html | 4 ++-- target/apidocs/help-doc.html | 4 ++-- target/apidocs/index-all.html | 4 ++-- target/apidocs/index.html | 2 +- .../drmalgorithms/GetTableDetails.html | 4 ++-- .../algorithms/drmalgorithms/ListDBInfo.html | 4 ++-- .../algorithms/drmalgorithms/ListNames.html | 4 ++-- .../algorithms/drmalgorithms/ListSchemas.html | 4 ++-- .../algorithms/drmalgorithms/ListTables.html | 4 ++-- .../drmalgorithms/RandomSampleOnTable.html | 4 ++-- .../drmalgorithms/SampleOnTable.html | 4 ++-- .../drmalgorithms/SmartCorrectionEnum.html | 4 ++-- .../drmalgorithms/SmartSampleOnTable.html | 4 ++-- .../algorithms/drmalgorithms/SubmitQuery.html | 4 ++-- .../drmalgorithms/SubmitQueryEnum.html | 4 ++-- .../class-use/GetTableDetails.html | 4 ++-- .../drmalgorithms/class-use/ListDBInfo.html | 4 ++-- .../drmalgorithms/class-use/ListNames.html | 4 ++-- .../drmalgorithms/class-use/ListSchemas.html | 4 ++-- .../drmalgorithms/class-use/ListTables.html | 4 ++-- .../class-use/RandomSampleOnTable.html | 4 ++-- .../class-use/SampleOnTable.html | 4 ++-- .../class-use/SmartCorrectionEnum.html | 4 ++-- .../class-use/SmartSampleOnTable.html | 4 ++-- .../drmalgorithms/class-use/SubmitQuery.html | 4 ++-- .../class-use/SubmitQueryEnum.html | 4 ++-- .../drmalgorithms/package-frame.html | 4 ++-- .../drmalgorithms/package-summary.html | 4 ++-- .../drmalgorithms/package-tree.html | 4 ++-- .../algorithms/drmalgorithms/package-use.html | 4 ++-- .../AbsoluteSpeciesBarChartsAlgorithm.html | 4 ++-- .../algorithms/examples/SimpleAlg.html | 4 ++-- .../algorithms/examples/TestSimpleAlg.html | 4 ++-- .../algorithms/examples/TestTransducers.html | 4 ++-- .../AbsoluteSpeciesBarChartsAlgorithm.html | 4 ++-- .../examples/class-use/SimpleAlg.html | 4 ++-- .../examples/class-use/TestSimpleAlg.html | 4 ++-- .../examples/class-use/TestTransducers.html | 4 ++-- .../algorithms/examples/package-frame.html | 4 ++-- .../algorithms/examples/package-summary.html | 4 ++-- .../algorithms/examples/package-tree.html | 4 ++-- .../algorithms/examples/package-use.html | 4 ++-- .../algorithms/test/TestListDBInfo.html | 4 ++-- .../algorithms/test/TestListNames.html | 4 ++-- .../algorithms/test/TestListSchemas.html | 4 ++-- .../algorithms/test/TestListTables.html | 4 ++-- .../algorithms/test/TestSubmitQuery.html | 4 ++-- .../algorithms/test/TestTableDetails.html | 4 ++-- .../test/class-use/TestListDBInfo.html | 4 ++-- .../test/class-use/TestListNames.html | 4 ++-- .../test/class-use/TestListSchemas.html | 4 ++-- .../test/class-use/TestListTables.html | 4 ++-- .../test/class-use/TestSubmitQuery.html | 4 ++-- .../test/class-use/TestTableDetails.html | 4 ++-- .../algorithms/test/package-frame.html | 4 ++-- .../algorithms/test/package-summary.html | 4 ++-- .../algorithms/test/package-tree.html | 4 ++-- .../algorithms/test/package-use.html | 4 ++-- .../regressiontest/RegressionListDBInfo.html | 4 ++-- .../regressiontest/RegressionListNames.html | 4 ++-- .../regressiontest/RegressionListSchemas.html | 4 ++-- .../regressiontest/RegressionListTables.html | 4 ++-- .../RegressionRandomSampleOnTable.html | 4 ++-- .../RegressionSampleOnTable.html | 4 ++-- .../RegressionSmartSampleOnTable.html | 4 ++-- .../regressiontest/RegressionSubmitQuery.html | 4 ++-- .../RegressionTableDetails.html | 4 ++-- .../class-use/RegressionListDBInfo.html | 4 ++-- .../class-use/RegressionListNames.html | 4 ++-- .../class-use/RegressionListSchemas.html | 4 ++-- .../class-use/RegressionListTables.html | 4 ++-- .../RegressionRandomSampleOnTable.html | 4 ++-- .../class-use/RegressionSampleOnTable.html | 4 ++-- .../RegressionSmartSampleOnTable.html | 4 ++-- .../class-use/RegressionSubmitQuery.html | 4 ++-- .../class-use/RegressionTableDetails.html | 4 ++-- .../test/regressiontest/package-frame.html | 4 ++-- .../test/regressiontest/package-summary.html | 4 ++-- .../test/regressiontest/package-tree.html | 4 ++-- .../test/regressiontest/package-use.html | 4 ++-- target/apidocs/overview-frame.html | 4 ++-- target/apidocs/overview-summary.html | 4 ++-- target/apidocs/overview-tree.html | 4 ++-- ...e-rm-algorithms-1.4.0-SNAPSHOT-javadoc.jar | Bin 184001 -> 183979 bytes ...ithms-1.4.0-SNAPSHOT-servicearchive.tar.gz | Bin 84721 -> 84703 bytes ...e-rm-algorithms-1.4.0-SNAPSHOT-sources.jar | Bin 55111 -> 55111 bytes .../database-rm-algorithms-1.4.0-SNAPSHOT.jar | Bin 83455 -> 83454 bytes target/maven-archiver/pom.properties | 2 +- 96 files changed, 187 insertions(+), 174 deletions(-) diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListDBInfo.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListDBInfo.java index d17652b..734c181 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListDBInfo.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListDBInfo.java @@ -68,6 +68,8 @@ public class RegressionListDBInfo { } + + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue() { System.out.println("TEST 2: NullInputValue"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListNames.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListNames.java index 7ec2b8d..c60e4f1 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListNames.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListNames.java @@ -1,11 +1,9 @@ package org.gcube.dataaccess.algorithms.test.regressiontest; -import java.util.LinkedHashMap; import java.util.List; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; -import org.gcube.dataanalysis.ecoengine.datatypes.PrimitiveType; import org.gcube.dataanalysis.ecoengine.datatypes.StatisticalType; import org.gcube.dataanalysis.ecoengine.interfaces.ComputationalAgent; import org.gcube.dataanalysis.ecoengine.processing.factories.TransducerersFactory; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListSchemas.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListSchemas.java index c40c805..a4bc3ad 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListSchemas.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListSchemas.java @@ -86,6 +86,7 @@ public class RegressionListSchemas { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue1() { System.out.println("TEST 2: NullInputValue1"); @@ -105,6 +106,7 @@ public class RegressionListSchemas { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue2() { System.out.println("TEST 3: NullInputValue2"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListTables.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListTables.java index 82632bb..ebe3342 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListTables.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionListTables.java @@ -44,6 +44,7 @@ public class RegressionListTables { } + @SuppressWarnings("unused") private static AlgorithmConfiguration testPostgres1() { System.out.println("TEST 1: Postgres table without rows"); @@ -95,6 +96,7 @@ public class RegressionListTables { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue1() { System.out.println("TEST 3: Postgis NullInputValue1"); @@ -117,6 +119,7 @@ public class RegressionListTables { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue2() { System.out.println("TEST 4: Postgis NullInputValue2"); @@ -138,6 +141,7 @@ public class RegressionListTables { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue3() { System.out.println("TEST 5: Postgis NullInputValue3"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java index 519f610..38cad75 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java @@ -49,6 +49,7 @@ public class RegressionRandomSampleOnTable { // Posgresql database + @SuppressWarnings("unused") private static AlgorithmConfiguration testPostgres1() { System.out.println("TEST 1: Postgres table without rows"); @@ -129,6 +130,7 @@ public class RegressionRandomSampleOnTable { } + @SuppressWarnings("unused") private static AlgorithmConfiguration testPostgis() { System.out.println("TEST 2: Postgis"); @@ -173,6 +175,7 @@ public class RegressionRandomSampleOnTable { } + @SuppressWarnings("unused") private static AlgorithmConfiguration testMysql2() { System.out.println("TEST 4: Mysql2"); @@ -192,6 +195,7 @@ public class RegressionRandomSampleOnTable { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue1() { System.out.println("TEST 5: Postgis NullInputValue1"); @@ -212,6 +216,7 @@ public class RegressionRandomSampleOnTable { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue2() { System.out.println("TEST 6: Postgis NullInputValue2"); @@ -231,6 +236,7 @@ public class RegressionRandomSampleOnTable { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue3() { System.out.println("TEST 7: Postgis NullInputValue3"); @@ -251,6 +257,7 @@ public class RegressionRandomSampleOnTable { } + @SuppressWarnings("unused") private static AlgorithmConfiguration NullInputValue4() { System.out.println("TEST 8: Postgis NullInputValue4"); diff --git a/target/apidocs/allclasses-frame.html b/target/apidocs/allclasses-frame.html index 9e7a82e..6691497 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) - + diff --git a/target/apidocs/allclasses-noframe.html b/target/apidocs/allclasses-noframe.html index 6bc8ed8..1e872f8 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) - + diff --git a/target/apidocs/constant-values.html b/target/apidocs/constant-values.html index c9f3a7d..713fd9b 100644 --- a/target/apidocs/constant-values.html +++ b/target/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + Constant Field Values (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/deprecated-list.html b/target/apidocs/deprecated-list.html index 70f87c8..2b45573 100644 --- a/target/apidocs/deprecated-list.html +++ b/target/apidocs/deprecated-list.html @@ -2,10 +2,10 @@ - + Deprecated List (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/help-doc.html b/target/apidocs/help-doc.html index 0831cb8..af6a440 100644 --- a/target/apidocs/help-doc.html +++ b/target/apidocs/help-doc.html @@ -2,10 +2,10 @@ - + API Help (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/index-all.html b/target/apidocs/index-all.html index e192c9b..c2fba59 100644 --- a/target/apidocs/index-all.html +++ b/target/apidocs/index-all.html @@ -2,10 +2,10 @@ - + Index (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/index.html b/target/apidocs/index.html index a914af9..ae7d178 100644 --- a/target/apidocs/index.html +++ b/target/apidocs/index.html @@ -2,7 +2,7 @@ - + DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API