remove boilerplate Variation(Tree|Diff)Transformer

These where interfaces without a real purpose.

Author: pmbittner

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

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

src/main/java/org/variantsync/diffdetective/internal/SimpleRenderer.java

@@ -19,7 +19,6 @@
 import org.variantsync.diffdetective.variation.diff.render.VariationDiffRenderer;
 import org.variantsync.diffdetective.variation.diff.serialize.nodeformat.MappingsDiffNodeFormat;
 import org.variantsync.diffdetective.variation.diff.transform.Transformer;
-import org.variantsync.diffdetective.variation.diff.transform.VariationDiffTransformer;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -163,7 +162,7 @@ public static void main(String[] args) throws IOException {
             final Repository repository = Repository.fromDirectory(repoPath, repoName);
             repository.setParseOptions(repository.getParseOptions().withDiffStoragePolicy(PatchDiffParseOptions.DiffStoragePolicy.REMEMBER_STRIPPED_DIFF));
 
-            final List<VariationDiffTransformer<DiffLinesLabel>> transform = VariationDiffMiner.Postprocessing(repository);
+            final List<Transformer<VariationDiff<DiffLinesLabel>>> transform = VariationDiffMiner.Postprocessing(repository);
             final PatchDiff patch = VariationDiffParser.parsePatch(repository, file, commit);
             Assert.assertNotNull(patch != null);
             Transformer.apply(transform, patch.getVariationDiff());

src/main/java/org/variantsync/diffdetective/mining/VariationDiffMiner.java

@@ -13,14 +13,15 @@
 import org.variantsync.diffdetective.mining.formats.MiningNodeFormat;
 import org.variantsync.diffdetective.mining.formats.ReleaseMiningDiffNodeFormat;
 import org.variantsync.diffdetective.variation.DiffLinesLabel;
+import org.variantsync.diffdetective.variation.diff.VariationDiff;
 import org.variantsync.diffdetective.variation.diff.filter.VariationDiffFilter;
 import org.variantsync.diffdetective.variation.diff.serialize.GraphFormat;
 import org.variantsync.diffdetective.variation.diff.serialize.LineGraphExportOptions;
 import org.variantsync.diffdetective.variation.diff.serialize.edgeformat.EdgeLabelFormat;
 import org.variantsync.diffdetective.variation.diff.serialize.treeformat.CommitDiffVariationDiffLabelFormat;
 import org.variantsync.diffdetective.variation.diff.transform.CollapseNestedNonEditedAnnotations;
 import org.variantsync.diffdetective.variation.diff.transform.CutNonEditedSubtrees;
-import org.variantsync.diffdetective.variation.diff.transform.VariationDiffTransformer;
+import org.variantsync.diffdetective.variation.diff.transform.Transformer;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -38,8 +39,8 @@ public class VariationDiffMiner {
 //    public static final int PRINT_LARGEST_SUBJECTS = 3;
     public static final boolean DEBUG_TEST = false;
 
-    public static List<VariationDiffTransformer<DiffLinesLabel>> Postprocessing(final Repository repository) {
-        final List<VariationDiffTransformer<DiffLinesLabel>> processing = new ArrayList<>();
+    public static List<Transformer<VariationDiff<DiffLinesLabel>>> Postprocessing(final Repository repository) {
+        final List<Transformer<VariationDiff<DiffLinesLabel>>> processing = new ArrayList<>();
         processing.add(new CutNonEditedSubtrees<>());
         processing.add(new CollapseNestedNonEditedAnnotations());
         return processing;

src/main/java/org/variantsync/diffdetective/mining/postprocessing/Postprocessor.java

@@ -8,7 +8,6 @@
 import org.variantsync.diffdetective.variation.diff.filter.TaggedPredicate;
 import org.variantsync.diffdetective.variation.diff.transform.CutNonEditedSubtrees;
 import org.variantsync.diffdetective.variation.diff.transform.Transformer;
-import org.variantsync.diffdetective.variation.diff.transform.VariationDiffTransformer;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +17,7 @@
  * Patterns are represented as VariationDiffs and might be filtered or transformed.
  */
 public class Postprocessor<L extends Label> {
-    private final List<VariationDiffTransformer<L>> transformers;
+    private final List<Transformer<VariationDiff<L>>> transformers;
     private final ExplainedFilter<VariationDiff<L>> filters;
 
     /**
@@ -31,7 +30,7 @@ public class Postprocessor<L extends Label> {
     public record Result<L extends Label>(List<VariationDiff<L>> processedTrees, Map<String, Integer> filterCounts) {}
 
     private Postprocessor(
-            final List<VariationDiffTransformer<L>> transformers,
+            final List<Transformer<VariationDiff<L>>> transformers,
             final List<TaggedPredicate<String, ? super VariationDiff<L>>> namedFilters) {
         this.transformers = transformers;
         this.filters = new ExplainedFilter<VariationDiff<L>>(namedFilters.stream());

src/main/java/org/variantsync/diffdetective/variation/diff/transform/CollapseNestedNonEditedAnnotations.java

@@ -31,7 +31,7 @@
  *
  * @author Paul Bittner
  */
-public class CollapseNestedNonEditedAnnotations implements VariationDiffTransformer<DiffLinesLabel> {
+public class CollapseNestedNonEditedAnnotations implements Transformer<VariationDiff<DiffLinesLabel>> {
     private final List<Stack<DiffNode<DiffLinesLabel>>> chainCandidates = new ArrayList<>();
     private final List<Stack<DiffNode<DiffLinesLabel>>> chains = new ArrayList<>();
 

src/main/java/org/variantsync/diffdetective/variation/diff/transform/CutNonEditedSubtrees.java

@@ -19,7 +19,7 @@
  * of our edit classes in our ESEC/FSE'22 paper.
  * @author Paul Bittner
  */
-public class CutNonEditedSubtrees<L extends Label> implements VariationDiffTransformer<L>, VariationDiffVisitor<L> {
+public class CutNonEditedSubtrees<L extends Label> implements Transformer<VariationDiff<L>>, VariationDiffVisitor<L> {
     private final boolean keepDummy;
 
     /**

src/main/java/org/variantsync/diffdetective/variation/diff/transform/EliminateEmptyAlternatives.java

@@ -35,7 +35,7 @@
  *
  * @author Paul Bittner
  */
-public class EliminateEmptyAlternatives<L extends Label> implements VariationTreeTransformer<L> {
+public class EliminateEmptyAlternatives<L extends Label> implements Transformer<VariationTree<L>> {
     private void elim(VariationTreeNode<L> subtree) {
         // We simplify only annotations.
         if (!subtree.isAnnotation()) return;

src/main/java/org/variantsync/diffdetective/variation/diff/transform/FeatureExpressionFilter.java

@@ -13,7 +13,7 @@
  * For example, it might remove an IF but keep its ELSE branches which is illegal.
  */
 @Deprecated
-public record FeatureExpressionFilter<L extends Label>(Predicate<DiffNode<L>> isFeatureAnnotation) implements VariationDiffTransformer<L> {
+public record FeatureExpressionFilter<L extends Label>(Predicate<DiffNode<L>> isFeatureAnnotation) implements Transformer<VariationDiff<L>> {
     @Override
     public void transform(VariationDiff<L> variationDiff) {
         final List<DiffNode<L>> illegalNodes = new ArrayList<>();

src/main/java/org/variantsync/diffdetective/variation/diff/transform/LabelWithEditClass.java

@@ -15,8 +15,8 @@
  * All other nodes will be labeled by the {@link NodeType#name name of their node type}.
  * @author Paul Bittner
  */
-public class LabelWithEditClass implements VariationDiffTransformer<DiffLinesLabel> {
-    private final VariationDiffTransformer<DiffLinesLabel> relabelNodes;
+public class LabelWithEditClass implements Transformer<VariationDiff<DiffLinesLabel>> {
+    private final Transformer<VariationDiff<DiffLinesLabel>> relabelNodes;
 
     /**
      * Creates a new transformation that will use the given catalog of edit classes

src/main/java/org/variantsync/diffdetective/variation/diff/transform/NaiveMovedArtifactDetection.java

@@ -20,7 +20,7 @@
  * but for each line in the nodes individually.
  * @author Paul Bittner
  */
-public class NaiveMovedArtifactDetection<L extends Label> implements VariationDiffTransformer<L> {
+public class NaiveMovedArtifactDetection<L extends Label> implements Transformer<VariationDiff<L>> {
     @Override
     public void transform(final VariationDiff<L> variationDiff) {
         final List<Pair<DiffNode<L>, DiffNode<L>>> twins = findArtifactTwins(variationDiff);