update dependencies, use proper java 1.8 code

Author: nidi3

code-assert-gui/src/test/java/guru/nidi/codeassert/gui/CodeTest.java

@@ -17,9 +17,8 @@
 
 import guru.nidi.codeassert.checkstyle.*;
 import guru.nidi.codeassert.config.AnalyzerConfig;
-import guru.nidi.codeassert.config.In;
 import guru.nidi.codeassert.dependency.*;
-import guru.nidi.codeassert.findbugs.*;
+import guru.nidi.codeassert.findbugs.FindBugsResult;
 import guru.nidi.codeassert.junit.CodeAssertJunit5Test;
 import guru.nidi.codeassert.junit.PredefConfig;
 import guru.nidi.codeassert.pmd.*;

code-assert-maven-plugin/src/main/java/guru/nidi/codeassert/AssertMojo.java

@@ -50,7 +50,7 @@ public class AssertMojo extends AbstractMojo {
     @Component
     private BuildPluginManager pluginManager;
 
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    public void execute() throws MojoExecutionException {
         report();
         if (canRunTest()) {
             runTest();

code-assert-maven-plugin/src/main/java/guru/nidi/codeassert/PrepareMojo.java

@@ -22,6 +22,7 @@
 import org.apache.maven.project.MavenProject;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 
 import static guru.nidi.codeassert.AssertMojo.JACOCO_VERSION;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
@@ -41,7 +42,7 @@ public class PrepareMojo extends AbstractMojo {
     @Component
     private BuildPluginManager pluginManager;
 
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    public void execute() throws MojoExecutionException {
         executeJacocoPlugin();
         writeArgLineFile();
     }
@@ -64,7 +65,7 @@ private void writeArgLineFile() {
         if (argLine != null) {
             final File file = new File("target", "coverageOptions.txt");
             file.getParentFile().mkdirs();
-            try (final Writer out = new OutputStreamWriter(new FileOutputStream(file), "utf-8")) {
+            try (final Writer out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
                 out.write(argLine);
                 getLog().info("Wrote argLine to " + file);
             } catch (IOException e) {

code-assert/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -14,12 +15,12 @@
     <properties>
         <slf4j.version>1.7.25</slf4j.version>
         <checkstyle.version>6.19</checkstyle.version>
-        <findbugs.version>3.0.1</findbugs.version>
-        <findsecbugs.version>1.7.1</findsecbugs.version>
-        <pmd.version>5.4.1</pmd.version>
+        <findbugs.version>3.1.6</findbugs.version>
+        <findsecbugs.version>1.8.0</findsecbugs.version>
+        <pmd.version>5.8.1</pmd.version>
         <kotlin.version>1.2.30</kotlin.version>
-        <detekt.version>1.0.0.RC6-4</detekt.version>
-        <ktlint.version>0.20.0</ktlint.version>
+        <detekt.version>1.0.0.RC8</detekt.version>
+        <ktlint.version>0.27.0</ktlint.version>
     </properties>
 
     <build>
@@ -91,8 +92,8 @@
             <version>1.3</version>
         </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>findbugs</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs</artifactId>
             <version>${findbugs.version}</version>
             <exclusions>
                 <exclusion>

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

@@ -27,23 +27,18 @@
 import java.lang.reflect.Field;
 import java.util.*;
 
+import static java.util.stream.Collectors.toList;
+
 public class CheckstyleAnalyzer implements Analyzer<List<AuditEvent>> {
     private static final Logger LOG = LoggerFactory.getLogger(CheckstyleAnalyzer.class);
 
     private final AnalyzerConfig config;
     private final StyleChecks checks;
     private final StyleEventCollector collector;
 
-    private static final Comparator<AuditEvent> EVENT_SORTER = new Comparator<AuditEvent>() {
-        @Override
-        public int compare(AuditEvent b1, AuditEvent b2) {
-            final int severity = b1.getSeverityLevel().compareTo(b2.getSeverityLevel());
-            if (severity != 0) {
-                return severity;
-            }
-            return b1.getLocalizedMessage().getKey().compareTo(b2.getLocalizedMessage().getKey());
-        }
-    };
+    private static final Comparator<AuditEvent> EVENT_COMPARATOR = Comparator
+            .comparing(AuditEvent::getSeverityLevel)
+            .thenComparing(e -> e.getLocalizedMessage().getKey());
 
     private static class LoggingAuditListener implements AuditListener {
         final List<AuditEvent> events = new ArrayList<>();
@@ -107,7 +102,7 @@ private PropertyResolver createPropertyResolver() {
 
     private String propertyValue(String name, Object value) {
         if (name.endsWith("-tokens")) {
-            final StringBuilder tokens = new StringBuilder("");
+            final StringBuilder tokens = new StringBuilder();
             for (final Integer val : (List<Integer>) value) {
                 for (final Field f : TokenTypes.class.getFields()) {
                     try {
@@ -125,17 +120,13 @@ private String propertyValue(String name, Object value) {
     }
 
     private CheckstyleResult createResult(List<AuditEvent> events) {
-        final List<AuditEvent> sorted = new ArrayList<>(events);
-        Collections.sort(sorted, EVENT_SORTER);
-        final List<AuditEvent> filtered = new ArrayList<>();
         final UsageCounter counter = new UsageCounter();
-        for (final AuditEvent event : sorted) {
-            if (counter.accept(collector.accept(event))) {
-                filtered.add(event);
-            }
-        }
+        final List<AuditEvent> res = events.stream()
+                .filter(e -> counter.accept(collector.accept(e)))
+                .sorted(EVENT_COMPARATOR)
+                .collect(toList());
         collector.printUnusedWarning(counter);
-        return new CheckstyleResult(this, filtered, collector.unusedActions(counter));
+        return new CheckstyleResult(this, res, collector.unusedActions(counter));
     }
 
 }

code-assert/src/main/java/guru/nidi/codeassert/config/AnalyzerConfig.java

@@ -24,6 +24,7 @@
 import static guru.nidi.codeassert.config.Language.JAVA;
 import static guru.nidi.codeassert.util.ListUtils.concat;
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
 public class AnalyzerConfig {
@@ -32,7 +33,7 @@ public class AnalyzerConfig {
     private final List<Path> classes;
 
     public AnalyzerConfig() {
-        this(EnumSet.of(JAVA), Collections.<Path>emptyList(), Collections.<Path>emptyList());
+        this(EnumSet.of(JAVA), emptyList(), emptyList());
     }
 
     public AnalyzerConfig(AnalyzerConfig config) {

code-assert/src/main/java/guru/nidi/codeassert/config/BaseCollector.java

@@ -19,7 +19,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 
 public abstract class BaseCollector<S, A extends Action, T extends BaseCollector<S, A, T>> {
     private static final Logger LOG = LoggerFactory.getLogger(BaseCollector.class);
@@ -107,9 +111,7 @@ public void printUnusedWarning(UsageCounter counter) {
     }
 
     protected List<A> unusedNullAction(UsageCounter counter, boolean hasDefaultConfig) {
-        return counter.getCount(null) == 0 && hasDefaultConfig
-                ? Collections.<A>singletonList(null)
-                : Collections.<A>emptyList();
+        return counter.getCount(null) == 0 && hasDefaultConfig ? singletonList(null) : emptyList();
     }
 
     protected String guessClassFromFile(String filename, Language language) {

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

@@ -29,8 +29,7 @@ public class Dependencies {
 
     public Dependencies() {
         this(new DependencyMap(), new DependencyMap(), new DependencyMap(),
-                new TreeSet<LocationMatcher>(), new TreeSet<String>(),
-                new HashSet<DependencyMap>());
+                new TreeSet<>(), new TreeSet<>(), new HashSet<>());
     }
 
     public Dependencies(DependencyMap allowed, DependencyMap missing, DependencyMap denied,

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

@@ -52,7 +52,7 @@ protected void describeMismatchSafely(DependencyResult item, Description descrip
 
     private static List<DependencyMap> sortedDepMaps(Collection<DependencyMap> maps) {
         final List<DependencyMap> sorted = new ArrayList<>(maps);
-        Collections.sort(sorted, DEP_MAP_COMPARATOR);
+        sorted.sort(DEP_MAP_COMPARATOR);
         return sorted;
     }
 

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

@@ -29,11 +29,7 @@ public <T> void with(int specificity, UsingElement<T> from, UsingElement<T> to)
     }
 
     DependencyMap with(int specificity, String from, Collection<String> vias, String to) {
-        Map<String, Info> deps = map.get(from);
-        if (deps == null) {
-            deps = new HashMap<>();
-            map.put(from, deps);
-        }
+        final Map<String, Info> deps = map.computeIfAbsent(from, k -> new HashMap<>());
         final Info info = deps.get(to);
         if (info == null) {
             deps.put(to, new Info(vias, specificity));