add SourceFileParser, TODO: use it :) (#29)

Author: nidi3

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

@@ -37,7 +37,8 @@ public static CollectorTemplate<Ignore> minimalPmdIgnore() {
                         .ignore("MethodArgumentCouldBeFinal", "AvoidFieldNameMatchingMethodName",
                                 "CommentDefaultAccessModifier", "AbstractNaming", "AvoidFieldNameMatchingTypeName",
                                 "UncommentedEmptyConstructor", "UseStringBufferForStringAppends",
-                                "UncommentedEmptyMethodBody", "EmptyMethodInAbstractClassShouldBeAbstract"))
+                                "UncommentedEmptyMethodBody", "EmptyMethodInAbstractClassShouldBeAbstract",
+                                "InefficientEmptyStringCheck"))
                 .because("it's equals", In.methods("equals")
                         .ignore("NPathComplexity", "ModifiedCyclomaticComplexity", "StdCyclomaticComplexity",
                                 "CyclomaticComplexity", "ConfusingTernary"))

code-assert/src/main/java/guru/nidi/codeassert/model/ClassFileParser.java

@@ -33,17 +33,16 @@ class ClassFileParser {
     private static final int JAVA_MAGIC = 0xCAFEBABE;
 
     private ConstantPool constantPool;
-    private CountingInputStream counter;
     private DataInputStream in;
 
-    public CodeClass parse(File file, Model model) throws IOException {
+    CodeClass parse(File file, Model model) throws IOException {
         try (final InputStream in = new FileInputStream(file)) {
             return parse(in, model);
         }
     }
 
-    public CodeClass parse(InputStream is, Model model) throws IOException {
-        counter = new CountingInputStream(is);
+    CodeClass parse(InputStream is, Model model) throws IOException {
+        final CountingInputStream counter = new CountingInputStream(is);
         in = new DataInputStream(counter);
 
         parseMagic();
@@ -70,7 +69,7 @@ public CodeClass parse(InputStream is, Model model) throws IOException {
                 .addMethodRefs(methods)
                 .addAttributeRefs(attributes)
                 .addPackageInfo(model, className)
-                .addSizes(counter.getCount(), methods)
+                .addCodeSizes(counter.getCount(), methods)
                 .clazz;
     }
 

code-assert/src/main/java/guru/nidi/codeassert/model/CodeClass.java

@@ -39,6 +39,10 @@ public class CodeClass extends UsingElement<CodeClass> {
     int codeSize;
     int totalSize;
     boolean concrete;
+    int codeLines;
+    int commentLines;
+    int emptyLines;
+    int totalLines;
 
     CodeClass(String name, CodePackage pack) {
         this.name = name;
@@ -85,6 +89,22 @@ public boolean isConcrete() {
         return concrete;
     }
 
+    public int getCodeLines() {
+        return codeLines;
+    }
+
+    public int getCommentLines() {
+        return commentLines;
+    }
+
+    public int getEmptyLines() {
+        return emptyLines;
+    }
+
+    public int getTotalLines() {
+        return totalLines;
+    }
+
     @Override
     public CodeClass self() {
         return this;

code-assert/src/main/java/guru/nidi/codeassert/model/CodeClassBuilder.java

@@ -29,12 +29,20 @@ class CodeClassBuilder {
     private final Model model;
     private final ConstantPool constantPool;
 
-    CodeClassBuilder(String className, Model model, ConstantPool constantPool) {
+    private CodeClassBuilder(CodeClass clazz, Model model, ConstantPool constantPool) {
+        this.clazz = clazz;
         this.model = model;
-        this.clazz = model.getOrCreateClass(className);
         this.constantPool = constantPool;
     }
 
+    CodeClassBuilder(String className, Model model, ConstantPool constantPool) {
+        this(model.getOrCreateClass(className), model, constantPool);
+    }
+
+    CodeClassBuilder(CodeClass clazz) {
+        this(clazz, null, null);
+    }
+
     public CodeClassBuilder addSuperClass(String className) {
         addImport(className);
         return this;
@@ -97,7 +105,7 @@ public CodeClassBuilder addPackageInfo(Model model, String className) {
         return this;
     }
 
-    public CodeClassBuilder addSizes(int totalSize, List<MemberInfo> methods) {
+    public CodeClassBuilder addCodeSizes(int totalSize, List<MemberInfo> methods) {
         int codeSize = 0;
         for (final MemberInfo method : methods) {
             codeSize += method.codeSize;
@@ -107,6 +115,14 @@ public CodeClassBuilder addSizes(int totalSize, List<MemberInfo> methods) {
         return this;
     }
 
+    public CodeClassBuilder addSourceSizes(int codeLines, int commentLines, int emptyLines, int totalLines) {
+        clazz.codeLines = codeLines;
+        clazz.commentLines = commentLines;
+        clazz.emptyLines = emptyLines;
+        clazz.totalLines = totalLines;
+        return this;
+    }
+
     private void addMemberAnnotationRefs(List<MemberInfo> infos) throws IOException {
         for (final MemberInfo info : infos) {
             if (info.annotations != null) {

code-assert/src/main/java/guru/nidi/codeassert/model/Constant.java

@@ -19,7 +19,7 @@
 import java.io.IOException;
 
 final class Constant {
-    public static final int
+    static final int
             UTF8 = 1,
             UNICODE = 2,
             INTEGER = 3,
@@ -41,7 +41,7 @@ final class Constant {
     final int typeIndex;
     final Object value;
 
-    public static Constant fromData(DataInputStream in) throws IOException {
+    static Constant fromData(DataInputStream in) throws IOException {
         final byte tag = in.readByte();
         switch (tag) {
             case CLASS:
@@ -90,7 +90,7 @@ private Constant(byte tag, int nameIndex, int typeIndex, Object value) {
         this.value = value;
     }
 
-    public boolean isBig() {
+    boolean isBig() {
         return tag == DOUBLE || tag == LONG;
     }
 }

code-assert/src/main/java/guru/nidi/codeassert/model/Model.java

@@ -22,46 +22,55 @@
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 
+import static java.util.Arrays.asList;
+
 public class Model {
     public static final String UNNAMED_PACKAGE = "<Unnamed Package>";
 
     final Map<String, CodePackage> packages = new HashMap<>();
     final Map<String, CodeClass> classes = new HashMap<>();
 
     public static Model from(File... files) {
-        return from(Arrays.asList(files));
+        return from(asList(files));
     }
 
     public static Model from(List<File> files) {
+        return new Model().and(files);
+    }
+
+    public Model and(File... files) {
+        return and(asList(files));
+    }
+
+    public Model and(List<File> files) {
         try {
-            final Model model = new Model();
-            final ClassFileParser parser = new ClassFileParser();
+            final ClassFileParser classParser = new ClassFileParser();
             for (final File file : files) {
                 try (final InputStream in = new FileInputStream(file)) {
-                    add(parser, model, file.getName(), in);
+                    add(classParser, file.getName(), in);
                 }
             }
-            return model;
+            return this;
         } catch (IOException e) {
             throw new AnalyzerException("Problem creating a Model", e);
         }
     }
 
-    private static void add(ClassFileParser parser, Model model, String name, InputStream in) throws IOException {
+    private void add(ClassFileParser parser, String name, InputStream in) throws IOException {
         if (name.endsWith(".jar") || name.endsWith(".zip") || name.endsWith(".war") || name.endsWith(".ear")) {
             final JarInputStream jar = new JarInputStream(in);
             ZipEntry entry;
             while ((entry = jar.getNextEntry()) != null) {
                 try {
                     if (!entry.isDirectory()) {
-                        add(parser, model, entry.getName(), jar);
+                        add(parser, entry.getName(), jar);
                     }
                 } finally {
                     jar.closeEntry();
                 }
             }
         } else if (name.endsWith(".class")) {
-            parser.parse(in, model);
+            parser.parse(in, this);
         }
     }