fix tests, update dependencies

Author: nidi3

code-assert/pom.xml

@@ -15,8 +15,8 @@
     <properties>
         <slf4j.version>1.7.25</slf4j.version>
         <checkstyle.version>6.19</checkstyle.version>
-        <findbugs.version>3.1.11</findbugs.version>
-        <findsecbugs.version>1.8.0</findsecbugs.version>
+        <findbugs.version>3.1.12</findbugs.version>
+        <findsecbugs.version>1.9.0</findsecbugs.version>
         <pmd.version>5.8.1</pmd.version>
         <kotlin.version>1.2.61</kotlin.version>
         <detekt.version>1.0.0.RC9.2</detekt.version>

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

@@ -69,6 +69,12 @@ public DependencyMap getMissing() {
         return missing;
     }
 
+    public <T> List<String> getMissing(String from, Iterable<T> to, Function<T, String> toPack) {
+        return missing.getDependencies(from).keySet().stream().filter(miss ->
+                StreamSupport.stream(to.spliterator(), false).noneMatch(p -> toPack.apply(p).equals(miss))
+        ).collect(toList());
+    }
+
     public DependencyMap getDenied() {
         return denied;
     }
@@ -89,12 +95,6 @@ public boolean isDenied(String from, String to) {
         return denied.getDependency(from, to) != null;
     }
 
-    public <T> List<String> getMissing(String from, Iterable<T> to, Function<T, String> toPack) {
-        return missing.getDependencies(from).keySet().stream().filter(miss ->
-                StreamSupport.stream(to.spliterator(), false).noneMatch(p -> toPack.apply(p).equals(miss))
-        ).collect(toList());
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {

code-assert/src/main/java/guru/nidi/codeassert/io/ModelVisualizer.java

@@ -27,19 +27,9 @@
 
 public class ModelVisualizer {
     private final Model model;
-    private final Function<String, String> labelFunc;
 
     public ModelVisualizer(Model model) {
-        this(model, n -> n);
-    }
-
-    public ModelVisualizer(Model model, Function<String, String> labelFunc) {
         this.model = model;
-        this.labelFunc = labelFunc;
-    }
-
-    public ModelVisualizer labelFunc(Function<String, String> labelFunc) {
-        return new ModelVisualizer(model, labelFunc);
     }
 
     public Visualized visualizePackages(Function<CodePackage, MutableNode> transform) {
@@ -49,22 +39,22 @@ public Visualized visualizePackages(Function<CodePackage, MutableNode> transform
             for (CodePackage pack : model.getPackages()) {
                 g.add(transform.apply(pack));
             }
-
-//            for (CodeClass clazz : model.getClasses()) {
-//                final MutableNode source = mutNode(clazz.getSimpleName()).add(Shape.ELLIPSE);
-//                if (model.isOwnPackage(clazz.getPackage())) {
-//                    final Double cover = coverage.getOrDefault(clazz.getName(), 1D);
-//                    source.add(Shape.RECTANGLE)
-//                            .add(Size.mode(FIXED).size(1 + clazz.getTotalSize() / 5000.0, 1))
-//                            .add(Color.rgb(255 - (int) (2.55 * cover), (int) (2.55 * cover) - 255, 0).fill())
-//                            .add(Style.FILLED);
-//                }
-//                g.add(source);
-//                for (CodeClass dep : clazz.uses()) {
-//                    source.addLink(dep.getSimpleName());
-//                }
-//            }
-
+            /*
+            for (CodeClass clazz : model.getClasses()) {
+                final MutableNode source = mutNode(clazz.getSimpleName()).add(Shape.ELLIPSE);
+                if (model.isOwnPackage(clazz.getPackage())) {
+                    final Double cover = coverage.getOrDefault(clazz.getName(), 1D);
+                    source.add(Shape.RECTANGLE)
+                            .add(Size.mode(FIXED).size(1 + clazz.getTotalSize() / 5000.0, 1))
+                            .add(Color.rgb(255 - (int) (2.55 * cover), (int) (2.55 * cover) - 255, 0).fill())
+                            .add(Style.FILLED);
+                }
+                g.add(source);
+                for (CodeClass dep : clazz.uses()) {
+                    source.addLink(dep.getSimpleName());
+                }
+            }
+            */
             return g;
         });
         return new Visualized(Graphviz.fromGraph(graph));

code-assert/src/test/java/guru/nidi/codeassert/checkstyle/CheckstyleTest.java

@@ -72,11 +72,12 @@ void google() {
         assertMatcher(""
                         + line(WARNING, "abbreviation.as.word", MAIN, "pmd/PmdRulesets", 165, "Abbreviation in name 'serialVersionUID' must contain no more than '1' capital letters.")
                         + line(WARNING, "abbreviation.as.word", MAIN, "pmd/PmdRulesets", 210, "Abbreviation in name 'serialVersionUID' must contain no more than '1' capital letters.")
+                        + line(WARNING, "empty.line.separator",TEST,"io/ModelVisualizerTest",59,"',' should be separated from previous statement.")
                         + line(WARNING, "one.top.level.class", TEST, "model/ExampleConcreteClass", 79, "Top-level class ExamplePackageClass has to reside in its own source file.")
                         + line(WARNING, "overload.methods.declaration", MAIN, "config/BaseCollector", 57, "Overload methods should not be split. Previous overloaded method located at line '51'.")
                         + line(WARNING, "overload.methods.declaration", MAIN, "config/BaseCollector", 68, "Overload methods should not be split. Previous overloaded method located at line '55'.")
                         + line(WARNING, "overload.methods.declaration", MAIN, "model/SourceFileParser", 92, "Overload methods should not be split. Previous overloaded method located at line '67'.")
-                        + line(WARNING, "tag.continuation.indent", MAIN, "dependency/DependencyMap", 101, "Line continuation have incorrect indentation level, expected level should be 4."),
+                        + line(WARNING, "tag.continuation.indent", MAIN, "dependency/DependencyMap", 103, "Line continuation have incorrect indentation level, expected level should be 4."),
                 analyzer.analyze(), hasNoCheckstyleIssues());
     }
 

code-assert/src/test/java/guru/nidi/codeassert/io/ModelVisualizerTest.java

@@ -87,7 +87,7 @@ public void defineRules() {
                 .collect(toMap(f -> f.getPack(), f -> f.getValues()[0]));
 
         final Function<String, String> labelFunc = replaceFunc("guru.nidi.codeassert", "");
-        final ModelVisualizer visualizer = new ModelVisualizer(model).labelFunc(labelFunc);
+        final ModelVisualizer visualizer = new ModelVisualizer(model);
         final File target = new File("images/packages.png");
         visualizer.visualizePackages(pack -> {
             final MutableNode node = mutNode(labelFunc.apply(pack.getName())).add(Shape.ELLIPSE);

code-assert/src/test/java/guru/nidi/codeassert/pmd/PmdTest.java

@@ -73,6 +73,7 @@ void pmdIgnore() {
                         + pmd(MEDIUM, "AvoidFinalLocalVariable", MAIN, "model/CodeClassBuilder", "Avoid using final local variables, turn them into fields")
                         + pmd(MEDIUM, "CommentSize", MAIN, "config/LocationNameMatcher", "Comment is too large: Line too long")
                         + pmd(MEDIUM, "ConfusingTernary", MAIN, "config/Location", "Avoid if (x != y) ..; else ..;")
+                        + pmd(MEDIUM, "ExcessiveMethodLength", TEST, "io/ModelVisualizerTest", "Avoid really long methods.")
                         + pmd(MEDIUM, "ExcessiveParameterList", MAIN, "jacoco/Coverage", "Avoid long parameter lists.")
                         + pmd(MEDIUM, "InefficientEmptyStringCheck", MAIN, "model/SourceFileParser", "String.trim().length()==0 is an inefficient way to validate an empty String.")
                         + pmd(MEDIUM, "LongVariable", MAIN, "dependency/Tarjan", "Avoid excessively long variable names like allowIntraPackageCycles")