[isis] 01/02: ISIS-2473: fix field formatting

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 705e86032a2f62281ac25ac635b42f5deefaf07b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Dec 13 09:49:40 2020 +0100

    ISIS-2473: fix field formatting
---
 .../isis/tooling/j2adoc/test/J2AdocTest.java       |  3 ++-
 .../tooling/javamodel/ast/FieldDeclarations.java   | 24 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
index 8f83183..d6d1931 100644
--- a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
+++ b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
@@ -60,7 +60,8 @@ class J2AdocTest {
         .stream()
         //.filter(source->source.toString().contains("ExecutionMode"))
         //.filter(source->source.toString().contains("FactoryService"))
-        .filter(source->source.toString().contains("Action"))
+        //.filter(source->source.toString().contains("Action"))
+        .filter(source->source.toString().contains("SudoService"))
         //.peek(source->System.out.println("parsing source: " + source))
         .forEach(j2aContext::add);
         
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/FieldDeclarations.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/FieldDeclarations.java
index de8d298..67ba114 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/FieldDeclarations.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/FieldDeclarations.java
@@ -18,27 +18,47 @@
  */
 package org.apache.isis.tooling.javamodel.ast;
 
+import java.util.stream.Collectors;
+
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.EnumDeclaration;
 import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.type.TypeParameter;
+import com.github.javaparser.printer.PrettyPrinterConfiguration;
 
 import org.apache.isis.commons.collections.Can;
 
 import lombok.NonNull;
+import lombok.val;
 
 //TODO effective public might require more context
 public final class FieldDeclarations {
     
+    private static PrettyPrinterConfiguration printingConf = new PrettyPrinterConfiguration();
+    static {
+        printingConf.setPrintJavadoc(false);
+    }
+    
     /**
      * Returns given {@link FieldDeclaration} as normal text, without formatting.
      */
     public static String asNormalized(final @NonNull FieldDeclaration fd) {
-        return fd.toString().trim(); //TODO might miss the fields type here
+        
+        //suppress initializer printing (that is assignments)
+        val clone = fd.clone();
+        clone.getVariables().stream()
+                .forEach(vd->vd.setInitializer((Expression)null));
+        
+        return clone.toString(printingConf).trim();
     }
     
     public static String asNormalizedName(final @NonNull FieldDeclaration fd) {
-        return fd.toString().trim(); //TODO might have the fields type to remove here
+        return fd.getVariables().stream()
+                .map(VariableDeclarator::getNameAsString)
+                .collect(Collectors.joining(", "))
+                .trim();
     }
     
     public static Can<TypeParameter> getTypeParameters(final @NonNull FieldDeclaration fd) {