Added Todo, improved rendering replacind associations do java.lang by class members, added a way to include more tha java.lang as hiden but not used yet

Author: juanmf

README.md

@@ -84,3 +84,11 @@ classes of your Diagram.
 You might want to remove the plugin markup from your pom after you got the desired Diagrams.
 
 
+TODO
+====
+ * Add Filters to CLI params
+ * hide some relations, choose toTypes to hide in relation fromType --> toType.
+ * show some composition relations as attrs inside the class, e.g. java.lang.* 
+ instead of arrows.
+ * represent Type parameters in class definitions i.e. public class SelectFieldFactory<D extends SelectFieldDefinition>
+ 

src/main/java/com/github/juanmf/java2plant/Parser.java

@@ -237,10 +237,10 @@ protected static Set<String> getTypeParams(Field f) {
     }
 
     protected static Set<String> getTypeParams(ParameterizedType f) {
-        Set<String> typeVars = new HashSet<String>();
+        Set<String> typeVars = new HashSet<>();
         Type[] actualTypeArguments = f.getActualTypeArguments();
-        for (Type t: actualTypeArguments  ) {
-            typeVars.add(t.toString());
+        for (Type t: actualTypeArguments) {
+            typeVars.add(t.toString().replace("class ", ""));
         }
         return typeVars;
     }

src/main/java/com/github/juanmf/java2plant/goals/Parse.java

@@ -43,7 +43,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             URLClassLoader loader = getLoader();
             getLog().debug("loader URLs: " + Arrays.toString(loader.getURLs()));
 
-            getLog().info("Following is the PlantUML src: \n" + Parser.parse(thePackage, Filters.FILTER_ALLOW_ALL, loader));
+            getLog().info("Following is the PlantUML src: \n" + Parser.parse(thePackage, Filters.FILTER_FORBID_USES, loader));
         } catch (DependencyResolutionRequiredException e) {
             throw new MojoExecutionException("Something went wrong", e);
         }

src/main/java/com/github/juanmf/java2plant/render/PlantRenderer.java

@@ -1,17 +1,34 @@
 package com.github.juanmf.java2plant.render;
 
 import com.github.juanmf.java2plant.Parser;
+import com.github.juanmf.java2plant.structure.Aggregation;
+import com.github.juanmf.java2plant.structure.Extension;
 import com.github.juanmf.java2plant.structure.Relation;
+import com.github.juanmf.java2plant.structure.Use;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author [email protected]
  */
 public class PlantRenderer {
     private final Set<String> types;
     private final Set<Relation> relations;
+    private final Set<Pattern> toTypesToShowAsMember;
     private final Filter filter;
+    private static final Map<Class<? extends Relation>, MemberPrinter> memberPrinters = new HashMap<>();
+
+    static {
+        memberPrinters.put(Use.class, new MethodPrinter());
+        memberPrinters.put(Aggregation.class, new FieldPrinter());
+        memberPrinters.put(Extension.class, new NullPrinter());
+    }
 
     public PlantRenderer(Set<String> types, Set<Relation> relations) {
         this(types, relations, Filters.FILTER_ALLOW_ALL);
@@ -21,7 +38,8 @@ public PlantRenderer(Set<String> types, Set<Relation> relations, Filter filter)
         this.types = types;
         this.relations = relations;
         this.filter = filter;
-
+        toTypesToShowAsMember = new HashSet<>();
+        toTypesToShowAsMember.add(Pattern.compile("^java.lang.*"));
     }
 
     /**
@@ -37,6 +55,8 @@ public String render() {
         StringBuilder sb = new StringBuilder();
         sb.append("@startuml\n");
         sb.append("' Created by [email protected]\n\n");
+        sb.append("' Using left to right direction to try a better layout feel free to edit\n");
+        sb.append("left to right direction\n");
         sb.append("' Participants \n\n");
         addClasses(sb);
         sb.append("\n' Relations \n\n");
@@ -56,6 +76,9 @@ protected void addRelations(StringBuilder sb) {
             if (filter.isForbidenRelation(r.getClass())) {
                 continue;
             }
+            if (r.getFromType().contains("$")) {
+                continue;
+            }
             sb.append(r.toString()).append("\n");
         }
     }
@@ -69,11 +92,79 @@ protected void addClasses(StringBuilder sb) {
         for (String c : types) {
             try {
                 Class<?> aClass = Class.forName(c, true, Parser.CLASS_LOADER);
-                sb.append(aClass.toString()).append("\n");
+                addClass(sb, aClass);
             } catch (ClassNotFoundException e) {
                 System.out.println("ClassNotFoundException: " + e.getMessage());
                 continue;
             }
         }
     }
+
+    protected void addClass(StringBuilder sb, Class<?> aClass) {
+        if (aClass.getName().contains("$")) {
+            return;
+        }
+        sb.append(aClass.toString()).append(" {\n");
+        renderClassMembers(sb, aClass);
+        sb.append("\n} \n ");
+    }
+
+    private void renderClassMembers(StringBuilder sb, Class<?> aClass) {
+        Iterator<Relation> ri = relations.iterator();
+        Set<String> fields = new HashSet<>();
+        Set<String> methods = new HashSet<>();
+        while (ri.hasNext()) {
+            Relation relation = ri.next();
+            if (relation.getFromType().equals(aClass.getName())
+                    && matches(relation.getToType(), toTypesToShowAsMember)) {
+                System.out.println(String.format("%s has a relation to %s to be shown as member", aClass.getName(), relation.getToType()));
+                memberPrinters.get(relation.getClass()).addMember(relation, fields, methods);
+                ri.remove();
+            }
+        }
+        for (String field : fields) {
+            sb.append(field + "\n");
+        }
+        sb.append("--\n");
+        for (String method : methods) {
+            sb.append(method + "\n");
+        }
+    }
+
+    private boolean matches(String toType, Set<Pattern> toTypesToShowAsAttrs) {
+        for (Pattern pattern : toTypesToShowAsAttrs) {
+            Matcher m = pattern.matcher(toType);
+            if (m.matches()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    interface MemberPrinter {
+        void addMember(Relation r, Set<String> fields, Set<String> methods);
+    }
+
+    static class FieldPrinter implements MemberPrinter {
+        @Override
+        public void addMember(Relation r, Set<String> fields, Set<String> methods) {
+            String msg = r.getMessage();
+            fields.add(msg);
+        }
+    }
+
+    static class NullPrinter implements MemberPrinter {
+        @Override
+        public void addMember(Relation r, Set<String> fields, Set<String> methods) {
+            System.out.println(String.format("skipping %s to %s relation", r.getFromType(), r.getToType()));
+        }
+    }
+
+    static class MethodPrinter implements MemberPrinter {
+        @Override
+        public void addMember(Relation r, Set<String> fields, Set<String> methods) {
+            String msg = r.getMessage();
+            methods.add(msg);
+        }
+    }
 }