More refactor: store-loader

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/DataLoader.java

@@ -4,6 +4,9 @@
 
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.gen.DeterministicAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
+import giis.tdrules.store.loader.gen.IDataAdapter;
+import giis.tdrules.store.loader.gen.IUidGen;
 import giis.tdrules.store.loader.gen.SequentialUidGen;
 
 /**

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/EntityLoader.java

@@ -15,6 +15,8 @@
 import giis.tdrules.openapi.model.TdEntity;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.gen.ConstraintFactory;
+import giis.tdrules.store.loader.gen.IDataAdapter;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * Loads entities as indicated by the DataGenerator

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/LoaderConfig.java

@@ -1,5 +1,8 @@
 package giis.tdrules.store.loader;
 
+import giis.tdrules.store.loader.gen.IAttrGen;
+import giis.tdrules.store.loader.gen.IDataAdapter;
+import giis.tdrules.store.loader.gen.IUidGen;
 import giis.tdrules.store.loader.gen.SequentialUidGen;
 
 /**

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/ConstraintDecimal.java

@@ -1,7 +1,5 @@
 package giis.tdrules.store.loader.gen;
 
-import giis.tdrules.store.loader.IConstraint;
-
 /**
  * Limits the possible values that a decimal number can take according the attribute constraints
  * (configure the constraints with the add method).

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/ConstraintFactory.java

@@ -10,8 +10,6 @@
 import giis.tdrules.openapi.model.TdAttribute;
 import giis.tdrules.openapi.model.TdCheck;
 import giis.tdrules.openapi.model.TdEntity;
-import giis.tdrules.store.loader.IConstraint;
-import giis.tdrules.store.loader.IDataAdapter;
 
 /**
  * For an attribute, processes the constraints included in the model to create

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/ConstraintInteger.java

@@ -1,7 +1,5 @@
 package giis.tdrules.store.loader.gen;
 
-import giis.tdrules.store.loader.IConstraint;
-
 /**
  * Limits the possible values that an integer can take according the attribute constraints
  * (configure the constraints with the add method)

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/DeterministicAttrGen.java

@@ -5,9 +5,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import giis.tdrules.store.loader.IAttrGen;
-import giis.tdrules.store.loader.IConstraint;
-
 /**
  * Generates primitive attribute values in a reproducible sequence, taking into
  * account the the number of objects already created for each entity and the

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/DictionaryAttrGen.java

@@ -12,8 +12,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import giis.tdrules.store.loader.IConstraint;
-
 /**
  * Generates deterministic values from a set of dictionaries configured for
  * coordinates defined by pairs entity/attribute; it also provides some

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/IAttrGen.java → tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/IAttrGen.java

@@ -1,4 +1,4 @@
-package giis.tdrules.store.loader;
+package giis.tdrules.store.loader.gen;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/IConstraint.java → tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/IConstraint.java

@@ -1,4 +1,4 @@
-package giis.tdrules.store.loader;
+package giis.tdrules.store.loader.gen;
 
 public interface IConstraint {
 

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/IDataAdapter.java → tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/IDataAdapter.java

@@ -1,4 +1,4 @@
-package giis.tdrules.store.loader;
+package giis.tdrules.store.loader.gen;
 
 import java.util.List;
 

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/IUidGen.java → tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/IUidGen.java

@@ -1,4 +1,4 @@
-package giis.tdrules.store.loader;
+package giis.tdrules.store.loader.gen;
 
 /**
  * The implementations of this interface determine the unique identifiers (uid)

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/LegacyUidGen.java

@@ -1,7 +1,5 @@
 package giis.tdrules.store.loader.gen;
 
-import giis.tdrules.store.loader.IUidGen;
-
 /**
  * Used for compatibility with legacy code: always returns a placeholder (?) as the last uid generated
  */

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/RandomAttrGen.java

@@ -1,8 +1,6 @@
 package giis.tdrules.store.loader.gen;
 
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IAttrGen;
-import giis.tdrules.store.loader.IConstraint;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * Generates random primitive attribute values

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/gen/SequentialUidGen.java

@@ -3,8 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import giis.tdrules.store.loader.IUidGen;
-
 /**
  * Generates sequential uids in the frontend
  */

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/ApiWriter.java

@@ -15,7 +15,7 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.entity.StringEntity;
 
-import giis.tdrules.store.loader.LoaderException;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * Utility to send/receive json data though an API

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/OaBasicAuthStore.java

@@ -10,7 +10,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import giis.tdrules.store.loader.LoaderException;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * Management of storable and configurable basic http authentication.

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/OaLiveAdapter.java

@@ -6,9 +6,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import giis.tdrules.store.loader.LoaderException;
+import giis.tdrules.store.loader.gen.IDataAdapter;
+import giis.tdrules.store.loader.shared.LoaderException;
 import giis.tdrules.openapi.model.TdSchema;
-import giis.tdrules.store.loader.IDataAdapter;
 
 /**
  * A Live Data Adapter to generate a json object according to an openapi model and

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/OaLiveUidGen.java

@@ -5,8 +5,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IUidGen;
+import giis.tdrules.store.loader.gen.IUidGen;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * An UidGen for openapi that gets the last autogenerated uid after a POST

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/OaLocalAdapter.java

@@ -14,10 +14,10 @@
 
 import giis.tdrules.model.shared.EntityTypes;
 import giis.tdrules.store.dtypes.DataTypes;
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IDataAdapter;
-import giis.tdrules.store.loader.IUidGen;
+import giis.tdrules.store.loader.gen.IDataAdapter;
+import giis.tdrules.store.loader.gen.IUidGen;
 import giis.tdrules.store.loader.gen.SequentialUidGen;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * A Local Data Adapter to generate a json object according to an openapi model,

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/Reserializer.java

@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import giis.tdrules.store.loader.LoaderException;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * Utilities to reorganize json strings containing serialized test data to

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/oa/UriRewriter.java

@@ -2,7 +2,7 @@
 
 import java.net.URLEncoder;
 
-import giis.tdrules.store.loader.LoaderException;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * Simple uri rewriting for path parameters

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/LoaderException.java → tdrules-store-loader/src/main/java/giis/tdrules/store/loader/shared/LoaderException.java

@@ -1,4 +1,4 @@
-package giis.tdrules.store.loader;
+package giis.tdrules.store.loader.shared;
 
 public class LoaderException extends RuntimeException {
 	private static final long serialVersionUID = -7517561777592540389L;

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/sql/DataCleaner.java

@@ -12,7 +12,7 @@
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.openapi.model.TdEntity;
 import giis.tdrules.store.dtypes.DataTypes;
-import giis.tdrules.store.loader.LoaderException;
+import giis.tdrules.store.loader.shared.LoaderException;
 import giis.tdrules.model.transform.SchemaSorter;
 import giis.tdrules.store.stypes.StoreType;
 

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/sql/SqlLiveAdapter.java

@@ -7,8 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IUidGen;
+import giis.tdrules.store.loader.gen.IUidGen;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * A live adapter to generate and execute sql statements to populate a database.

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/sql/SqlLiveUidGen.java

@@ -5,8 +5,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IUidGen;
+import giis.tdrules.store.loader.gen.IUidGen;
+import giis.tdrules.store.loader.shared.LoaderException;
 
 /**
  * An UidGen for relational databases that gets the last autogenerated uid after

tdrules-store-loader/src/main/java/giis/tdrules/store/loader/sql/SqlLocalAdapter.java

@@ -7,8 +7,8 @@
 import org.slf4j.LoggerFactory;
 
 import giis.tdrules.store.dtypes.DataTypes;
-import giis.tdrules.store.loader.IDataAdapter;
-import giis.tdrules.store.loader.IUidGen;
+import giis.tdrules.store.loader.gen.IDataAdapter;
+import giis.tdrules.store.loader.gen.IUidGen;
 import giis.tdrules.store.loader.gen.LegacyUidGen;
 import giis.tdrules.store.stypes.StoreType;
 

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/TestConstraintGeneration.java

@@ -10,8 +10,8 @@
 import giis.tdrules.openapi.model.TdEntity;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IConstraint;
 import giis.tdrules.store.loader.gen.ConstraintInteger;
+import giis.tdrules.store.loader.gen.IConstraint;
 import giis.tdrules.store.loader.gen.RandomAttrGen;
 import giis.tdrules.store.loader.oa.OaLocalAdapter;
 import giis.tdrules.store.loader.sql.SqlLocalAdapter;

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/TestDictionaryGeneration.java

@@ -4,8 +4,8 @@
 
 import org.junit.Test;
 
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 
 /**
  * Generation of values from a dictionary

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/TestGenerationSettings.java

@@ -4,9 +4,9 @@
 
 import org.junit.Test;
 
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DeterministicAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 
 /**
  * How optional settings of the Attribute Generators influence the generated values

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/TestReset.java

@@ -10,11 +10,11 @@
 import giis.tdrules.openapi.model.TdEntity;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 import giis.tdrules.store.loader.gen.RandomAttrGen;
 import giis.tdrules.store.loader.oa.OaLocalAdapter;
+import giis.tdrules.store.loader.shared.LoaderException;
 import giis.tdrules.store.loader.sql.SqlLocalAdapter;
 
 /**

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/oa/TestOaAdapter.java

@@ -5,7 +5,7 @@
 import org.junit.Test;
 
 import giis.tdrules.model.shared.EntityTypes;
-import giis.tdrules.store.loader.IDataAdapter;
+import giis.tdrules.store.loader.gen.IDataAdapter;
 import giis.tdrules.store.loader.oa.OaLocalAdapter;
 
 /**

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/oa/TestOaLiveGeneration.java

@@ -23,12 +23,12 @@
 import giis.tdrules.openapi.model.TdAttribute;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.LoaderException;
-import giis.tdrules.store.loader.IDataAdapter;
+import giis.tdrules.store.loader.gen.IDataAdapter;
 import giis.tdrules.store.loader.oa.OaBasicAuthStore;
 import giis.tdrules.store.loader.oa.OaLiveAdapter;
 import giis.tdrules.store.loader.oa.OaLiveUidGen;
 import giis.tdrules.store.loader.oa.OaPathResolver;
+import giis.tdrules.store.loader.shared.LoaderException;
 import giis.tdrules.openapi.model.TdEntity;
 
 /**

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/oa/TestOaLiveGenerationSequential.java

@@ -16,7 +16,7 @@
 
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IDataAdapter;
+import giis.tdrules.store.loader.gen.IDataAdapter;
 import giis.tdrules.store.loader.oa.OaLiveAdapter;
 
 /**

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/rdb/TestSqlserverSqlLoad.java

@@ -19,7 +19,7 @@
 import giis.tdrules.client.rdb.DbSchemaApi;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IDataAdapter;
+import giis.tdrules.store.loader.gen.IDataAdapter;
 import giis.tdrules.store.loader.gen.RandomAttrGen;
 import giis.tdrules.store.loader.sql.SqlLocalAdapter;
 import giis.tdrules.store.loader.sql.SqlLiveAdapter;