From b4ebf6e789c32d6748b95e54e28d31e8cb0cd05c Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Wed, 4 Jun 2014 14:13:44 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManager@96616 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../databases/access/DatabasesDiscoverer.java | 4 ++-- .../databases/access/ResourceDiscoverer.java | 4 ++-- .../databases/accessold/AddressesDiscoverer.java | 4 ++-- .../databases/accessold/DatabasesDiscoverer.java | 4 ++-- .../databases/accessold/ResourceDiscoverer.java | 4 ++-- .../databases/converter/SqlDialectConverter.java | 2 +- .../databases/lexer/LexicalAnalyzer.java | 2 +- .../databases/lexer/MySQLLexicalAnalyzer.java | 2 +- .../databases/lexer/PostgresLexicalAnalyzer.java | 2 +- .../databases/resources/DBResource.java | 4 ++-- .../databases/resources/processing/Decider.java | 4 ++-- .../databases/resources/processing/Guesser.java | 4 ++-- .../databases/resources/processing/Normalizer.java | 8 ++++---- .../databases/sampler/RowScore.java | 2 +- .../databases/sampler/Sampler.java | 4 ++-- .../databases/structure/AbstractTableStructure.java | 2 +- .../databases/structure/MySQLTableStructure.java | 4 ++-- .../databases/structure/PostgresTableStructure.java | 4 ++-- .../AliasToEntityOrderedMapResultTransformer.java | 2 +- .../databases/utils/ConnectionManager.java | 2 +- .../databases/utils/DatabaseFactory.java | 2 +- .../databases/utils/DatabaseManagement.java | 12 ++++++------ .../databases/utils/DatabaseOperations.java | 2 +- .../databases/utilsold/ConnectionManager.java | 1 + .../databases/utilsold/DatabaseFactory.java | 1 + .../databases/utilsold/DatabaseManagement.java | 1 + .../databases/utilsold/DatabaseOperations.java | 1 + .../org/gcube/dataanalysis/test/TestGetTables.java | 2 +- .../dataanalysis/test/TestRetrieveEndpoint.java | 2 +- 29 files changed, 48 insertions(+), 44 deletions(-) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/access/DatabasesDiscoverer.java (91%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/access/ResourceDiscoverer.java (69%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/accessold/AddressesDiscoverer.java (92%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/accessold/DatabasesDiscoverer.java (90%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/accessold/ResourceDiscoverer.java (71%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/converter/SqlDialectConverter.java (93%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/lexer/LexicalAnalyzer.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/lexer/MySQLLexicalAnalyzer.java (96%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/lexer/PostgresLexicalAnalyzer.java (97%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/resources/DBResource.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/resources/processing/Decider.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/resources/processing/Guesser.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/resources/processing/Normalizer.java (94%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/sampler/RowScore.java (92%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/sampler/Sampler.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/structure/AbstractTableStructure.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/structure/MySQLTableStructure.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/structure/PostgresTableStructure.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utils/AliasToEntityOrderedMapResultTransformer.java (93%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utils/ConnectionManager.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utils/DatabaseFactory.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utils/DatabaseManagement.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utils/DatabaseOperations.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utilsold/ConnectionManager.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utilsold/DatabaseFactory.java (98%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utilsold/DatabaseManagement.java (99%) rename src/main/java/org/gcube/{dataanalysis => dataaccess}/databases/utilsold/DatabaseOperations.java (98%) diff --git a/src/main/java/org/gcube/dataanalysis/databases/access/DatabasesDiscoverer.java b/src/main/java/org/gcube/dataaccess/databases/access/DatabasesDiscoverer.java similarity index 91% rename from src/main/java/org/gcube/dataanalysis/databases/access/DatabasesDiscoverer.java rename to src/main/java/org/gcube/dataaccess/databases/access/DatabasesDiscoverer.java index 6e73f60..dbfaa55 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/access/DatabasesDiscoverer.java +++ b/src/main/java/org/gcube/dataaccess/databases/access/DatabasesDiscoverer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.access; +package org.gcube.dataaccess.databases.access; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; @@ -6,7 +6,7 @@ import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; import java.util.List; import org.gcube.common.resources.gcore.ServiceEndpoint; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.api.DiscoveryException; import org.gcube.resources.discovery.client.api.InvalidResultException; diff --git a/src/main/java/org/gcube/dataanalysis/databases/access/ResourceDiscoverer.java b/src/main/java/org/gcube/dataaccess/databases/access/ResourceDiscoverer.java similarity index 69% rename from src/main/java/org/gcube/dataanalysis/databases/access/ResourceDiscoverer.java rename to src/main/java/org/gcube/dataaccess/databases/access/ResourceDiscoverer.java index 5dcdf96..f30b8d0 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/access/ResourceDiscoverer.java +++ b/src/main/java/org/gcube/dataaccess/databases/access/ResourceDiscoverer.java @@ -1,8 +1,8 @@ -package org.gcube.dataanalysis.databases.access; +package org.gcube.dataaccess.databases.access; import java.util.List; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; /** Class that allows to discover generic resources submitting a query to the IS. * It retrieves a list of DBResource objects. */ diff --git a/src/main/java/org/gcube/dataanalysis/databases/accessold/AddressesDiscoverer.java b/src/main/java/org/gcube/dataaccess/databases/accessold/AddressesDiscoverer.java similarity index 92% rename from src/main/java/org/gcube/dataanalysis/databases/accessold/AddressesDiscoverer.java rename to src/main/java/org/gcube/dataaccess/databases/accessold/AddressesDiscoverer.java index b81ceec..6dc57a1 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/accessold/AddressesDiscoverer.java +++ b/src/main/java/org/gcube/dataaccess/databases/accessold/AddressesDiscoverer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.accessold; +package org.gcube.dataaccess.databases.accessold; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; @@ -8,7 +8,7 @@ import java.util.List; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.impl.XQuery; diff --git a/src/main/java/org/gcube/dataanalysis/databases/accessold/DatabasesDiscoverer.java b/src/main/java/org/gcube/dataaccess/databases/accessold/DatabasesDiscoverer.java similarity index 90% rename from src/main/java/org/gcube/dataanalysis/databases/accessold/DatabasesDiscoverer.java rename to src/main/java/org/gcube/dataaccess/databases/accessold/DatabasesDiscoverer.java index 0e7df88..66d5442 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/accessold/DatabasesDiscoverer.java +++ b/src/main/java/org/gcube/dataaccess/databases/accessold/DatabasesDiscoverer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.accessold; +package org.gcube.dataaccess.databases.accessold; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; @@ -7,7 +7,7 @@ import java.util.List; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.impl.XQuery; diff --git a/src/main/java/org/gcube/dataanalysis/databases/accessold/ResourceDiscoverer.java b/src/main/java/org/gcube/dataaccess/databases/accessold/ResourceDiscoverer.java similarity index 71% rename from src/main/java/org/gcube/dataanalysis/databases/accessold/ResourceDiscoverer.java rename to src/main/java/org/gcube/dataaccess/databases/accessold/ResourceDiscoverer.java index c04b047..97d18f9 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/accessold/ResourceDiscoverer.java +++ b/src/main/java/org/gcube/dataaccess/databases/accessold/ResourceDiscoverer.java @@ -1,8 +1,8 @@ -package org.gcube.dataanalysis.databases.accessold; +package org.gcube.dataaccess.databases.accessold; import java.util.List; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; /** Class that allows to discover generic resources submitting a query to the IS and given a certain scope. * It retrieves a list of DBResource objects. */ diff --git a/src/main/java/org/gcube/dataanalysis/databases/converter/SqlDialectConverter.java b/src/main/java/org/gcube/dataaccess/databases/converter/SqlDialectConverter.java similarity index 93% rename from src/main/java/org/gcube/dataanalysis/databases/converter/SqlDialectConverter.java rename to src/main/java/org/gcube/dataaccess/databases/converter/SqlDialectConverter.java index dd3e88a..ca8da19 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/converter/SqlDialectConverter.java +++ b/src/main/java/org/gcube/dataaccess/databases/converter/SqlDialectConverter.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.converter; +package org.gcube.dataaccess.databases.converter; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; diff --git a/src/main/java/org/gcube/dataanalysis/databases/lexer/LexicalAnalyzer.java b/src/main/java/org/gcube/dataaccess/databases/lexer/LexicalAnalyzer.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/lexer/LexicalAnalyzer.java rename to src/main/java/org/gcube/dataaccess/databases/lexer/LexicalAnalyzer.java index 342b871..2f195ac 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/lexer/LexicalAnalyzer.java +++ b/src/main/java/org/gcube/dataaccess/databases/lexer/LexicalAnalyzer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.lexer; +package org.gcube.dataaccess.databases.lexer; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/dataanalysis/databases/lexer/MySQLLexicalAnalyzer.java b/src/main/java/org/gcube/dataaccess/databases/lexer/MySQLLexicalAnalyzer.java similarity index 96% rename from src/main/java/org/gcube/dataanalysis/databases/lexer/MySQLLexicalAnalyzer.java rename to src/main/java/org/gcube/dataaccess/databases/lexer/MySQLLexicalAnalyzer.java index 180cdb7..45f5012 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/lexer/MySQLLexicalAnalyzer.java +++ b/src/main/java/org/gcube/dataaccess/databases/lexer/MySQLLexicalAnalyzer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.lexer; +package org.gcube.dataaccess.databases.lexer; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/dataanalysis/databases/lexer/PostgresLexicalAnalyzer.java b/src/main/java/org/gcube/dataaccess/databases/lexer/PostgresLexicalAnalyzer.java similarity index 97% rename from src/main/java/org/gcube/dataanalysis/databases/lexer/PostgresLexicalAnalyzer.java rename to src/main/java/org/gcube/dataaccess/databases/lexer/PostgresLexicalAnalyzer.java index 13db1b3..f76b16a 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/lexer/PostgresLexicalAnalyzer.java +++ b/src/main/java/org/gcube/dataaccess/databases/lexer/PostgresLexicalAnalyzer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.lexer; +package org.gcube.dataaccess.databases.lexer; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/dataanalysis/databases/resources/DBResource.java b/src/main/java/org/gcube/dataaccess/databases/resources/DBResource.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/resources/DBResource.java rename to src/main/java/org/gcube/dataaccess/databases/resources/DBResource.java index 77eba9d..caac25b 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/resources/DBResource.java +++ b/src/main/java/org/gcube/dataaccess/databases/resources/DBResource.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.resources; +package org.gcube.dataaccess.databases.resources; import java.io.IOException; import java.util.ArrayList; @@ -14,7 +14,7 @@ import javax.xml.bind.annotation.XmlValue; import org.gcube.common.encryption.StringEncrypter; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.resources.processing.Normalizer; +import org.gcube.dataaccess.databases.resources.processing.Normalizer; /** Class that describes a resource database considering information specified from the user in a xml file. * Information are retrieved from the xml file Through the JAXB and the relative object is initialized */ diff --git a/src/main/java/org/gcube/dataanalysis/databases/resources/processing/Decider.java b/src/main/java/org/gcube/dataaccess/databases/resources/processing/Decider.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/resources/processing/Decider.java rename to src/main/java/org/gcube/dataaccess/databases/resources/processing/Decider.java index aa92c16..06c7ae0 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/resources/processing/Decider.java +++ b/src/main/java/org/gcube/dataaccess/databases/resources/processing/Decider.java @@ -1,7 +1,7 @@ -package org.gcube.dataanalysis.databases.resources.processing; +package org.gcube.dataaccess.databases.resources.processing; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; /** * Class that, taking the url as input, performs a parsing process of the field diff --git a/src/main/java/org/gcube/dataanalysis/databases/resources/processing/Guesser.java b/src/main/java/org/gcube/dataaccess/databases/resources/processing/Guesser.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/resources/processing/Guesser.java rename to src/main/java/org/gcube/dataaccess/databases/resources/processing/Guesser.java index fba7ede..2dae35a 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/resources/processing/Guesser.java +++ b/src/main/java/org/gcube/dataaccess/databases/resources/processing/Guesser.java @@ -1,7 +1,7 @@ -package org.gcube.dataanalysis.databases.resources.processing; +package org.gcube.dataaccess.databases.resources.processing; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.DBResource; /** * Class that uses as inputs the available information (platform, driver and diff --git a/src/main/java/org/gcube/dataanalysis/databases/resources/processing/Normalizer.java b/src/main/java/org/gcube/dataaccess/databases/resources/processing/Normalizer.java similarity index 94% rename from src/main/java/org/gcube/dataanalysis/databases/resources/processing/Normalizer.java rename to src/main/java/org/gcube/dataaccess/databases/resources/processing/Normalizer.java index 94f6310..63e9815 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/resources/processing/Normalizer.java +++ b/src/main/java/org/gcube/dataaccess/databases/resources/processing/Normalizer.java @@ -1,12 +1,12 @@ -package org.gcube.dataanalysis.databases.resources.processing; +package org.gcube.dataaccess.databases.resources.processing; import java.io.IOException; import java.net.UnknownHostException; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.resources.DBResource; -import org.gcube.dataanalysis.databases.resources.processing.Normalizer; -import org.gcube.dataanalysis.databases.resources.processing.Guesser; +import org.gcube.dataaccess.databases.resources.DBResource; +import org.gcube.dataaccess.databases.resources.processing.Guesser; +import org.gcube.dataaccess.databases.resources.processing.Normalizer; /** Class that performs the normalization process using the available information specified from the user */ diff --git a/src/main/java/org/gcube/dataanalysis/databases/sampler/RowScore.java b/src/main/java/org/gcube/dataaccess/databases/sampler/RowScore.java similarity index 92% rename from src/main/java/org/gcube/dataanalysis/databases/sampler/RowScore.java rename to src/main/java/org/gcube/dataaccess/databases/sampler/RowScore.java index ea27ded..8f21037 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/sampler/RowScore.java +++ b/src/main/java/org/gcube/dataaccess/databases/sampler/RowScore.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.sampler; +package org.gcube.dataaccess.databases.sampler; /** * Class that allows to describe diff --git a/src/main/java/org/gcube/dataanalysis/databases/sampler/Sampler.java b/src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/sampler/Sampler.java rename to src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java index 7e869d9..819f9ee 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/sampler/Sampler.java +++ b/src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.sampler; +package org.gcube.dataaccess.databases.sampler; import java.util.ArrayList; import java.util.Collections; @@ -7,7 +7,7 @@ import java.util.LinkedHashMap; import java.util.Random; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.utils.ConnectionManager; +import org.gcube.dataaccess.databases.utils.ConnectionManager; import org.hibernate.SessionFactory; /** diff --git a/src/main/java/org/gcube/dataanalysis/databases/structure/AbstractTableStructure.java b/src/main/java/org/gcube/dataaccess/databases/structure/AbstractTableStructure.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/structure/AbstractTableStructure.java rename to src/main/java/org/gcube/dataaccess/databases/structure/AbstractTableStructure.java index 07a56bb..1f21754 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/structure/AbstractTableStructure.java +++ b/src/main/java/org/gcube/dataaccess/databases/structure/AbstractTableStructure.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.structure; +package org.gcube.dataaccess.databases.structure; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/gcube/dataanalysis/databases/structure/MySQLTableStructure.java b/src/main/java/org/gcube/dataaccess/databases/structure/MySQLTableStructure.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/structure/MySQLTableStructure.java rename to src/main/java/org/gcube/dataaccess/databases/structure/MySQLTableStructure.java index 8af783b..ad4288f 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/structure/MySQLTableStructure.java +++ b/src/main/java/org/gcube/dataaccess/databases/structure/MySQLTableStructure.java @@ -1,8 +1,8 @@ -package org.gcube.dataanalysis.databases.structure; +package org.gcube.dataaccess.databases.structure; import java.util.List; -import org.gcube.dataanalysis.databases.utils.ConnectionManager; +import org.gcube.dataaccess.databases.utils.ConnectionManager; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.hibernate.SessionFactory; diff --git a/src/main/java/org/gcube/dataanalysis/databases/structure/PostgresTableStructure.java b/src/main/java/org/gcube/dataaccess/databases/structure/PostgresTableStructure.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/structure/PostgresTableStructure.java rename to src/main/java/org/gcube/dataaccess/databases/structure/PostgresTableStructure.java index 61fb286..70f2f31 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/structure/PostgresTableStructure.java +++ b/src/main/java/org/gcube/dataaccess/databases/structure/PostgresTableStructure.java @@ -1,10 +1,10 @@ -package org.gcube.dataanalysis.databases.structure; +package org.gcube.dataaccess.databases.structure; import java.util.List; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.hibernate.SessionFactory; -import org.gcube.dataanalysis.databases.utils.DatabaseFactory; +import org.gcube.dataaccess.databases.utils.DatabaseFactory; /** Class that allows to manage the Postgres database. */ public class PostgresTableStructure extends AbstractTableStructure { diff --git a/src/main/java/org/gcube/dataanalysis/databases/utils/AliasToEntityOrderedMapResultTransformer.java b/src/main/java/org/gcube/dataaccess/databases/utils/AliasToEntityOrderedMapResultTransformer.java similarity index 93% rename from src/main/java/org/gcube/dataanalysis/databases/utils/AliasToEntityOrderedMapResultTransformer.java rename to src/main/java/org/gcube/dataaccess/databases/utils/AliasToEntityOrderedMapResultTransformer.java index edb1a96..3552ff6 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utils/AliasToEntityOrderedMapResultTransformer.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/AliasToEntityOrderedMapResultTransformer.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.utils; +package org.gcube.dataaccess.databases.utils; import java.util.LinkedHashMap; //import java.util.List; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utils/ConnectionManager.java b/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/utils/ConnectionManager.java rename to src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java index a383207..c5dd7c0 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utils/ConnectionManager.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.utils; +package org.gcube.dataaccess.databases.utils; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; import org.gcube.contentmanagement.lexicalmatcher.utils.FileTools; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseFactory.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseFactory.java rename to src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java index cb17bef..a2ab2f8 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseFactory.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.utils; +package org.gcube.dataaccess.databases.utils; import java.io.ByteArrayInputStream; import java.util.List; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseManagement.java rename to src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java index e815b95..f788a45 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseManagement.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.utils; +package org.gcube.dataaccess.databases.utils; import java.io.BufferedWriter; import java.io.File; @@ -11,11 +11,11 @@ import java.util.LinkedHashMap; import java.util.List; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.converter.SqlDialectConverter; -import org.gcube.dataanalysis.databases.sampler.Sampler; -import org.gcube.dataanalysis.databases.structure.AbstractTableStructure; -import org.gcube.dataanalysis.databases.structure.MySQLTableStructure; -import org.gcube.dataanalysis.databases.structure.PostgresTableStructure; +import org.gcube.dataaccess.databases.converter.SqlDialectConverter; +import org.gcube.dataaccess.databases.sampler.Sampler; +import org.gcube.dataaccess.databases.structure.AbstractTableStructure; +import org.gcube.dataaccess.databases.structure.MySQLTableStructure; +import org.gcube.dataaccess.databases.structure.PostgresTableStructure; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.hibernate.SessionFactory; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseOperations.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseOperations.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseOperations.java rename to src/main/java/org/gcube/dataaccess/databases/utils/DatabaseOperations.java index a2a9166..a5077b6 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utils/DatabaseOperations.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseOperations.java @@ -1,4 +1,4 @@ -package org.gcube.dataanalysis.databases.utils; +package org.gcube.dataaccess.databases.utils; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utilsold/ConnectionManager.java b/src/main/java/org/gcube/dataaccess/databases/utilsold/ConnectionManager.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/utilsold/ConnectionManager.java rename to src/main/java/org/gcube/dataaccess/databases/utilsold/ConnectionManager.java index e402dab..2bdda7d 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utilsold/ConnectionManager.java +++ b/src/main/java/org/gcube/dataaccess/databases/utilsold/ConnectionManager.java @@ -1,3 +1,4 @@ +package org.gcube.dataaccess.databases.utilsold; //package org.gcube.dataanalysis.databases.utilsold; // ////import java.awt.List; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseFactory.java b/src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseFactory.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseFactory.java rename to src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseFactory.java index 279c51a..35fc60f 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseFactory.java +++ b/src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseFactory.java @@ -1,3 +1,4 @@ +package org.gcube.dataaccess.databases.utilsold; //package org.gcube.dataanalysis.databases.utilsold; // //import java.io.ByteArrayInputStream; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseManagement.java similarity index 99% rename from src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseManagement.java rename to src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseManagement.java index e39e276..34631fb 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseManagement.java +++ b/src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseManagement.java @@ -1,3 +1,4 @@ +package org.gcube.dataaccess.databases.utilsold; //package org.gcube.dataanalysis.databases.utilsold; // //import java.math.BigInteger; diff --git a/src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseOperations.java b/src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseOperations.java similarity index 98% rename from src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseOperations.java rename to src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseOperations.java index 67ce6c3..a8f6930 100644 --- a/src/main/java/org/gcube/dataanalysis/databases/utilsold/DatabaseOperations.java +++ b/src/main/java/org/gcube/dataaccess/databases/utilsold/DatabaseOperations.java @@ -1,3 +1,4 @@ +package org.gcube.dataaccess.databases.utilsold; //package org.gcube.dataanalysis.databases.utilsold; // //import java.io.File; diff --git a/src/test/java/org/gcube/dataanalysis/test/TestGetTables.java b/src/test/java/org/gcube/dataanalysis/test/TestGetTables.java index 5200077..09b5749 100644 --- a/src/test/java/org/gcube/dataanalysis/test/TestGetTables.java +++ b/src/test/java/org/gcube/dataanalysis/test/TestGetTables.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Scanner; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; -import org.gcube.dataanalysis.databases.utils.DatabaseManagement; +import org.gcube.dataaccess.databases.utils.DatabaseManagement; diff --git a/src/test/java/org/gcube/dataanalysis/test/TestRetrieveEndpoint.java b/src/test/java/org/gcube/dataanalysis/test/TestRetrieveEndpoint.java index 9a0e152..3f68962 100644 --- a/src/test/java/org/gcube/dataanalysis/test/TestRetrieveEndpoint.java +++ b/src/test/java/org/gcube/dataanalysis/test/TestRetrieveEndpoint.java @@ -2,7 +2,7 @@ package org.gcube.dataanalysis.test; import java.util.ArrayList; import java.util.List; -import org.gcube.dataanalysis.databases.accessold.AddressesDiscoverer; +import org.gcube.dataaccess.databases.accessold.AddressesDiscoverer; public class TestRetrieveEndpoint {