improve

Author: weizijun

libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java

@@ -24,20 +24,20 @@ public class FilterPath {
     private final Map<String, FilterPath> termsChildren;
     private final List<FilterPath> wildcardChildren;
     private final String pattern;
-    private final boolean doubleWildcard;
+    private final boolean isDoubleWildcard;
     private final boolean isFinalNode;
     private boolean hasDoubleWildcard;
 
     private FilterPath(
         String pattern,
-        boolean doubleWildcard,
+        boolean isDoubleWildcard,
         boolean isFinalNode,
         boolean hasDoubleWildcard,
         Map<String, FilterPath> termsChildren,
         List<FilterPath> wildcardChildren
     ) {
         this.pattern = pattern;
-        this.doubleWildcard = doubleWildcard;
+        this.isDoubleWildcard = isDoubleWildcard;
         this.isFinalNode = isFinalNode;
         this.hasDoubleWildcard = hasDoubleWildcard;
         this.termsChildren = termsChildren;
@@ -91,7 +91,7 @@ boolean matches(String name, List<FilterPath> nextFilters) {
             }
         }
 
-        if (doubleWildcard) {
+        if (isDoubleWildcard) {
             nextFilters.add(this);
         }
 

libs/x-content/src/test/java/org/elasticsearch/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java

@@ -71,6 +71,8 @@ public void testInclusiveFilters() throws Exception {
 
         assertResult(SAMPLE, "h.i.j.k.l,h.i.j.k.l.m", true, "{'h':{'i':{'j':{'k':{'l':'l_value'}}}}}");
         assertResult(SAMPLE, "a,b,c,d,e.f1,e.f2,e.g1,e.g2,h.i.j.k.l", true, SAMPLE);
+        assertResult(SAMPLE, "", true, "");
+        assertResult(SAMPLE, "h.", true, "");
     }
 
     public void testExclusiveFilters() throws Exception {
@@ -157,6 +159,8 @@ public void testExclusiveFilters() throws Exception {
         );
 
         assertResult(SAMPLE, "a,b,c,d,e.f1,e.f2,e.g1,e.g2,h.i.j.k.l", false, "");
+        assertResult(SAMPLE, "", false, SAMPLE);
+        assertResult(SAMPLE, "h.", false, SAMPLE);
     }
 
     public void testInclusiveFiltersWithDots() throws Exception {