Renaming

README.md

@@ -23,11 +23,11 @@ to enable generation of rules for data stores other than relational databases.
 
 - On Java, include the client api dependencies
 [tdrules-client](https://central.sonatype.com/artifact/io.github.giis-uniovi/tdrules-client)
-and 
+and either 
 [tdrules-client-oa](https://central.sonatype.com/artifact/io.github.giis-uniovi/tdrules-client-oa)
 or
 [tdrules-client-rdb](https://central.sonatype.com/artifact/io.github.giis-uniovi/tdrules-client-rdb)
-available in Maven Central.
+that are available in Maven Central.
 A bom is also available:
 [tdrules-bom](https://central.sonatype.com/artifact/io.github.giis-uniovi/tdrules-bom).
 
@@ -37,7 +37,7 @@ available in NuGet.
 
 **Example:** To generate the FPC Rules for a query (`query`)
 that executes against 
-an OpenApi schema specification in a file or url (`spec`)
+an OpenApi schema specification inindicated by file or url (`spec`)
 or a relational database that can be reached by an open JDBC Connection (`conn`),
 you first get the data store schema model and then the rules model as follows:
 

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

@@ -144,12 +144,12 @@ private void setSpecifiedValues(List<GeneratedAttribute> gattrs, String[] attrNa
 				log.trace("setSpecifiedValues: attrName={} attrValue={}", attrNames[i], attrValues[i]);
 				GeneratedAttribute gattr = findGeneratedAttribute(gattrs, attrNames[i]);
 				log.trace("setSpecifiedValues:   before: {}", gattr);
-				setSpecifiedValuesForAttribute(gattr, attrNames[i], attrValues[i]);
+				setSpecifiedValuesForAttribute(gattr, attrValues[i]);
 				log.trace("setSpecifiedValues:    after: {}", gattr);
 			}
 		}
 	}
-	private void setSpecifiedValuesForAttribute(GeneratedAttribute gattr, String attrName, String attrValue) {
+	private void setSpecifiedValuesForAttribute(GeneratedAttribute gattr, String attrValue) {
 		gattr.specValue = attrValue;
 		if (symbols.isSymbol(attrValue)) {
 			// The specified value is symbolic, it is a uid that will store its value in a symbol

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/sql/Base.java → tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/rdb/Base.java

@@ -1,4 +1,4 @@
-package test4giis.tdrules.store.loader.sql;
+package test4giis.tdrules.store.loader.rdb;
 
 import static org.junit.Assert.assertEquals;
 

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/sql/TestOracleGeneration.java → tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/rdb/TestOracleSqlLoader.java

@@ -1,4 +1,4 @@
-package test4giis.tdrules.store.loader.sql;
+package test4giis.tdrules.store.loader.rdb;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -12,11 +12,10 @@
 
 import giis.tdrules.store.loader.DataLoader;
 
-public class TestOracleGeneration extends TestSqlserverGeneration {
+public class TestOracleSqlLoader extends TestSqlserverSqlLoader {
 
-	public TestOracleGeneration() {
+	public TestOracleSqlLoader() {
 		this.dbmsname = "oracle";
-		this.catalogSchema = "TEST4IN2TESTDB2";
 	}
 
 	protected String getDateTimeForSql() {

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

@@ -0,0 +1,9 @@
+package test4giis.tdrules.store.loader.rdb;
+
+public class TestPostgresSqlLoader extends TestSqlserverSqlLoader {
+
+	public TestPostgresSqlLoader() {
+		this.dbmsname = "postgres";
+	}
+
+}

tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/sql/TestSqlserverGeneration.java → tdrules-store-loader/src/test/java/test4giis/tdrules/store/loader/rdb/TestSqlserverSqlLoader.java

@@ -1,4 +1,4 @@
-package test4giis.tdrules.store.loader.sql;
+package test4giis.tdrules.store.loader.rdb;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -31,15 +31,13 @@
 import giis.tdrules.store.stypes.StoreType;
 
 /**
- * Generacion de datos para una BD relacional
+ * Data load to a Relational Database through sql
  */
-public class TestSqlserverGeneration extends Base {
+public class TestSqlserverSqlLoader extends Base {
 	protected static String TEST_PATH_OUTPUT = "target";
 	protected static String TEST_PATH_BENCHMARK = "src/test/resources";
 	protected Connection db;
 	protected StoreType dbms;
-	// nombre de catalogo.esquema tal como se precisan ver por los metadatos
-	protected String catalogSchema = "test4in2testDB2.dbo"; 
 
 	@Before
 	public void setUp() throws SQLException {