sort cpd results

Author: nidi3

code-assert/src/main/java/guru/nidi/codeassert/checkstyle/CheckstyleResult.java

@@ -22,8 +22,8 @@
 import java.util.List;
 
 public class CheckstyleResult extends AnalyzerResult<List<AuditEvent>> {
-    public CheckstyleResult(Analyzer<List<AuditEvent>> analyzer,
-                            List<AuditEvent> findings, List<String> unusedActions) {
+    CheckstyleResult(Analyzer<List<AuditEvent>> analyzer,
+                     List<AuditEvent> findings, List<String> unusedActions) {
         super(analyzer, findings, unusedActions);
     }
 }

code-assert/src/main/java/guru/nidi/codeassert/dependency/DependencyResult.java

@@ -21,8 +21,8 @@
 import java.util.List;
 
 public class DependencyResult extends AnalyzerResult<Dependencies> {
-    public DependencyResult(Analyzer<Dependencies> analyzer,
-                            Dependencies findings, List<String> unusedActions) {
+    DependencyResult(Analyzer<Dependencies> analyzer,
+                     Dependencies findings, List<String> unusedActions) {
         super(analyzer, findings, unusedActions);
     }
 }

code-assert/src/main/java/guru/nidi/codeassert/findbugs/FindBugsResult.java

@@ -22,8 +22,8 @@
 import java.util.List;
 
 public class FindBugsResult extends AnalyzerResult<List<BugInstance>> {
-    public FindBugsResult(Analyzer<List<BugInstance>> analyzer,
-                          List<BugInstance> findings, List<String> unusedActions) {
+    FindBugsResult(Analyzer<List<BugInstance>> analyzer,
+                   List<BugInstance> findings, List<String> unusedActions) {
         super(analyzer, findings, unusedActions);
     }
 }

code-assert/src/main/java/guru/nidi/codeassert/jacoco/JacocoResult.java

@@ -24,8 +24,8 @@
 public class JacocoResult extends AnalyzerResult<List<ValuedLocation>> {
     private final CoverageType[] types;
 
-    public JacocoResult(Analyzer<List<ValuedLocation>> analyzer, List<ValuedLocation> findings,
-                        List<String> unusedActions, CoverageType[] types) {
+    JacocoResult(Analyzer<List<ValuedLocation>> analyzer, List<ValuedLocation> findings,
+                 List<String> unusedActions, CoverageType[] types) {
         super(analyzer, findings, unusedActions);
         this.types = types;
     }

code-assert/src/main/java/guru/nidi/codeassert/pmd/CpdAnalyzer.java

@@ -23,13 +23,16 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.StreamSupport;
 
 import static java.util.stream.Collectors.toList;
 
 public class CpdAnalyzer implements Analyzer<List<Match>> {
+    private static final Comparator<Match> MATCH_SORTER = Comparator
+            .comparingInt(Match::getTokenCount).reversed()
+            .thenComparing(m -> m.getFirstMark().getFilename());
+
     private final AnalyzerConfig config;
     private final int minTokens;
     private final CpdMatchCollector collector;
@@ -71,6 +74,7 @@ private CpdResult processMatches(Iterator<Match> matches) {
         final Iterable<Match> miter = () -> matches;
         final List<Match> res = StreamSupport.stream(miter.spliterator(), false)
                 .filter(m -> counter.accept(collector.accept(m)))
+                .sorted(MATCH_SORTER)
                 .collect(toList());
         collector.printUnusedWarning(counter);
         return new CpdResult(this, res, collector.unusedActions(counter));

code-assert/src/main/java/guru/nidi/codeassert/pmd/CpdResult.java

@@ -22,7 +22,7 @@
 import java.util.List;
 
 public class CpdResult extends AnalyzerResult<List<Match>> {
-    public CpdResult(Analyzer<List<Match>> analyzer, List<Match> findings, List<String> unusedActions) {
+    CpdResult(Analyzer<List<Match>> analyzer, List<Match> findings, List<String> unusedActions) {
         super(analyzer, findings, unusedActions);
     }
 }

code-assert/src/main/java/guru/nidi/codeassert/pmd/PmdResult.java

@@ -22,7 +22,7 @@
 import java.util.List;
 
 public class PmdResult extends AnalyzerResult<List<RuleViolation>> {
-    public PmdResult(Analyzer<List<RuleViolation>> analyzer, List<RuleViolation> findings, List<String> unusedActions) {
+    PmdResult(Analyzer<List<RuleViolation>> analyzer, List<RuleViolation> findings, List<String> unusedActions) {
         super(analyzer, findings, unusedActions);
     }
 }