refactor: reorganize new packages

AlexanderSchultheiss · AlexanderSchultheiss · commit bc31cfe1ff91 · 2023-11-02T13:43:55.000+01:00
diff --git a/src/main/java/org/variantsync/vevos/extraction/FastGroundTruthExtraction.java b/src/main/java/org/variantsync/vevos/extraction/FastGroundTruthExtraction.java
@@ -7,7 +7,7 @@
 import org.variantsync.diffdetective.datasets.Repository;
 import org.variantsync.diffdetective.diff.git.DiffFilter;
 import org.variantsync.diffdetective.variation.diff.parse.VariationDiffParseOptions;
-import org.variantsync.vevos.extraction.analysis.fast.FastVariabilityAnalysis;
+import org.variantsync.vevos.extraction.analysis.FastVariabilityAnalysis;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/variantsync/vevos/extraction/FullGroundTruthExtraction.java b/src/main/java/org/variantsync/vevos/extraction/FullGroundTruthExtraction.java
@@ -10,8 +10,8 @@
 import org.variantsync.diffdetective.datasets.Repository;
 import org.variantsync.diffdetective.diff.git.DiffFilter;
 import org.variantsync.diffdetective.variation.diff.parse.VariationDiffParseOptions;
-import org.variantsync.vevos.extraction.analysis.full.FullVariabilityAnalysis;
-import org.variantsync.vevos.extraction.common.GroundTruth;
+import org.variantsync.vevos.extraction.analysis.FullVariabilityAnalysis;
+import org.variantsync.vevos.extraction.gt.GroundTruth;
 import org.variantsync.vevos.extraction.io.Serde;
 
 import java.io.File;
diff --git a/src/main/java/org/variantsync/vevos/extraction/analysis/FastVariabilityAnalysis.java b/src/main/java/org/variantsync/vevos/extraction/analysis/FastVariabilityAnalysis.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.analysis.fast;
+package org.variantsync.vevos.extraction.analysis;
 
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -7,10 +7,9 @@
 import org.variantsync.diffdetective.editclass.proposed.ProposedEditClasses;
 import org.variantsync.diffdetective.metadata.EditClassCount;
 import org.variantsync.diffdetective.variation.diff.Time;
-import org.variantsync.vevos.extraction.analysis.VariabilityAnalysis;
-import org.variantsync.vevos.extraction.common.FileGT;
-import org.variantsync.vevos.extraction.common.GroundTruth;
 import org.variantsync.vevos.extraction.error.MatchingException;
+import org.variantsync.vevos.extraction.gt.FileGT;
+import org.variantsync.vevos.extraction.gt.GroundTruth;
 import org.variantsync.vevos.extraction.io.Serde;
 
 import java.io.IOException;
diff --git a/src/main/java/org/variantsync/vevos/extraction/analysis/FullVariabilityAnalysis.java b/src/main/java/org/variantsync/vevos/extraction/analysis/FullVariabilityAnalysis.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.analysis.full;
+package org.variantsync.vevos.extraction.analysis;
 
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -7,10 +7,9 @@
 import org.variantsync.diffdetective.editclass.proposed.ProposedEditClasses;
 import org.variantsync.diffdetective.metadata.EditClassCount;
 import org.variantsync.diffdetective.variation.diff.Time;
-import org.variantsync.vevos.extraction.analysis.VariabilityAnalysis;
-import org.variantsync.vevos.extraction.common.FileGT;
-import org.variantsync.vevos.extraction.common.GroundTruth;
 import org.variantsync.vevos.extraction.error.MatchingException;
+import org.variantsync.vevos.extraction.gt.FileGT;
+import org.variantsync.vevos.extraction.gt.GroundTruth;
 import org.variantsync.vevos.extraction.io.Serde;
 
 import java.nio.file.Files;
diff --git a/src/main/java/org/variantsync/vevos/extraction/analysis/VariabilityAnalysis.java b/src/main/java/org/variantsync/vevos/extraction/analysis/VariabilityAnalysis.java
@@ -6,8 +6,8 @@
 import org.variantsync.diffdetective.variation.diff.DiffNode;
 import org.variantsync.diffdetective.variation.diff.DiffType;
 import org.variantsync.diffdetective.variation.diff.Time;
-import org.variantsync.vevos.extraction.common.*;
 import org.variantsync.vevos.extraction.error.MatchingException;
+import org.variantsync.vevos.extraction.gt.*;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/variantsync/vevos/extraction/gt/BlockAnnotation.java b/src/main/java/org/variantsync/vevos/extraction/gt/BlockAnnotation.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.common;
+package org.variantsync.vevos.extraction.gt;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/org/variantsync/vevos/extraction/gt/FeatureMapping.java b/src/main/java/org/variantsync/vevos/extraction/gt/FeatureMapping.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.common;
+package org.variantsync.vevos.extraction.gt;
 
 public record FeatureMapping(String mapping) {
 
diff --git a/src/main/java/org/variantsync/vevos/extraction/gt/FileGT.java b/src/main/java/org/variantsync/vevos/extraction/gt/FileGT.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.common;
+package org.variantsync.vevos.extraction.gt;
 
 import org.tinylog.Logger;
 import org.variantsync.diffdetective.util.Assert;
@@ -114,7 +114,6 @@ public void growIfRequired(int size) {
     }
 
     /**
-     *
      * @return A flag that states whether this ground truth has been consumed by completing it. If true, the ground truth
      * can no longer be changed.
      */
diff --git a/src/main/java/org/variantsync/vevos/extraction/gt/GroundTruth.java b/src/main/java/org/variantsync/vevos/extraction/gt/GroundTruth.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.common;
+package org.variantsync.vevos.extraction.gt;
 
 import java.io.Serializable;
 import java.util.*;
diff --git a/src/main/java/org/variantsync/vevos/extraction/gt/LineAnnotation.java b/src/main/java/org/variantsync/vevos/extraction/gt/LineAnnotation.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.common;
+package org.variantsync.vevos.extraction.gt;
 
 
 import java.io.Serializable;
diff --git a/src/main/java/org/variantsync/vevos/extraction/gt/PresenceCondition.java b/src/main/java/org/variantsync/vevos/extraction/gt/PresenceCondition.java
@@ -1,4 +1,4 @@
-package org.variantsync.vevos.extraction.common;
+package org.variantsync.vevos.extraction.gt;
 
 public record PresenceCondition(String condition) {
     @Override
diff --git a/src/test/java/org/variantsync/vevos/extraction/FileGTTest.java b/src/test/java/org/variantsync/vevos/extraction/FileGTTest.java
@@ -2,10 +2,10 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.variantsync.vevos.extraction.common.FeatureMapping;
-import org.variantsync.vevos.extraction.common.FileGT;
-import org.variantsync.vevos.extraction.common.LineAnnotation;
-import org.variantsync.vevos.extraction.common.PresenceCondition;
+import org.variantsync.vevos.extraction.gt.FeatureMapping;
+import org.variantsync.vevos.extraction.gt.FileGT;
+import org.variantsync.vevos.extraction.gt.LineAnnotation;
+import org.variantsync.vevos.extraction.gt.PresenceCondition;
 
 import java.util.Collections;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.variantsync.vevos.extraction.common;`
	`1`	`+package org.variantsync.vevos.extraction.gt;`
`2`	`2`
`3`	`3`	`import java.io.Serializable;`
`4`	`4`	`import java.util.Objects;`