use platform specific newlines

Author: nidi3

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

@@ -20,6 +20,8 @@
 import guru.nidi.codeassert.util.ResultMatcher;
 import org.hamcrest.Description;
 
+import static java.lang.System.*;
+
 public class CheckstyleMatcher extends ResultMatcher<CheckstyleResult, AuditEvent> {
     public void describeTo(Description description) {
         description.appendText("Has no Checkstyle issues");
@@ -28,7 +30,7 @@ public void describeTo(Description description) {
     @Override
     protected void describeMismatchSafely(CheckstyleResult item, Description description) {
         for (final AuditEvent event : item.findings()) {
-            description.appendText("\n").appendText(printEvent(event));
+            description.appendText(lineSeparator()).appendText(printEvent(event));
         }
     }
 

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

@@ -18,10 +18,11 @@
 import com.puppycrawl.tools.checkstyle.api.AuditEvent;
 import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
 import guru.nidi.codeassert.config.*;
-import guru.nidi.codeassert.util.ListUtils;
 
 import java.util.List;
 
+import static guru.nidi.codeassert.util.ListUtils.andJoin;
+
 public class StyleEventCollector extends BaseCollector<AuditEvent, Ignore, StyleEventCollector> {
     private final SeverityLevel severity;
 
@@ -52,7 +53,7 @@ public List<Ignore> unused(UsageCounter counter) {
 
             @Override
             public String toString() {
-                return StyleEventCollector.this.toString() + "\n" + ListUtils.join("\n", configs);
+                return andJoin(StyleEventCollector.this, configs);
             }
         };
     }

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

@@ -15,13 +15,14 @@
  */
 package guru.nidi.codeassert.config;
 
-import guru.nidi.codeassert.util.ListUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static guru.nidi.codeassert.util.ListUtils.join;
+import static java.lang.System.lineSeparator;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
@@ -90,7 +91,7 @@ public List<String> unusedActions(UsageCounter counter) {
     }
 
     public void printUnusedWarning(UsageCounter counter) {
-        final String s = ListUtils.join("\n", unusedActions(counter));
+        final String s = join(lineSeparator(), unusedActions(counter));
         if (s.length() > 0) {
             final StackTraceElement[] trace = new Exception().fillInStackTrace().getStackTrace();
             int i;
@@ -106,7 +107,7 @@ public void printUnusedWarning(UsageCounter counter) {
             }
             final String location = i == trace.length ? ""
                     : ("In " + trace[i].getClassName() + "#" + trace[i].getMethodName() + ": ");
-            LOG.warn(location + "These collector actions have not been used:\n" + s);
+            LOG.warn(String.format("%sThese collector actions have not been used:%n%s", location, s));
         }
     }
 

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

@@ -15,10 +15,9 @@
  */
 package guru.nidi.codeassert.config;
 
-import guru.nidi.codeassert.util.ListUtils;
-
 import java.util.List;
 
+import static guru.nidi.codeassert.util.ListUtils.andJoin;
 import static java.util.Arrays.asList;
 
 public final class CollectorConfig<A extends Action> {
@@ -48,6 +47,6 @@ public static <A extends Action> CollectorConfig<A> just(A... actions) {
 
     @Override
     public String toString() {
-        return "  " + (reason == null ? "just" : ("because " + reason)) + "\n" + ListUtils.join("\n", actions);
+        return andJoin("  " + (reason == null ? "just" : ("because " + reason)), actions);
     }
 }

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

@@ -52,7 +52,6 @@ public boolean matchesPackageClass(String packageName, String className) {
     }
 
     public boolean matches(String packageName, String className, String methodName) {
-        System.out.println("*** match '" + packageName + "--" + className + "--" + methodName + " - " + loc);
         final boolean matchesClass = matchesAll(loc.method)
                 ? matchesClassPattern(loc.clazz, className)
                 : matchesPattern(loc.clazz, className);

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

@@ -16,10 +16,11 @@
 package guru.nidi.codeassert.dependency;
 
 import guru.nidi.codeassert.config.*;
-import guru.nidi.codeassert.util.ListUtils;
 
 import java.util.List;
 
+import static guru.nidi.codeassert.util.ListUtils.andJoin;
+
 public class DependencyCollector extends BaseCollector<DependencyEntry, Ignore, DependencyCollector> {
     public static final String MISSING = "MISSING";
     public static final String DENIED = "DENIED";
@@ -41,7 +42,7 @@ public List<Ignore> unused(UsageCounter counter) {
 
             @Override
             public String toString() {
-                return DependencyCollector.this + "\n" + ListUtils.join("\n", configs);
+                return andJoin(DependencyCollector.this, configs);
             }
         };
     }

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

@@ -23,6 +23,7 @@
 import static guru.nidi.codeassert.dependency.DependencyCollector.CYCLE;
 import static guru.nidi.codeassert.dependency.MatcherUtils.deps;
 import static guru.nidi.codeassert.dependency.MatcherUtils.sorted;
+import static java.lang.System.lineSeparator;
 
 public class DependencyCycleMatcher extends TypeSafeMatcher<DependencyResult> {
     private static final Comparator<DependencyMap> DEP_MAP_COMPARATOR = new DependencyMapComparator();
@@ -38,13 +39,13 @@ public void describeTo(Description description) {
 
     @Override
     protected void describeMismatchSafely(DependencyResult item, Description description) {
-        description.appendText("\n");
+        description.appendText(lineSeparator());
         final Set<DependencyMap> result = item.findings().getCycles();
         for (final DependencyMap cycle : sortedDepMaps(result)) {
             description.appendText(String.format("%-12s %s%n", CYCLE,
                     "This group of elements has mutual dependencies:"));
             for (final String elem : sorted(cycle.getElements())) {
-                description.appendText("  " + elem + " ->\n");
+                description.appendText(String.format("  %s ->%n", elem));
                 description.appendText(deps("    ", cycle.getDependencies(elem)));
             }
         }

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

@@ -20,6 +20,7 @@
 
 import static guru.nidi.codeassert.dependency.DependencyCollector.*;
 import static guru.nidi.codeassert.dependency.MatcherUtils.*;
+import static java.lang.System.lineSeparator;
 
 public class DependencyResultMatcher extends TypeSafeMatcher<DependencyResult> {
     private static final String SIMPLE_FORMAT = "%-12s %-45s %s%n";
@@ -47,7 +48,7 @@ public void describeTo(Description description) {
     @Override
     protected void describeMismatchSafely(DependencyResult item, Description description) {
         final Dependencies dependencies = item.findings();
-        description.appendText("\n");
+        description.appendText(lineSeparator());
         describeNotExisting(dependencies, description);
         describeUndefined(dependencies, description);
         describeMissing(dependencies, description);
@@ -65,7 +66,7 @@ private void describeMissing(Dependencies result, Description description) {
         for (final String elem : sorted(result.getMissing().getElements())) {
             description.appendText(String.format(ARROW_FORMAT, MISSING, elem + " ->", "This dependency is missing."));
             for (final String dep : sorted(result.getMissing().getDependencies(elem).keySet())) {
-                description.appendText("  " + dep + "\n");
+                description.appendText(String.format("  %s%n", dep));
             }
         }
     }

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

@@ -173,6 +173,6 @@ private int calcAllowedSpecificity(T thisPack, T dep) {
 
     @Override
     public String toString() {
-        return "DependencyRule for " + pattern + "\n  use:      " + use + "\n  used by:  " + usedBy + "\n";
+        return String.format("DependencyRule for %s%n  use:      %s%n  used by:  %s%n", pattern, use, usedBy);
     }
 }

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

@@ -19,6 +19,7 @@
 
 import java.util.*;
 
+import static java.lang.System.lineSeparator;
 import static java.util.Collections.sort;
 
 final class MatcherUtils {
@@ -33,7 +34,7 @@ public static String deps(String prefix, Map<String, DependencyMap.Info> deps) {
             if (!by.isEmpty()) {
                 s.append(" (by ").append(join(by)).append(')');
             }
-            s.append('\n');
+            s.append(lineSeparator());
         }
         return s.toString();
     }