remove deprecated parameters in main api

InseeFr · Sep 28, 2023 · bd86203 · bd86203
1 parent 52ab333
commit bd86203
Show file tree

Hide file tree

Showing 60 changed files with 753 additions and 1,080 deletions.
diff --git a/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ArcPreparedStatementBuilder.java b/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ArcPreparedStatementBuilder.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 
 import fr.insee.arc.utils.dao.GenericPreparedStatementBuilder;
-import fr.insee.arc.utils.dao.SQL;
 
 public class ArcPreparedStatementBuilder extends GenericPreparedStatementBuilder {
 

diff --git a/arc-core/src/main/java/fr/insee/arc/core/dataobjects/DataObjectService.java b/arc-core/src/main/java/fr/insee/arc/core/dataobjects/DataObjectService.java
@@ -31,9 +31,6 @@ public DataObjectService(String sandboxSchema) {
 	 */
 	public String getView(ViewEnum e) {
 
-		if (e.getTableLocation().equals(SchemaEnum.TEMPORARY)) {
-			return e.getTableName();
-		}
 		if ((e.getTableLocation().equals(SchemaEnum.SANDBOX)
 				|| e.getTableLocation().equals(SchemaEnum.SANDBOX_GENERATED)) && this.sandboxSchema != null) {
 			return this.sandboxSchema + SQL.DOT.getSqlCode() + e.getTableName();
@@ -44,7 +41,7 @@ public String getView(ViewEnum e) {
 	}
 
 	public static String getFullTableNameInSchema(SchemaEnum schema, String tablename) {
-		return schema.getSchemaName().equals("") ? tablename : schema.getSchemaName() + SQL.DOT.getSqlCode() + tablename;
+		return schema.equals(SchemaEnum.TEMPORARY) ? tablename : schema.getSchemaName() + SQL.DOT.getSqlCode() + tablename;
 	}
 
 	public String getSandboxSchema() {

diff --git a/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ViewEnum.java b/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ViewEnum.java
@@ -185,6 +185,10 @@ public String getFullName(String schema) {
 		return schema + SQL.DOT.getSqlCode() + this.tableName;
 	}
 
+	public static String getFullName(String schema, String providedTableName) {
+		return schema + SQL.DOT.getSqlCode() + providedTableName;
+	}
+
 	public ColumnEnum col(ColumnEnum e) {
 		return this.getColumns().get(e);
 	}

diff --git a/arc-core/src/main/java/fr/insee/arc/core/model/XMLConstant.java b/arc-core/src/main/java/fr/insee/arc/core/model/XMLConstant.java
@@ -0,0 +1,9 @@
+package fr.insee.arc.core.model;
+
+public class XMLConstant {
+
+
+	// racine xml
+	public static final String ROOT = "root";
+
+}