Generalize the label of DiffNode and VariationNode

This will be used to encode variation trees of variation trees.

Author: ibbem

src/main/java/org/variantsync/diffdetective/analysis/Analysis.java

@@ -25,6 +25,7 @@
 import org.variantsync.diffdetective.util.Clock;
 import org.variantsync.diffdetective.util.Diagnostics;
 import org.variantsync.diffdetective.util.InvocationCounter;
+import org.variantsync.diffdetective.variation.DiffLinesLabel;
 import org.variantsync.diffdetective.variation.diff.DiffTree;
 import org.variantsync.functjonal.iteration.ClusteredIterator;
 import org.variantsync.functjonal.iteration.MappedIterator;
@@ -64,7 +65,7 @@ public class Analysis {
     protected RevCommit currentCommit;
     protected CommitDiff currentCommitDiff;
     protected PatchDiff currentPatch;
-    protected DiffTree currentDiffTree;
+    protected DiffTree<DiffLinesLabel> currentDiffTree;
 
     protected final Path outputDir;
     protected Path outputFile;
@@ -106,7 +107,7 @@ public PatchDiff getCurrentPatch() {
      * The currently processed patch.
      * Valid only during {@link Hooks#analyzeDiffTree}.
      */
-    public DiffTree getCurrentDiffTree() {
+    public DiffTree<DiffLinesLabel> getCurrentDiffTree() {
         return currentDiffTree;
     }
 

src/main/java/org/variantsync/diffdetective/analysis/EditClassOccurenceAnalysis.java

@@ -27,7 +27,7 @@ public EditClassOccurenceAnalysis(AnalysisStrategy exportStrategy) {
 
     @Override
     public void initializeResults(Analysis analysis) {
-        analysis.append(EditClassCount.KEY, new EditClassCount());
+        analysis.append(EditClassCount.KEY, new EditClassCount(ProposedEditClasses.Instance));
     }
 
     @Override

src/main/java/org/variantsync/diffdetective/analysis/FilterAnalysis.java

@@ -3,20 +3,21 @@
 import java.util.Arrays;
 
 import org.variantsync.diffdetective.metadata.ExplainedFilterSummary;
+import org.variantsync.diffdetective.variation.DiffLinesLabel;
 import org.variantsync.diffdetective.variation.diff.DiffTree;
 import org.variantsync.diffdetective.variation.diff.filter.ExplainedFilter;
 import org.variantsync.diffdetective.variation.diff.filter.TaggedPredicate;
 
 public class FilterAnalysis implements Analysis.Hooks {
-    private ExplainedFilter<DiffTree> treeFilter;
+    private ExplainedFilter<DiffTree<? extends DiffLinesLabel>> treeFilter;
 
-    public FilterAnalysis(ExplainedFilter<DiffTree> treeFilter) {
+    public FilterAnalysis(ExplainedFilter<DiffTree<? extends DiffLinesLabel>> treeFilter) {
         this.treeFilter = treeFilter;
     }
 
     @SafeVarargs
-    public FilterAnalysis(TaggedPredicate<String, DiffTree>... treeFilter) {
-        this.treeFilter = new ExplainedFilter<DiffTree>(Arrays.stream(treeFilter));
+    public FilterAnalysis(TaggedPredicate<String, DiffTree<? extends DiffLinesLabel>>... treeFilter) {
+        this.treeFilter = new ExplainedFilter<>(Arrays.stream(treeFilter));
     }
 
     @Override

src/main/java/org/variantsync/diffdetective/analysis/LineGraphExportAnalysis.java

@@ -7,6 +7,7 @@
 import org.variantsync.diffdetective.analysis.AnalysisResult.ResultKey;
 import org.variantsync.diffdetective.analysis.strategies.AnalysisStrategy;
 import org.variantsync.diffdetective.metadata.Metadata;
+import org.variantsync.diffdetective.variation.DiffLinesLabel;
 import org.variantsync.diffdetective.variation.diff.serialize.LineGraphExport;
 import org.variantsync.diffdetective.variation.diff.serialize.LineGraphExportOptions;
 import org.variantsync.functjonal.category.InplaceSemigroup;
@@ -45,10 +46,10 @@ public void setFromSnapshot(LinkedHashMap<String, String> snap) {
     }
 
     private final AnalysisStrategy analysisStrategy;
-    private final LineGraphExportOptions exportOptions;
+    private final LineGraphExportOptions<? super DiffLinesLabel> exportOptions;
     private OutputStream lineGraphDestination;
 
-    public LineGraphExportAnalysis(final AnalysisStrategy analysisStrategy, final LineGraphExportOptions exportOptions) {
+    public LineGraphExportAnalysis(final AnalysisStrategy analysisStrategy, final LineGraphExportOptions<? super DiffLinesLabel> exportOptions) {
         this.analysisStrategy = analysisStrategy;
         this.exportOptions = exportOptions;
     }

src/main/java/org/variantsync/diffdetective/analysis/PreprocessingAnalysis.java

@@ -4,15 +4,17 @@
 import java.util.List;
 
 import org.variantsync.diffdetective.variation.diff.transform.DiffTreeTransformer;
+import org.variantsync.diffdetective.variation.DiffLinesLabel;
 
 public class PreprocessingAnalysis implements Analysis.Hooks {
-    private final List<DiffTreeTransformer> preprocessors;
+    private final List<DiffTreeTransformer<DiffLinesLabel>> preprocessors;
 
-    public PreprocessingAnalysis(List<DiffTreeTransformer> preprocessors) {
+    public PreprocessingAnalysis(List<DiffTreeTransformer<DiffLinesLabel>> preprocessors) {
         this.preprocessors = preprocessors;
     }
 
-    public PreprocessingAnalysis(DiffTreeTransformer... preprocessors) {
+    @SafeVarargs
+    public PreprocessingAnalysis(DiffTreeTransformer<DiffLinesLabel>... preprocessors) {
         this.preprocessors = Arrays.asList(preprocessors);
     }
 

src/main/java/org/variantsync/diffdetective/diff/git/GitDiffer.java

@@ -21,6 +21,7 @@
 import org.variantsync.diffdetective.preliminary.GitDiff;
 import org.variantsync.diffdetective.util.Assert;
 import org.variantsync.diffdetective.util.StringUtils;
+import org.variantsync.diffdetective.variation.DiffLinesLabel;
 import org.variantsync.diffdetective.variation.diff.DiffTree;
 import org.variantsync.diffdetective.variation.diff.parse.DiffTreeParser;
 import org.variantsync.functjonal.iteration.MappedIterator;
@@ -36,7 +37,6 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 /**
  * This class creates a GitDiff-object from a git repository (Git-object).
@@ -375,7 +375,7 @@ private static CommitDiffResult getPatchDiffs(
                         fullDiff += StringUtils.LINEBREAK;
                     }
 
-                    final DiffTree diffTree = DiffTreeParser.createDiffTree(
+                    final DiffTree<DiffLinesLabel> diffTree = DiffTreeParser.createDiffTree(
                             fullDiff,
                             parseOptions.diffTreeParseOptions()
                     );

src/main/java/org/variantsync/diffdetective/diff/git/PatchDiff.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.eclipse.jgit.diff.DiffEntry;
+import org.variantsync.diffdetective.variation.DiffLinesLabel;
 import org.variantsync.diffdetective.variation.diff.DiffTree;
 
 /**
@@ -13,7 +14,7 @@
  */
 public class PatchDiff implements GitPatch {
     private final String fullDiff;
-    private final DiffTree diffTree;
+    private final DiffTree<DiffLinesLabel> diffTree;
 
     /**
      * The commit the patch belongs to.
@@ -38,7 +39,7 @@ public class PatchDiff implements GitPatch {
      * @param diffTree The {@link DiffTree} that describes this patch.
      */
     public PatchDiff(CommitDiff commitDiff, DiffEntry diffEntry, String fullDiff,
-                     DiffTree diffTree) {
+                     DiffTree<DiffLinesLabel> diffTree) {
         this.commitDiff = commitDiff;
         this.changeType = diffEntry.getChangeType();
         this.path = diffEntry.getNewPath();
@@ -91,7 +92,7 @@ public String getDiff() {
     /**
      * Returns the DiffTree for this patch.
      */
-    public DiffTree getDiffTree() {
+    public DiffTree<DiffLinesLabel> getDiffTree() {
         return diffTree;
     }
 

src/main/java/org/variantsync/diffdetective/editclass/EditClass.java

@@ -9,7 +9,7 @@
  * Abstract edit class according to our ESEC/FSE'22 paper.
  * @author Paul Bittner, Sören Viegener
  */
-public abstract class EditClass extends Pattern<DiffNode> {
+public abstract class EditClass extends Pattern<DiffNode<?>> {
     private final DiffType diffType;
 
     /**
@@ -33,20 +33,20 @@ public DiffType getDiffType() {
      * Returns true iff the given node matches this edit class.
      * @param artifactNode Node which has node type ARTIFACT and whose DiffType is the same as {@link getDiffType()}.
      */
-    protected abstract boolean matchesArtifactNode(DiffNode artifactNode);
+    protected abstract boolean matchesArtifactNode(DiffNode<?> artifactNode);
 
     /**
      * Returns true if this edit class matches the given node and is an artifact.
      */
     @Override
-    public final boolean matches(DiffNode node) {
+    public final boolean matches(DiffNode<?> node) {
         return node.isArtifact() && node.diffType == diffType && matchesArtifactNode(node);
     }
 
     /**
      * Returns true iff this edit class matches at leat one node on the given tree.
      */
-    public boolean anyMatch(final DiffTree t) {
+    public boolean anyMatch(final DiffTree<?> t) {
         return t.anyMatch(this::matches);
     }
 }

src/main/java/org/variantsync/diffdetective/editclass/EditClassCatalogue.java

@@ -32,7 +32,7 @@ public interface EditClassCatalogue {
      * @param node The node of which to find its edit class.
      * @return Returns the edit class that matches the given node.
      */
-    default EditClass match(DiffNode node)
+    default EditClass match(DiffNode<?> node)
     {
         if (!node.isArtifact()) {
             throw new IllegalArgumentException("Expected an artifact node but got " + node.nodeType + "!");

src/main/java/org/variantsync/diffdetective/editclass/proposed/AddToPC.java

@@ -1,6 +1,7 @@
 package org.variantsync.diffdetective.editclass.proposed;
 
 import org.variantsync.diffdetective.editclass.EditClass;
+import org.variantsync.diffdetective.variation.Label;
 import org.variantsync.diffdetective.variation.diff.DiffNode;
 import org.variantsync.diffdetective.variation.diff.DiffType;
 
@@ -16,7 +17,7 @@ final class AddToPC extends EditClass {
     }
 
     @Override
-    protected boolean matchesArtifactNode(DiffNode node) {
+    protected boolean matchesArtifactNode(DiffNode<?> node) {
         return !node.getParent(AFTER).isAdd();
     }
 }