fix issue with rendering JSON result with propspec in regex

greenlaw110 · greenlaw110 · commit f545c4e8af62 · 2016-01-11T14:33:37.000+11:00
diff --git a/src/main/java/act/cli/view/CliView.java b/src/main/java/act/cli/view/CliView.java
@@ -124,7 +124,7 @@ private void buildTree(StringBuilder sb, TreeNode node, String prefix, boolean i
     JSON () {
         @Override
         public String render(Object result, PropertySpec.MetaInfo filter, ActContext context) {
-            return render(result, filter, context, true);
+            return render(result, filter, context, context instanceof CliContext);
         }
 
         public String render(Object result, PropertySpec.MetaInfo filter, ActContext context, boolean format) {
@@ -141,9 +141,17 @@ public String render(Object result, PropertySpec.MetaInfo filter, ActContext con
                     } else {
                         // output fields only applied when excluded fields not presented
                         propertyFilter.addIncludes(outputs);
+                        if (FastJsonPropertyPreFilter.hasPattern(outputs)) {
+                            // TODO: handle the case when result is an Iterable
+                            propertyFilter.setFullPaths(context.app().service(DataPropertyRepository.class).propertyListOf(result.getClass()));
+                        }
                     }
                 } else {
                     propertyFilter.addExcludes(excluded);
+                    if (FastJsonPropertyPreFilter.hasPattern(excluded)) {
+                        // TODO: handle the case when result is an Iterable
+                        propertyFilter.setFullPaths(context.app().service(DataPropertyRepository.class).propertyListOf(result.getClass()));
+                    }
                 }
 
                 MappedFastJsonNameFilter nameFilter = new MappedFastJsonNameFilter(filter.labelMapping());
diff --git a/src/main/java/act/util/FastJsonPropertyPreFilter.java b/src/main/java/act/util/FastJsonPropertyPreFilter.java
@@ -163,7 +163,7 @@ private boolean matches(Set<String> paths, String path, boolean exclude) {
         return false;
     }
 
-    private boolean hasPattern(Set<String> paths) {
+    public static boolean hasPattern(Collection<String> paths) {
         return S.join("", paths).contains("*");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ private boolean matches(Set<String> paths, String path, boolean exclude) {`
`163`	`163`	`return false;`
`164`	`164`	`}`
`165`	`165`
`166`		`- private boolean hasPattern(Set<String> paths) {`
	`166`	`+ public static boolean hasPattern(Collection<String> paths) {`
`167`	`167`	`return S.join("", paths).contains("*");`
`168`	`168`	`}`
`169`	`169`