Removed cycle Schema change and Schema Evolution

giis-uniovi · Oct 11, 2024 · 6613c01 · 6613c01
1 parent 15a3dec
commit 6613c01
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 27 deletions.
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/AddColumn.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/AddColumn.java
@@ -1,5 +1,8 @@
 package giis.modevo.model.schemaevolution;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
@@ -22,7 +25,8 @@ public AddColumn(Column c, Table t) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, NodeList list, Element element) {
+	protected List<SchemaChange> storeInfo(NodeList list, Element element) {
+		List<SchemaChange> changes = new ArrayList<>();
 		String idTable = element.getAttribute("tab");
 		Element table = getElementById(list, idTable);
 		if (table == null) {
@@ -39,8 +43,9 @@ protected void storeInfo(SchemaEvolution se, NodeList list, Element element) {
 			Column columnObject = super.columnFromModelToObject(column, t);
 			t.getColumns().add(columnObject);
 			AddColumn ac = new AddColumn(columnObject, t);
-			se.getChanges().add(ac);
+			changes.add(ac);
 		}
+		return changes;
 	}
 
 }
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/AddTable.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/AddTable.java
@@ -1,5 +1,8 @@
 package giis.modevo.model.schemaevolution;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -21,7 +24,8 @@ public AddTable(Table t) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, NodeList list, Element element) {
+	protected List<SchemaChange> storeInfo(NodeList list, Element element) {
+		List<SchemaChange> changes = new ArrayList<>();
 		String idTable = element.getAttribute("tab");
 		Element table = getElementById(list, idTable);
 		Node nodeTable = getNodeById(list, idTable);
@@ -33,7 +37,9 @@ protected void storeInfo(SchemaEvolution se, NodeList list, Element element) {
 		NodeList listColumns = nodeTable.getChildNodes(); // columns of the new table nodes
 		readColumnsTable(t, listColumns);
 		AddTable at = new AddTable(t);
-		se.getChanges().add(at);
+		changes.add(at);
+		return changes;
+
 	}
 
 }
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/CopyTable.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/CopyTable.java
@@ -1,6 +1,9 @@
 package giis.modevo.model.schemaevolution;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -26,7 +29,8 @@ public CopyTable(Table t, Table t2) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
+	protected List<SchemaChange> storeInfo(NodeList list, Node node) {
+		List<SchemaChange> changes = new ArrayList<>();
 		Element elementCopy = (Element) node;
 		String tableSource = elementCopy.getAttribute(TABLE_SOURCE);
 		String idCopiedTable = elementCopy.getAttribute("copiedTable");
@@ -41,7 +45,8 @@ protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
 		NodeList listColumns = nodeTable.getChildNodes(); // columns of the new table nodes
 		readColumnsTable(t, listColumns);
 		CopyTable ct = new CopyTable(source, t);
-		se.getChanges().add(ct);
+		changes.add(ct);
+		return changes;
 	}
 
 }
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/JoinColumn.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/JoinColumn.java
@@ -31,7 +31,8 @@ public JoinColumn(Column c, Table t, String criteria) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
+	protected List<SchemaChange> storeInfo(NodeList list, Node node) {
+		List<SchemaChange> changes = new ArrayList<>();
 		Element elementCopy = (Element) node;
 		String table = elementCopy.getAttribute(TABLE);
 		String idTargetColumn = elementCopy.getAttribute("targetColumn");
@@ -53,7 +54,8 @@ protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
 			Column columnSource = columnFromModelToObject(column, source);
 			jt.getSourceColumns().add(columnSource);
 		}
-		se.getChanges().add(jt);
+		changes.add(jt);
+		return changes;
 	}
 
 }
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/JoinTable.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/JoinTable.java
@@ -1,5 +1,8 @@
 package giis.modevo.model.schemaevolution;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -26,14 +29,16 @@ public JoinTable(Table originalTable, Table newTable) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, Node node) {
+	protected List<SchemaChange> storeInfo(Node node) {
+		List<SchemaChange> changes = new ArrayList<>();
 		Element elementSplit = (Element) node;
 		String source = elementSplit.getAttribute(TABLE_SOURCE);
 		String target = elementSplit.getAttribute("tableTarget");
 		Table tableSource = new Table(source);
 		Table tableTarget = new Table(target);
 		JoinTable jt = new JoinTable(tableSource, tableTarget);
-		se.getChanges().add(jt);
+		changes.add(jt);
+		return changes;
 	}
 
 }
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/RemovePK.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/RemovePK.java
@@ -1,5 +1,8 @@
 package giis.modevo.model.schemaevolution;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -28,15 +31,17 @@ public RemovePK(Column c, Table t, String namePreviousTable) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, Node node) {
+	protected List<SchemaChange> storeInfo(Node node) {
+		List<SchemaChange> changes = new ArrayList<>();
 		Element elementCopy = (Element) node;
 		String table = elementCopy.getAttribute(TABLE);
 		String columnRemoved = elementCopy.getAttribute("columnRemoved");
 		String previousTable = elementCopy.getAttribute("previous");
 		Column c = new Column(columnRemoved);
 		Table t = new Table(table);
 		RemovePK rp = new RemovePK(c, t, previousTable);
-		se.getChanges().add(rp);
+		changes.add(rp);
+		return changes;
 	}
 
 }
diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SchemaChange.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SchemaChange.java
@@ -1,5 +1,7 @@
 package giis.modevo.model.schemaevolution;
 
+import java.util.List;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -98,13 +100,13 @@ private boolean isKey(String key) {
 		return key != null && key.equalsIgnoreCase("true");
 	}
 
-	protected void storeInfo (SchemaEvolution se, NodeList list, Node node) {
+	protected List<SchemaChange> storeInfo (NodeList list, Node node) {
 		throw new UnsupportedOperationException (ERROR_STOREINFO);
 	}
-	protected void storeInfo(SchemaEvolution se, NodeList list, Element element) {
+	protected List<SchemaChange>  storeInfo(NodeList list, Element element) {
 		throw new UnsupportedOperationException (ERROR_STOREINFO);
 	}
-	protected void storeInfo (SchemaEvolution se, Node node) {
+	protected List<SchemaChange>  storeInfo (Node node) {
 		throw new UnsupportedOperationException (ERROR_STOREINFO);
 	}
 

diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SchemaEvolution.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SchemaEvolution.java
@@ -74,28 +74,28 @@ public SchemaEvolution readSchemaEvolutionModel(String pathSchemaEvolutionModel)
 			String nameElement = element.getNodeName();
 			if (nameElement.equalsIgnoreCase("Add")) { // Add column
 				log.info ("New Add Columns schema modification");
-				new AddColumn().storeInfo(se, list, element);
+				se.getChanges().addAll(new AddColumn().storeInfo(list, element));
 			} else if (nameElement.equalsIgnoreCase("AddTable")) {
 				log.info ("New Add Table schema modification");
-				new AddTable().storeInfo(se, list, element);
+				se.getChanges().addAll(new AddTable().storeInfo(list, element));
 			} else if (nameElement.equalsIgnoreCase("SplitColumn")) {
 				log.info ("New Split Column schema modification");
-				new SplitColumn().storeInfo(se, list, node);
+				se.getChanges().addAll(new SplitColumn().storeInfo(list, node));
 			} else if (nameElement.equalsIgnoreCase("JoinTable")) {
 				log.info ("New Join Table schema modification");
-				new JoinTable().storeInfo(se, node);
+				se.getChanges().addAll(new JoinTable().storeInfo(node));
 			} else if (nameElement.equalsIgnoreCase("CopyTable")) {
 				log.info ("New Copy Table schema modification");
-				new CopyTable().storeInfo(se, list, node);
+				se.getChanges().addAll(new CopyTable().storeInfo(list, node));
 			} else if (nameElement.equalsIgnoreCase("SplitTable")) {
 				log.info ("New Split Table schema modification");
-				new SplitTable().storeInfo(se, list, node);
+				se.getChanges().addAll(new SplitTable().storeInfo(list, node));
 			} else if (nameElement.equalsIgnoreCase("JoinColumn")) {
 				log.info ("New Join Column schema modification");
-				new JoinColumn().storeInfo(se, list, node);
+				se.getChanges().addAll(new JoinColumn().storeInfo(list, node));
 			} else if (nameElement.equalsIgnoreCase("RemovePK")) {
 				log.info ("New Remove PK schema modification");
-				new RemovePK().storeInfo(se, node);
+				se.getChanges().addAll(new RemovePK().storeInfo(node));
 			}
 		}
 		return se;

diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SplitColumn.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SplitColumn.java
@@ -43,7 +43,8 @@ public SplitColumn(Column c, Table t, List<Column> rs, List<CriteriaSplit> cs) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
+	protected List<SchemaChange> storeInfo(NodeList list, Node node) {
+		List<SchemaChange> changes = new ArrayList<>();
 		Element elementSplit = (Element) node;
 		String nameTable = elementSplit.getAttribute(TABLE);
 		String oldColumnModel = elementSplit.getAttribute("oldColumn");
@@ -74,7 +75,8 @@ protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
 			CriteriaSplit criteriaObject = criteriaFromModelToObject(criteriaElement, columnObject);
 			splitChange.getCs().add(criteriaObject);
 		}
-		se.getChanges().add(splitChange);
+		changes.add(splitChange);
+		return changes;
 	}
 
 	private CriteriaSplit criteriaFromModelToObject(Element criteria, Column column) {

diff --git a/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SplitTable.java b/modevo-transform/src/main/java/giis/modevo/model/schemaevolution/SplitTable.java
@@ -28,7 +28,8 @@ public SplitTable(Table sourceTable) {
 	}
 
 	@Override
-	protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
+	protected List<SchemaChange> storeInfo(NodeList list, Node node) {
+		List<SchemaChange> changes = new ArrayList<>();
 		Element elementCopy = (Element) node;
 		String tableSource = elementCopy.getAttribute(TABLE_SOURCE);
 		String idsResultingTables = elementCopy.getAttribute("resultingTables");
@@ -48,7 +49,8 @@ protected void storeInfo(SchemaEvolution se, NodeList list, Node node) {
 			readColumnsTable(resulting, listColumns);
 			st.getSplittedTables().add(resulting);
 		}
-		se.getChanges().add(st);
+		changes.add(st);
+		return changes;
 	}
 
 }