refactor: divide project into better subpackages

AlexanderSchultheiss · AlexanderSchultheiss · commit 5e1520ded295 · 2024-06-03T15:03:26.000+02:00
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ECCO_LIGHT.java b/src/main/java/de/hub/mse/variantsync/boosting/ECCO_LIGHT.java
@@ -1,17 +1,13 @@
 package de.hub.mse.variantsync.boosting;
 
-import de.hub.mse.variantsync.boosting.data.*;
-import de.hub.mse.variantsync.boosting.data.Module;
-import de.hub.mse.variantsync.boosting.data.ProductPassport;
-import de.hub.mse.variantsync.boosting.data.specialization.CAST;
-import de.hub.mse.variantsync.boosting.data.specialization.ESupportedLanguages;
-import de.hub.mse.variantsync.boosting.data.specialization.JavaAST;
-import de.hub.mse.variantsync.boosting.data.specialization.LineAST;
-import de.hub.mse.variantsync.boosting.threading.ProductInitializationTask;
-import de.hub.mse.variantsync.boosting.threading.ProductLoadTask;
-import de.hub.mse.variantsync.boosting.threading.ProductSaveTask;
 import org.tinylog.Logger;
-import de.hub.mse.variantsync.boosting.util.ProductLoader;
+
+import de.hub.mse.variantsync.boosting.ecco.*;
+import de.hub.mse.variantsync.boosting.ecco.Module;
+import de.hub.mse.variantsync.boosting.parsing.*;
+import de.hub.mse.variantsync.boosting.position.*;
+import de.hub.mse.variantsync.boosting.product.*;
+
 import org.logicng.formulas.FType;
 import org.logicng.formulas.Formula;
 import org.logicng.formulas.FormulaFactory;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/data/specialization/ESupportedLanguages.java b/src/main/java/de/hub/mse/variantsync/boosting/data/specialization/ESupportedLanguages.java
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ecco/Association.java b/src/main/java/de/hub/mse/variantsync/boosting/ecco/Association.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.ecco;
 
 import org.logicng.formulas.Formula;
 
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ecco/EccoNode.java b/src/main/java/de/hub/mse/variantsync/boosting/ecco/EccoNode.java
@@ -1,7 +1,8 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.ecco;
 
 import de.hub.mse.variantsync.boosting.ECCO_LIGHT;
-import de.hub.mse.variantsync.boosting.data.position.Position;
+import de.hub.mse.variantsync.boosting.position.Position;
+
 import org.logicng.formulas.FType;
 import org.logicng.formulas.Formula;
 import org.logicng.io.parsers.ParserException;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ecco/EccoSet.java b/src/main/java/de/hub/mse/variantsync/boosting/ecco/EccoSet.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.ecco;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ecco/Feature.java b/src/main/java/de/hub/mse/variantsync/boosting/ecco/Feature.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.ecco;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ecco/MainTree.java b/src/main/java/de/hub/mse/variantsync/boosting/ecco/MainTree.java
@@ -1,8 +1,11 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.ecco;
 
 import de.hub.mse.variantsync.boosting.ECCO_LIGHT;
-import de.hub.mse.variantsync.boosting.data.position.ProductPosition;
-import de.hub.mse.variantsync.boosting.data.position.UnspecifiedPosition;
+import de.hub.mse.variantsync.boosting.parsing.AbstractAST;
+import de.hub.mse.variantsync.boosting.position.ProductPosition;
+import de.hub.mse.variantsync.boosting.position.UnspecifiedPosition;
+import de.hub.mse.variantsync.boosting.product.Product;
+
 import org.logicng.formulas.Formula;
 
 import java.io.Serializable;
@@ -24,7 +27,7 @@ public MainTree(final AbstractAST tree) {
     // in the resulting main tree corresponding to the nodes of this AST
     public EccoSet<EccoNode> unite(final Product product) {
         final EccoSet<EccoNode> result = new EccoSet<>();
-        uniteChildren(result, product.getProductAst().root, tree.getRoot(), product);
+        uniteChildren(result, product.getProductAst().getRoot(), tree.getRoot(), product);
         tree.getAstNodes().addAll(result);
         return result;
     }
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/ecco/Module.java b/src/main/java/de/hub/mse/variantsync/boosting/ecco/Module.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.ecco;
 
 import org.logicng.formulas.Literal;
 
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/parsing/AbstractAST.java b/src/main/java/de/hub/mse/variantsync/boosting/parsing/AbstractAST.java
@@ -1,7 +1,9 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.parsing;
 
-import de.hub.mse.variantsync.boosting.data.position.FilePosition;
-import de.hub.mse.variantsync.boosting.data.position.RootPosition;
+import de.hub.mse.variantsync.boosting.ecco.EccoNode;
+import de.hub.mse.variantsync.boosting.ecco.EccoSet;
+import de.hub.mse.variantsync.boosting.position.FilePosition;
+import de.hub.mse.variantsync.boosting.position.RootPosition;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/parsing/CAST.java b/src/main/java/de/hub/mse/variantsync/boosting/parsing/CAST.java
@@ -1,10 +1,10 @@
-package de.hub.mse.variantsync.boosting.data.specialization;
-
-import de.hub.mse.variantsync.boosting.data.EccoNode;
-import de.hub.mse.variantsync.boosting.data.EccoSet;
+package de.hub.mse.variantsync.boosting.parsing;
 
 import java.io.File;
 
+import de.hub.mse.variantsync.boosting.ecco.EccoNode;
+import de.hub.mse.variantsync.boosting.ecco.EccoSet;
+
 public class CAST extends LineAST {
     private static final String[] fileTypes = new String[] { ".c", ".h" };
 
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/parsing/ESupportedLanguages.java b/src/main/java/de/hub/mse/variantsync/boosting/parsing/ESupportedLanguages.java
@@ -0,0 +1,5 @@
+package de.hub.mse.variantsync.boosting.parsing;
+
+public enum ESupportedLanguages {
+    C, JAVA, LINES,
+}
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/parsing/JavaAST.java b/src/main/java/de/hub/mse/variantsync/boosting/parsing/JavaAST.java
@@ -1,11 +1,11 @@
-package de.hub.mse.variantsync.boosting.data.specialization;
+package de.hub.mse.variantsync.boosting.parsing;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.utils.CodeGenerationUtils;
 import com.github.javaparser.utils.SourceRoot;
-import de.hub.mse.variantsync.boosting.data.AbstractAST;
-import de.hub.mse.variantsync.boosting.data.EccoNode;
-import de.hub.mse.variantsync.boosting.data.EccoSet;
+
+import de.hub.mse.variantsync.boosting.ecco.EccoNode;
+import de.hub.mse.variantsync.boosting.ecco.EccoSet;
 
 import java.io.File;
 
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/parsing/JavaVisitor.java b/src/main/java/de/hub/mse/variantsync/boosting/parsing/JavaVisitor.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data.specialization;
+package de.hub.mse.variantsync.boosting.parsing;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -7,9 +7,11 @@
 import com.github.javaparser.ast.modules.ModuleDeclaration;
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.visitor.VoidVisitorWithDefaults;
-import de.hub.mse.variantsync.boosting.data.EccoNode;
-import de.hub.mse.variantsync.boosting.data.position.LinePosition;
-import de.hub.mse.variantsync.boosting.data.position.Position;
+
+import de.hub.mse.variantsync.boosting.ecco.EccoNode;
+import de.hub.mse.variantsync.boosting.position.LinePosition;
+import de.hub.mse.variantsync.boosting.position.Position;
+
 import org.tinylog.Logger;
 
 public class JavaVisitor extends VoidVisitorWithDefaults<EccoNode> {
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/parsing/LineAST.java b/src/main/java/de/hub/mse/variantsync/boosting/parsing/LineAST.java
@@ -1,10 +1,12 @@
-package de.hub.mse.variantsync.boosting.data.specialization;
+package de.hub.mse.variantsync.boosting.parsing;
 
-import de.hub.mse.variantsync.boosting.data.*;
-import de.hub.mse.variantsync.boosting.data.position.LinePosition;
-import de.hub.mse.variantsync.boosting.data.position.Position;
 import org.tinylog.Logger;
 
+import de.hub.mse.variantsync.boosting.ecco.EccoNode;
+import de.hub.mse.variantsync.boosting.ecco.EccoSet;
+import de.hub.mse.variantsync.boosting.position.LinePosition;
+import de.hub.mse.variantsync.boosting.position.Position;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/position/FilePosition.java b/src/main/java/de/hub/mse/variantsync/boosting/position/FilePosition.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data.position;
+package de.hub.mse.variantsync.boosting.position;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/position/LinePosition.java b/src/main/java/de/hub/mse/variantsync/boosting/position/LinePosition.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data.position;
+package de.hub.mse.variantsync.boosting.position;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/position/Position.java b/src/main/java/de/hub/mse/variantsync/boosting/position/Position.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data.position;
+package de.hub.mse.variantsync.boosting.position;
 
 import java.io.Serializable;
 import java.nio.file.Path;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/position/ProductPosition.java b/src/main/java/de/hub/mse/variantsync/boosting/position/ProductPosition.java
@@ -1,6 +1,6 @@
-package de.hub.mse.variantsync.boosting.data.position;
+package de.hub.mse.variantsync.boosting.position;
 
-import de.hub.mse.variantsync.boosting.data.Product;
+import de.hub.mse.variantsync.boosting.product.Product;
 
 import java.io.Serializable;
 import java.nio.file.Path;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/position/RootPosition.java b/src/main/java/de/hub/mse/variantsync/boosting/position/RootPosition.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data.position;
+package de.hub.mse.variantsync.boosting.position;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/position/UnspecifiedPosition.java b/src/main/java/de/hub/mse/variantsync/boosting/position/UnspecifiedPosition.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data.position;
+package de.hub.mse.variantsync.boosting.position;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/product/Product.java b/src/main/java/de/hub/mse/variantsync/boosting/product/Product.java
@@ -1,14 +1,18 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.product;
 
 import de.hub.mse.variantsync.boosting.ECCO_LIGHT;
-import de.hub.mse.variantsync.boosting.data.position.Position;
-import de.hub.mse.variantsync.boosting.data.specialization.JavaAST;
-import de.hub.mse.variantsync.boosting.data.specialization.LineAST;
+import de.hub.mse.variantsync.boosting.ecco.EccoNode;
+import de.hub.mse.variantsync.boosting.ecco.EccoSet;
+import de.hub.mse.variantsync.boosting.ecco.Feature;
+import de.hub.mse.variantsync.boosting.parsing.AbstractAST;
+import de.hub.mse.variantsync.boosting.parsing.JavaAST;
+import de.hub.mse.variantsync.boosting.parsing.LineAST;
+import de.hub.mse.variantsync.boosting.position.Position;
+
 import org.logicng.formulas.Formula;
 import org.logicng.io.parsers.ParserException;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/product/ProductInitializationTask.java b/src/main/java/de/hub/mse/variantsync/boosting/product/ProductInitializationTask.java
@@ -1,12 +1,15 @@
-package de.hub.mse.variantsync.boosting.threading;
+package de.hub.mse.variantsync.boosting.product;
 
-import de.hub.mse.variantsync.boosting.data.*;
-import de.hub.mse.variantsync.boosting.data.specialization.CAST;
-import de.hub.mse.variantsync.boosting.data.specialization.ESupportedLanguages;
-import de.hub.mse.variantsync.boosting.data.specialization.JavaAST;
-import de.hub.mse.variantsync.boosting.data.specialization.LineAST;
 import org.tinylog.Logger;
 
+import de.hub.mse.variantsync.boosting.ecco.EccoSet;
+import de.hub.mse.variantsync.boosting.ecco.Feature;
+import de.hub.mse.variantsync.boosting.parsing.AbstractAST;
+import de.hub.mse.variantsync.boosting.parsing.CAST;
+import de.hub.mse.variantsync.boosting.parsing.ESupportedLanguages;
+import de.hub.mse.variantsync.boosting.parsing.JavaAST;
+import de.hub.mse.variantsync.boosting.parsing.LineAST;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/product/ProductLoadTask.java b/src/main/java/de/hub/mse/variantsync/boosting/product/ProductLoadTask.java
@@ -1,6 +1,5 @@
-package de.hub.mse.variantsync.boosting.threading;
+package de.hub.mse.variantsync.boosting.product;
 
-import de.hub.mse.variantsync.boosting.data.Product;
 import org.tinylog.Logger;
 
 import java.io.FileInputStream;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/product/ProductLoader.java b/src/main/java/de/hub/mse/variantsync/boosting/product/ProductLoader.java
@@ -1,7 +1,4 @@
-package de.hub.mse.variantsync.boosting.util;
-
-import de.hub.mse.variantsync.boosting.data.Product;
-import de.hub.mse.variantsync.boosting.threading.ProductLoadTask;
+package de.hub.mse.variantsync.boosting.product;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/product/ProductPassport.java b/src/main/java/de/hub/mse/variantsync/boosting/product/ProductPassport.java
@@ -1,4 +1,4 @@
-package de.hub.mse.variantsync.boosting.data;
+package de.hub.mse.variantsync.boosting.product;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/de/hub/mse/variantsync/boosting/product/ProductSaveTask.java b/src/main/java/de/hub/mse/variantsync/boosting/product/ProductSaveTask.java
@@ -1,6 +1,5 @@
-package de.hub.mse.variantsync.boosting.threading;
+package de.hub.mse.variantsync.boosting.product;
 
-import de.hub.mse.variantsync.boosting.data.Product;
 import org.tinylog.Logger;
 
 import java.io.FileOutputStream;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.hub.mse.variantsync.boosting.data;`
	`1`	`+package de.hub.mse.variantsync.boosting.ecco;`
`2`	`2`
`3`	`3`	`import org.logicng.formulas.Formula;`
`4`	`4`