Further cleanup

jplag/src/main/java/de/jplag/Match.java

@@ -2,42 +2,11 @@ package de.jplag;
 
 /**
  * Represents two sections of two submissions that are similar.
+ * @param startOfFirst is the starting token index in the first submission.
+ * @param startOfSecond is the starting token index in the second submission.
+ * @param length is the length of these similar sections (number of tokens).
  */
 public record Match(int startOfFirst, int startOfSecond, int length) {
-
-    /**
-     * Creates a match.
-     * @param startOfFirst is the starting token index in the first submission.
-     * @param startOfSecond is the starting token index in the second submission.
-     * @param length is the length of these similar sections (number of tokens).
-     */
-    public Match {
-    }
-
-    /**
-     * @return the starting index in the first submission.
-     */
-    @Override
-    public int startOfFirst() {
-        return startOfFirst;
-    }
-
-    /**
-     * @return the starting index in the second submission.
-     */
-    @Override
-    public int startOfSecond() {
-        return startOfSecond;
-    }
-
-    /**
-     * @return the length of the similar sections, meaning the number of tokens.
-     */
-    @Override
-    public int length() {
-        return length;
-    }
-
     /**
      * Checks if two matches overlap.
      * @return true if they do.

jplag/src/main/java/de/jplag/reporting/reportobject/model/ComparisonReport.java

@@ -8,7 +8,6 @@ public record ComparisonReport(@JsonProperty("first_submission_id") String first
         @JsonProperty("second_submission_id") String secondSubmissionId, @JsonProperty("match_percentage") float matchPercentage,
         @JsonProperty("files_of_first_submission") List<FilesOfSubmission> filesOfFirstSubmission,
         @JsonProperty("files_of_second_submission") List<FilesOfSubmission> filesOfSecondSubmission, @JsonProperty("matches") List<Match> matches) {
-
     public ComparisonReport(String firstSubmissionId, String secondSubmissionId, float matchPercentage,
             List<FilesOfSubmission> filesOfFirstSubmission, List<FilesOfSubmission> filesOfSecondSubmission, List<Match> matches) {
 
@@ -19,34 +18,4 @@ public record ComparisonReport(@JsonProperty("first_submission_id") String first
         this.filesOfSecondSubmission = List.copyOf(filesOfSecondSubmission);
         this.matches = matches;
     }
-
-    @Override
-    public String firstSubmissionId() {
-        return firstSubmissionId;
-    }
-
-    @Override
-    public String secondSubmissionId() {
-        return secondSubmissionId;
-    }
-
-    @Override
-    public float matchPercentage() {
-        return matchPercentage;
-    }
-
-    @Override
-    public List<FilesOfSubmission> filesOfFirstSubmission() {
-        return filesOfFirstSubmission;
-    }
-
-    @Override
-    public List<FilesOfSubmission> filesOfSecondSubmission() {
-        return filesOfSecondSubmission;
-    }
-
-    @Override
-    public List<Match> matches() {
-        return matches;
-    }
 }

jplag/src/main/java/de/jplag/reporting/reportobject/model/Match.java

@@ -5,49 +5,4 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public record Match(@JsonProperty("first_file_name") String firstFileName, @JsonProperty("second_file_name") String secondFileName,
         @JsonProperty("start_in_first") int startInFirst, @JsonProperty("end_in_first") int endInFirst,
         @JsonProperty("start_in_second") int startInSecond, @JsonProperty("end_in_second") int endInSecond, @JsonProperty("tokens") int tokens) {
-
-    public Match(String firstFileName, String secondFileName, int startInFirst, int endInFirst, int startInSecond, int endInSecond, int tokens) {
-        this.firstFileName = firstFileName;
-        this.secondFileName = secondFileName;
-        this.startInFirst = startInFirst;
-        this.endInFirst = endInFirst;
-        this.startInSecond = startInSecond;
-        this.endInSecond = endInSecond;
-        this.tokens = tokens;
-    }
-
-    @Override
-    public String firstFileName() {
-        return firstFileName;
-    }
-
-    @Override
-    public String secondFileName() {
-        return secondFileName;
-    }
-
-    @Override
-    public int startInFirst() {
-        return startInFirst;
-    }
-
-    @Override
-    public int endInFirst() {
-        return endInFirst;
-    }
-
-    @Override
-    public int startInSecond() {
-        return startInSecond;
-    }
-
-    @Override
-    public int endInSecond() {
-        return endInSecond;
-    }
-
-    @Override
-    public int tokens() {
-        return tokens;
-    }
 }

jplag/src/main/java/de/jplag/reporting/reportobject/model/Metric.java

@@ -13,24 +13,4 @@ public record Metric(@JsonProperty("name") String name, @JsonProperty("threshold
         this.distribution = List.copyOf(distribution);
         this.topComparisons = List.copyOf(topComparisons);
     }
-
-    @Override
-    public String name() {
-        return name;
-    }
-
-    @Override
-    public float threshold() {
-        return threshold;
-    }
-
-    @Override
-    public List<Integer> distribution() {
-        return distribution;
-    }
-
-    @Override
-    public List<TopComparison> topComparisons() {
-        return topComparisons;
-    }
 }

jplag/src/main/java/de/jplag/reporting/reportobject/model/TopComparison.java

@@ -4,26 +4,4 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public record TopComparison(@JsonProperty("first_submission") String firstSubmission, @JsonProperty("second_submission") String secondSubmission,
         @JsonProperty("match_percentage") float matchPercentage) {
-
-    public TopComparison(String firstSubmission, String secondSubmission, float matchPercentage) {
-        this.firstSubmission = firstSubmission;
-        this.secondSubmission = secondSubmission;
-        this.matchPercentage = matchPercentage;
-    }
-
-    @Override
-    public String firstSubmission() {
-        return firstSubmission;
-    }
-
-    @Override
-    public String secondSubmission() {
-        return secondSubmission;
-    }
-
-    @Override
-    public float matchPercentage() {
-        return matchPercentage;
-    }
-
 }

jplag/src/main/java/de/jplag/strategy/AbstractComparisonStrategy.java

@@ -19,7 +19,7 @@ public abstract class AbstractComparisonStrategy implements ComparisonStrategy {
 
     private final GreedyStringTiling greedyStringTiling;
 
-    protected JPlagOptions options;
+    protected final JPlagOptions options;
 
     protected AbstractComparisonStrategy(JPlagOptions options, GreedyStringTiling greedyStringTiling) {
         this.greedyStringTiling = greedyStringTiling;

jplag/src/main/java/de/jplag/strategy/ComparisonMode.java

@@ -14,7 +14,7 @@ public enum ComparisonMode {
     private final String name;
     private final String description;
 
-    private ComparisonMode(String description) {
+    ComparisonMode(String description) {
         this.description = description;
         name = toString().toLowerCase();
     }

jplag/src/test/java/de/jplag/BaseCodeTest.java

@@ -52,7 +52,7 @@ public class BaseCodeTest extends TestBase {
     }
 
     @Test
-    void testInvalidRoot() throws ExitException {
+    void testInvalidRoot() {
         assertThrows(RootDirectoryException.class, () -> runJPlag("basecode", it -> it.setSubmissionDirectories(List.of("WrongRoot"))));
     }
 

jplag/src/test/java/de/jplag/NormalComparisonTest.java

@@ -37,9 +37,7 @@ class NormalComparisonTest extends TestBase {
         assertEquals(3, result.getNumberOfSubmissions());
         assertEquals(3, result.getComparisons().size());
 
-        result.getComparisons().forEach(comparison -> {
-            assertEquals(0f, comparison.similarity(), 0.1f);
-        });
+        result.getComparisons().forEach(comparison -> assertEquals(0f, comparison.similarity(), 0.1f));
     }
 
     /**
@@ -112,7 +110,7 @@ class NormalComparisonTest extends TestBase {
     }
 
     @Test
-    public void testMultiRootDirBasecodeName() throws ExitException {
+    public void testMultiRootDirBasecodeName() {
         List<String> paths = List.of(getBasePath("basecode"), getBasePath("SimpleDuplicate"));
         String basecodePath = "base"; // Should *not* find basecode/base
         assertThrows(BasecodeException.class, () -> runJPlag(paths, it -> it.setBaseCodeSubmissionName(basecodePath)));

jplag/src/test/java/de/jplag/ParallelComparisonTest.java

@@ -41,9 +41,7 @@ public class ParallelComparisonTest extends TestBase {
         assertEquals(3, result.getNumberOfSubmissions());
         assertEquals(3, result.getComparisons().size());
 
-        result.getComparisons().forEach(comparison -> {
-            assertEquals(0f, comparison.similarity(), DELTA);
-        });
+        result.getComparisons().forEach(comparison -> assertEquals(0f, comparison.similarity(), DELTA));
     }
 
     /**

jplag/src/test/java/de/jplag/clustering/algorithm/BayesianOptimizationTest.java

@@ -6,10 +6,10 @@ import org.apache.commons.math3.linear.ArrayRealVector;
 import org.apache.commons.math3.linear.RealVector;
 import org.junit.jupiter.api.Test;
 
-public class BayesianOptimizationTest {
+class BayesianOptimizationTest {
 
     @Test
-    public void findParabolaMax() {
+    void findParabolaMax() {
         RealVector minima = new ArrayRealVector(new double[] {-20});
         RealVector maxima = new ArrayRealVector(new double[] {10});
         RealVector lengthScale = new ArrayRealVector(new double[] {5});
@@ -19,7 +19,7 @@ public class BayesianOptimizationTest {
             double val = v.getEntry(0);
             double result = -(val - maximumAt) * (val - maximumAt);
             result += 0.2 * (Math.random() - 0.5);
-            return new BayesianOptimization.OptimizationResult<Double>(result, result);
+            return new BayesianOptimization.OptimizationResult<>(result, result);
         }).getParams().getEntry(0);
         assertEquals(maximumAt, maximumPoint, 1);
     }

jplag/src/test/java/de/jplag/clustering/algorithm/ClusteringData.java

@@ -38,7 +38,7 @@ public enum ClusteringData {
     private final Set<Set<Integer>> expected;
     private final ClusteringOptions options;
 
-    private ClusteringData(Supplier<RealMatrix> similarity, int[][] expected, ClusteringOptions.Builder options) {
+    ClusteringData(Supplier<RealMatrix> similarity, int[][] expected, ClusteringOptions.Builder options) {
         this.similarity = similarity.get();
         this.expected = makeSets(
                 Arrays.stream(expected).map(intArray -> Arrays.stream(intArray).boxed().collect(Collectors.toList())).collect(Collectors.toList()));

jplag/src/test/java/de/jplag/clustering/preprocessors/PreprocessingTestBase.java

@@ -50,7 +50,7 @@ public class PreprocessingTestBase {
 
         assertTrue(usedOriginalIndices.stream().allMatch(index -> index >= 0 && index < original.getColumnDimension()), "original indices valid");
 
-        double[] columnNorms = IntStream.range(0, result.getColumnDimension()).mapToObj(index -> result.getColumn(index))
+        double[] columnNorms = IntStream.range(0, result.getColumnDimension()).mapToObj(result::getColumn)
                 .mapToDouble(array -> new ArrayRealVector(array, false).getNorm()).toArray();
 
         for (int i = 0; i < columnNorms.length; i++) {