api cleanup, new model check

Author: nidi3

code-assert-gui/pom.xml

@@ -39,4 +39,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

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

@@ -22,7 +22,7 @@ public class AmbiguousRuleException extends RuntimeException {
     private final UsingElement<?> from;
     private final UsingElement<?> to;
 
-    public AmbiguousRuleException(DependencyRule rule, UsingElement<?> from, UsingElement<?> to) {
+    AmbiguousRuleException(DependencyRule rule, UsingElement<?> from, UsingElement<?> to) {
         this.rule = rule;
         this.from = from;
         this.to = to;

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

@@ -15,7 +15,7 @@
  */
 package guru.nidi.codeassert.dependency;
 
-class DependencyEntry {
+public class DependencyEntry {
     final String name;
     final String className;
 

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

@@ -26,7 +26,7 @@ final class MatcherUtils {
     private MatcherUtils() {
     }
 
-    public static String deps(String prefix, Map<String, DependencyMap.Info> deps) {
+    static String deps(String prefix, Map<String, DependencyMap.Info> deps) {
         final StringBuilder s = new StringBuilder();
         for (final String dep : sorted(deps.keySet())) {
             s.append(prefix).append(dep);
@@ -39,21 +39,21 @@ public static String deps(String prefix, Map<String, DependencyMap.Info> deps) {
         return s.toString();
     }
 
-    public static String join(Collection<String> packs) {
+    static String join(Collection<String> packs) {
         final StringBuilder s = new StringBuilder();
         for (final String pack : sorted(packs)) {
             s.append(", ").append(pack);
         }
         return s.length() > 0 ? s.substring(2) : s.toString();
     }
 
-    public static List<String> sorted(Collection<String> ss) {
+    static List<String> sorted(Collection<String> ss) {
         final List<String> sorted = new ArrayList<>(ss);
         sort(sorted);
         return sorted;
     }
 
-    public static List<String> sortedPatterns(Collection<LocationMatcher> patterns) {
+    static List<String> sortedPatterns(Collection<LocationMatcher> patterns) {
         final List<String> ss = new ArrayList<>();
         for (final LocationMatcher pattern : patterns) {
             ss.add(pattern.toString());

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

@@ -31,7 +31,7 @@ private static class Node {
         boolean onStack;
     }
 
-    public Set<DependencyMap> analyzeCycles(Iterable<T> elems, boolean allowIntraPackageCycles) {
+    Set<DependencyMap> analyzeCycles(Iterable<T> elems, boolean allowIntraPackageCycles) {
         index = 0;
         final Map<String, T> map = new HashMap<>();
         for (final T elem : elems) {

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

@@ -25,33 +25,33 @@ class Usage {
     final Set<LocationMatcher> may = new HashSet<>();
     final Set<LocationMatcher> mustNot = new HashSet<>();
 
-    public Usage copy() {
+    Usage copy() {
         final Usage u = new Usage();
         u.must.addAll(must);
         u.may.addAll(may);
         u.mustNot.addAll(mustNot);
         return u;
     }
 
-    public void must(CodeElement... rules) {
+    void must(CodeElement... rules) {
         for (final CodeElement rule : rules) {
             must.add(rule.pattern);
         }
     }
 
-    public void may(CodeElement... rules) {
+    void may(CodeElement... rules) {
         for (final CodeElement rule : rules) {
             may.add(rule.pattern);
         }
     }
 
-    public void mustNot(CodeElement... rules) {
+    void mustNot(CodeElement... rules) {
         for (final CodeElement rule : rules) {
             mustNot.add(rule.pattern);
         }
     }
 
-    public boolean isEmpty() {
+    boolean isEmpty() {
         return must.isEmpty() && may.isEmpty() && mustNot.isEmpty();
     }
 

code-assert/src/main/java/guru/nidi/codeassert/detekt/DetektResult.java

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

code-assert/src/main/java/guru/nidi/codeassert/detekt/TypedDetektFinding.java

@@ -19,7 +19,7 @@
 
 import java.io.File;
 
-class TypedDetektFinding {
+public class TypedDetektFinding {
     final File basedir;
     final Entity entity;
     final String type;

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

@@ -41,7 +41,7 @@ protected void describeMismatchSafely(FindBugsResult item, Description descripti
     private String printBug(BugInstance bug, List<AnalyzerConfig.Path> sources) {
         final int rank = BugRanker.findRank(bug);
         final SourceLineAnnotation line = bug.getPrimarySourceLineAnnotation();
-        final int startLine = line.getStartLine() <= 0 ? 0 : line.getStartLine();
+        final int startLine = Math.max(line.getStartLine(), 0);
         final String msg = bug.getMessage();
         final int pos = msg.indexOf(':');
         final String message = msg.substring(pos + 2).replace('\n', ' ');

code-assert/src/main/java/guru/nidi/codeassert/junit/CodeAssertJunit5Test.java

@@ -40,6 +40,13 @@ void circularDependencies() {
         assertThat(dependencyResult(), hasNoCycles());
     }
 
+    @Test
+    void codeStructure() {
+        assumeTrue(defaultTests().contains(STRUCTURE), "Structure tests excluded.");
+        assumeFalse(createModel() == null, "createModel() not implemented.");
+        assertThat(createModel(), exposesNoInternalTypes());
+    }
+
     @Test
     void findBugs() {
         assumeTrue(defaultTests().contains(FIND_BUGS), "FindBugs test excluded.");