Better filtering of non-nodes and bumped version

Author: Albert Schimpf

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'scraper.docgen'
-version = '0.11.0'
+version = '0.11.1'
 sourceCompatibility = '1.11'
 
 repositories {

src/main/java/scraper/doclet/ScraperDocgen.java

@@ -19,6 +19,8 @@
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class ScraperDocgen {
     static Map<String, Object> docs = new HashMap<>();
+    static Set<String> filter = new HashSet<>();
+
     public static void main(String[] args) {
         if(args.length < 2) throw new IllegalArgumentException("First argument output file, following arguments folder paths to include");
 
@@ -36,11 +38,12 @@ public void visit(JavadocComment comment, Object arg) {
 
                         // empty javadoc node: return
                         Optional<Node> nod = comment.getCommentedNode();
-                        if (nod.isEmpty()) return;
+                        if (nod.isEmpty()) {
+                            return;
+                        }
 
                         Node nodd = nod.get();
                         Map nodeDoc = (Map) docs.getOrDefault(nname, new HashMap<>());
-                        docs.put(nname, nodeDoc);
                         List fields = (List) nodeDoc.getOrDefault("fields", new LinkedList<>());
                         nodeDoc.put("fields", fields);
 
@@ -78,12 +81,23 @@ public void visit(JavadocComment comment, Object arg) {
 
                             // version
                             Optional<AnnotationExpr> annotOpt = ((ClassOrInterfaceDeclaration) nodd).getAnnotationByName("NodePlugin");
-                            if(annotOpt.isEmpty()) return;
+                            if(annotOpt.isEmpty()) {
+                                filter.add(nname);
+                                return;
+                            }
                             AnnotationExpr annot = annotOpt.get();
                             String version;
                             if(annot instanceof SingleMemberAnnotationExpr) {
                                 version = ((SingleMemberAnnotationExpr) annot).getMemberValue().toString();
                             } else {
+                                Optional<MemberValuePair> deprecated = ((NormalAnnotationExpr) annot).getPairs().stream()
+                                        .filter(p -> p.getName().getId().equals("deprecated"))
+                                        .findFirst();
+                                if (deprecated.isPresent() && deprecated.get().getValue().toString().equalsIgnoreCase("true")) {
+                                    filter.add(nname);
+                                    return;
+                                }
+
                                 Optional<MemberValuePair> defaultVal = ((NormalAnnotationExpr) annot).getPairs().stream()
                                         .filter(p -> p.getName().getId().equals("value"))
                                         .findFirst();
@@ -136,6 +150,8 @@ public void visit(JavadocComment comment, Object arg) {
                             }
                             fields.add(fieldDoc);
                         }
+
+                        docs.put(nname, nodeDoc);
                     }
 
                 }.visit(JavaParser.parse(file), null);
@@ -155,6 +171,8 @@ public void visit(JavadocComment comment, Object arg) {
                     handleNode).explore(projectDir);
         }
 
+        filter.forEach(v -> docs.remove(v));
+
         HtmlGenerator.main(output);
     }