Remove NodePathSearchCriteria.trimEmptyNode (#34969)

terrymanu · web-flow · commit 78711708d24d · 2025-03-13T11:27:51.000+08:00
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearchCriteria.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearchCriteria.java
@@ -30,8 +30,6 @@ public final class NodePathSearchCriteria {
     
     private final NodePath searchExample;
     
-    private final boolean trimEmptyNode;
-    
     private final boolean containsChildPath;
     
     private final int searchSegmentIndex;
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearcher.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearcher.java
@@ -42,7 +42,7 @@ public final class NodePathSearcher {
      * @return found node segment
      */
     public static Optional<String> find(final String path, final NodePathSearchCriteria criteria) {
-        Matcher matcher = createPattern(criteria.getSearchExample(), criteria.isTrimEmptyNode(), criteria.isContainsChildPath()).matcher(path);
+        Matcher matcher = createPattern(criteria.getSearchExample(), criteria.isContainsChildPath()).matcher(path);
         return matcher.find() ? Optional.of(matcher.group(criteria.getSearchSegmentIndex())) : Optional.empty();
     }
     
@@ -65,11 +65,11 @@ public static String get(final String path, final NodePathSearchCriteria criteri
      * @return is matched path or not
      */
     public static boolean isMatchedPath(final String path, final NodePathSearchCriteria criteria) {
-        return createPattern(criteria.getSearchExample(), criteria.isTrimEmptyNode(), criteria.isContainsChildPath()).matcher(path).find();
+        return createPattern(criteria.getSearchExample(), criteria.isContainsChildPath()).matcher(path).find();
     }
     
-    private static Pattern createPattern(final NodePath searchExample, final boolean trimEmptyNode, final boolean containsChildPath) {
+    private static Pattern createPattern(final NodePath searchExample, final boolean containsChildPath) {
         String endPattern = containsChildPath ? "?" : "$";
-        return Pattern.compile(START_PATTERN + NodePathGenerator.toPath(searchExample, trimEmptyNode) + endPattern, Pattern.CASE_INSENSITIVE);
+        return Pattern.compile(START_PATTERN + NodePathGenerator.toPath(searchExample, false) + endPattern, Pattern.CASE_INSENSITIVE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/DatabaseMetaDataNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/DatabaseMetaDataNodePath.java
@@ -40,6 +40,6 @@ public final class DatabaseMetaDataNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createDatabaseSearchCriteria() {
-        return new NodePathSearchCriteria(new DatabaseMetaDataNodePath(NodePathPattern.IDENTIFIER), false, true, 1);
+        return new NodePathSearchCriteria(new DatabaseMetaDataNodePath(NodePathPattern.IDENTIFIER), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
@@ -47,6 +47,6 @@ public StorageNodeNodePath(final String databaseName, final String storageNodeNa
      * @return created search criteria
      */
     public static NodePathSearchCriteria createStorageNodeSearchCriteria(final String databaseName) {
-        return new NodePathSearchCriteria(new StorageNodeNodePath(databaseName, NodePathPattern.IDENTIFIER), false, true, 1);
+        return new NodePathSearchCriteria(new StorageNodeNodePath(databaseName, NodePathPattern.IDENTIFIER), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
@@ -47,6 +47,6 @@ public StorageUnitNodePath(final String databaseName, final String storageUnitNa
      * @return created search criteria
      */
     public static NodePathSearchCriteria createStorageUnitSearchCriteria(final String databaseName) {
-        return new NodePathSearchCriteria(new StorageUnitNodePath(databaseName, NodePathPattern.IDENTIFIER), false, true, 1);
+        return new NodePathSearchCriteria(new StorageUnitNodePath(databaseName, NodePathPattern.IDENTIFIER), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
@@ -50,7 +50,7 @@ public DatabaseRuleNodePath(final String databaseName, final String ruleType, fi
      * @return create search criteria
      */
     public static NodePathSearchCriteria createRuleTypeSearchCriteria(final String databaseName) {
-        return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, NodePathPattern.IDENTIFIER, null), false, true, 1);
+        return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, NodePathPattern.IDENTIFIER, null), true, 1);
     }
     
     /**
@@ -62,6 +62,6 @@ public static NodePathSearchCriteria createRuleTypeSearchCriteria(final String d
      * @return create search criteria
      */
     public static NodePathSearchCriteria createRuleItemNameSearchCriteria(final String databaseName, final String ruleType, final String ruleItemType) {
-        return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType, NodePathPattern.QUALIFIED_IDENTIFIER)), false, true, 1);
+        return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType, NodePathPattern.QUALIFIED_IDENTIFIER)), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
@@ -48,6 +48,6 @@ public SchemaMetaDataNodePath(final String databaseName, final String schemaName
      * @return created search criteria
      */
     public static NodePathSearchCriteria createSchemaSearchCriteria(final String databaseName, final boolean containsChildPath) {
-        return new NodePathSearchCriteria(new SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER), false, containsChildPath, 1);
+        return new NodePathSearchCriteria(new SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER), containsChildPath, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
@@ -47,6 +47,6 @@ public TableMetaDataNodePath(final String databaseName, final String schemaName,
      * @return created search criteria
      */
     public static NodePathSearchCriteria createTableSearchCriteria(final String databaseName, final String schemaName) {
-        return new NodePathSearchCriteria(new TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), false, true, 1);
+        return new NodePathSearchCriteria(new TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
@@ -49,6 +49,6 @@ public ViewMetaDataNodePath(final String databaseName, final String schemaName,
      * @return created search criteria
      */
     public static NodePathSearchCriteria createViewSearchCriteria(final String databaseName, final String schemaName) {
-        return new NodePathSearchCriteria(new ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), false, true, 1);
+        return new NodePathSearchCriteria(new ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
@@ -47,6 +47,6 @@ public StatisticsDataNodePath(final String databaseName, final String schemaName
      * @return created search criteria
      */
     public static NodePathSearchCriteria createRowUniqueKeySearchCriteria() {
-        return new NodePathSearchCriteria(new StatisticsDataNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, false, 4);
+        return new NodePathSearchCriteria(new StatisticsDataNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, 4);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDatabaseNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDatabaseNodePath.java
@@ -41,6 +41,6 @@ public final class StatisticsDatabaseNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createDatabaseSearchCriteria(final boolean containsChildPath) {
-        return new NodePathSearchCriteria(new StatisticsDatabaseNodePath(NodePathPattern.IDENTIFIER), false, containsChildPath, 1);
+        return new NodePathSearchCriteria(new StatisticsDatabaseNodePath(NodePathPattern.IDENTIFIER), containsChildPath, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsSchemaNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsSchemaNodePath.java
@@ -46,6 +46,6 @@ public StatisticsSchemaNodePath(final String databaseName, final String schemaNa
      * @return created search criteria
      */
     public static NodePathSearchCriteria createSchemaSearchCriteria(final boolean containsChildPath) {
-        return new NodePathSearchCriteria(new StatisticsSchemaNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, containsChildPath, 2);
+        return new NodePathSearchCriteria(new StatisticsSchemaNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), containsChildPath, 2);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsTableNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsTableNodePath.java
@@ -48,6 +48,6 @@ public StatisticsTableNodePath(final String databaseName, final String schemaNam
      * @return created search criteria
      */
     public static NodePathSearchCriteria createTableSearchCriteria(final boolean containsChildPath) {
-        return new NodePathSearchCriteria(new StatisticsTableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, containsChildPath, 3);
+        return new NodePathSearchCriteria(new StatisticsTableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), containsChildPath, 3);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/config/GlobalRuleNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/config/GlobalRuleNodePath.java
@@ -40,6 +40,6 @@ public final class GlobalRuleNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createRuleTypeSearchCriteria() {
-        return new NodePathSearchCriteria(new GlobalRuleNodePath(NodePathPattern.IDENTIFIER), false, true, 1);
+        return new NodePathSearchCriteria(new GlobalRuleNodePath(NodePathPattern.IDENTIFIER), true, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
@@ -40,6 +40,6 @@ public final class LabelNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
-        return new NodePathSearchCriteria(new LabelNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+        return new NodePathSearchCriteria(new LabelNodePath(NodePathPattern.IDENTIFIER), false, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java
@@ -44,7 +44,7 @@ public KillProcessTriggerNodePath() {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
-        return new NodePathSearchCriteria(new KillProcessTriggerNodePath(), false, false, 1);
+        return new NodePathSearchCriteria(new KillProcessTriggerNodePath(), false, 1);
     }
     
     /**
@@ -53,6 +53,6 @@ public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createProcessIdSearchCriteria() {
-        return new NodePathSearchCriteria(new KillProcessTriggerNodePath(), false, false, 2);
+        return new NodePathSearchCriteria(new KillProcessTriggerNodePath(), false, 2);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java
@@ -44,7 +44,7 @@ public ShowProcessListTriggerNodePath() {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
-        return new NodePathSearchCriteria(new ShowProcessListTriggerNodePath(), false, false, 1);
+        return new NodePathSearchCriteria(new ShowProcessListTriggerNodePath(), false, 1);
     }
     
     /**
@@ -53,6 +53,6 @@ public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createProcessIdSearchCriteria() {
-        return new NodePathSearchCriteria(new ShowProcessListTriggerNodePath(), false, false, 2);
+        return new NodePathSearchCriteria(new ShowProcessListTriggerNodePath(), false, 2);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java
@@ -51,7 +51,7 @@ public OnlineNodePath() {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceTypeSearchCriteria() {
-        return new NodePathSearchCriteria(new OnlineNodePath(), false, false, 1);
+        return new NodePathSearchCriteria(new OnlineNodePath(), false, 1);
     }
     
     /**
@@ -60,6 +60,6 @@ public static NodePathSearchCriteria createInstanceTypeSearchCriteria() {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
-        return new NodePathSearchCriteria(new OnlineNodePath(), false, false, 2);
+        return new NodePathSearchCriteria(new OnlineNodePath(), false, 2);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java
@@ -40,6 +40,6 @@ public final class StatusNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
-        return new NodePathSearchCriteria(new StatusNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+        return new NodePathSearchCriteria(new StatusNodePath(NodePathPattern.IDENTIFIER), false, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java
@@ -40,6 +40,6 @@ public final class ComputeNodeWorkerIDNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
-        return new NodePathSearchCriteria(new ComputeNodeWorkerIDNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+        return new NodePathSearchCriteria(new ComputeNodeWorkerIDNodePath(NodePathPattern.IDENTIFIER), false, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java
@@ -45,6 +45,6 @@ public QualifiedDataSourceNodePath(final QualifiedDataSource qualifiedDataSource
      * @return created search criteria
      */
     public static NodePathSearchCriteria createQualifiedDataSourceSearchCriteria() {
-        return new NodePathSearchCriteria(new QualifiedDataSourceNodePath(NodePathPattern.QUALIFIED_IDENTIFIER), false, false, 1);
+        return new NodePathSearchCriteria(new QualifiedDataSourceNodePath(NodePathPattern.QUALIFIED_IDENTIFIER), false, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java
@@ -40,6 +40,6 @@ public final class DatabaseListenerCoordinatorNodePath implements NodePath {
      * @return created search criteria
      */
     public static NodePathSearchCriteria createDatabaseSearchCriteria() {
-        return new NodePathSearchCriteria(new DatabaseListenerCoordinatorNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+        return new NodePathSearchCriteria(new DatabaseListenerCoordinatorNodePath(NodePathPattern.IDENTIFIER), false, 1);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
@@ -193,7 +193,7 @@ private boolean isNamedItem(final Field field) {
     private void setNamedItemFieldValue(final String databaseName, final YamlRuleConfiguration yamlRuleConfig,
                                         final String ruleType, final RuleNodeTuple tuple, final String itemType, final Field field) {
         DatabaseRuleNodePath databaseRuleNodePath = new DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(itemType, NodePathPattern.QUALIFIED_IDENTIFIER));
-        Optional<String> itemValue = NodePathSearcher.find(tuple.getPath(), new NodePathSearchCriteria(databaseRuleNodePath, false, true, 1));
+        Optional<String> itemValue = NodePathSearcher.find(tuple.getPath(), new NodePathSearchCriteria(databaseRuleNodePath, true, 1));
         if (!itemValue.isPresent()) {
             return;
         }
@@ -218,7 +218,7 @@ private void setNamedItemFieldValue(final String databaseName, final YamlRuleCon
     private void setUniqueItemFieldValue(final String databaseName, final YamlRuleConfiguration yamlRuleConfig,
                                          final String ruleType, final RuleNodeTuple tuple, final String itemType, final Field field) {
         DatabaseRuleNodePath databaseRuleNodePath = new DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(itemType));
-        if (!NodePathSearcher.isMatchedPath(tuple.getPath(), new NodePathSearchCriteria(databaseRuleNodePath, false, true, 1))) {
+        if (!NodePathSearcher.isMatchedPath(tuple.getPath(), new NodePathSearchCriteria(databaseRuleNodePath, true, 1))) {
             return;
         }
         if (field.getType().equals(Collection.class)) {
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
@@ -89,7 +89,7 @@ private boolean isSubscribed(final DatabaseChangedHandler handler, final String
             return new VersionNodePath(handler.getSubscribedNodePath(databaseName)).isActiveVersionPath(event.getKey());
         }
         if (handler instanceof DatabaseNodeValueChangedHandler) {
-            return NodePathSearcher.isMatchedPath(event.getKey(), new NodePathSearchCriteria(handler.getSubscribedNodePath(databaseName), false, false, 1));
+            return NodePathSearcher.isMatchedPath(event.getKey(), new NodePathSearchCriteria(handler.getSubscribedNodePath(databaseName), false, 1));
         }
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public final class NodePathSearcher {`
`42`	`42`	`* @return found node segment`
`43`	`43`	`*/`
`44`	`44`	`public static Optional<String> find(final String path, final NodePathSearchCriteria criteria) {`
`45`		`- Matcher matcher = createPattern(criteria.getSearchExample(), criteria.isTrimEmptyNode(), criteria.isContainsChildPath()).matcher(path);`
	`45`	`+ Matcher matcher = createPattern(criteria.getSearchExample(), criteria.isContainsChildPath()).matcher(path);`
`46`	`46`	`return matcher.find() ? Optional.of(matcher.group(criteria.getSearchSegmentIndex())) : Optional.empty();`
`47`	`47`	`}`
`48`	`48`
`@@ -65,11 +65,11 @@ public static String get(final String path, final NodePathSearchCriteria criteri`
`65`	`65`	`* @return is matched path or not`
`66`	`66`	`*/`
`67`	`67`	`public static boolean isMatchedPath(final String path, final NodePathSearchCriteria criteria) {`
`68`		`- return createPattern(criteria.getSearchExample(), criteria.isTrimEmptyNode(), criteria.isContainsChildPath()).matcher(path).find();`
	`68`	`+ return createPattern(criteria.getSearchExample(), criteria.isContainsChildPath()).matcher(path).find();`
`69`	`69`	`}`
`70`	`70`
`71`		`- private static Pattern createPattern(final NodePath searchExample, final boolean trimEmptyNode, final boolean containsChildPath) {`
	`71`	`+ private static Pattern createPattern(final NodePath searchExample, final boolean containsChildPath) {`
`72`	`72`	`String endPattern = containsChildPath ? "?" : "$";`
`73`		`- return Pattern.compile(START_PATTERN + NodePathGenerator.toPath(searchExample, trimEmptyNode) + endPattern, Pattern.CASE_INSENSITIVE);`
	`73`	`+ return Pattern.compile(START_PATTERN + NodePathGenerator.toPath(searchExample, false) + endPattern, Pattern.CASE_INSENSITIVE);`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ public final class DatabaseMetaDataNodePath implements NodePath {`
`40`	`40`	`* @return created search criteria`
`41`	`41`	`*/`
`42`	`42`	`public static NodePathSearchCriteria createDatabaseSearchCriteria() {`
`43`		`- return new NodePathSearchCriteria(new DatabaseMetaDataNodePath(NodePathPattern.IDENTIFIER), false, true, 1);`
	`43`	`+ return new NodePathSearchCriteria(new DatabaseMetaDataNodePath(NodePathPattern.IDENTIFIER), true, 1);`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public StorageNodeNodePath(final String databaseName, final String storageNodeNa`
`47`	`47`	`* @return created search criteria`
`48`	`48`	`*/`
`49`	`49`	`public static NodePathSearchCriteria createStorageNodeSearchCriteria(final String databaseName) {`
`50`		`- return new NodePathSearchCriteria(new StorageNodeNodePath(databaseName, NodePathPattern.IDENTIFIER), false, true, 1);`
	`50`	`+ return new NodePathSearchCriteria(new StorageNodeNodePath(databaseName, NodePathPattern.IDENTIFIER), true, 1);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public StorageUnitNodePath(final String databaseName, final String storageUnitNa`
`47`	`47`	`* @return created search criteria`
`48`	`48`	`*/`
`49`	`49`	`public static NodePathSearchCriteria createStorageUnitSearchCriteria(final String databaseName) {`
`50`		`- return new NodePathSearchCriteria(new StorageUnitNodePath(databaseName, NodePathPattern.IDENTIFIER), false, true, 1);`
	`50`	`+ return new NodePathSearchCriteria(new StorageUnitNodePath(databaseName, NodePathPattern.IDENTIFIER), true, 1);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public DatabaseRuleNodePath(final String databaseName, final String ruleType, fi`
`50`	`50`	`* @return create search criteria`
`51`	`51`	`*/`
`52`	`52`	`public static NodePathSearchCriteria createRuleTypeSearchCriteria(final String databaseName) {`
`53`		`- return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, NodePathPattern.IDENTIFIER, null), false, true, 1);`
	`53`	`+ return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, NodePathPattern.IDENTIFIER, null), true, 1);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
`@@ -62,6 +62,6 @@ public static NodePathSearchCriteria createRuleTypeSearchCriteria(final String d`
`62`	`62`	`* @return create search criteria`
`63`	`63`	`*/`
`64`	`64`	`public static NodePathSearchCriteria createRuleItemNameSearchCriteria(final String databaseName, final String ruleType, final String ruleItemType) {`
`65`		`- return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType, NodePathPattern.QUALIFIED_IDENTIFIER)), false, true, 1);`
	`65`	`+ return new NodePathSearchCriteria(new DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType, NodePathPattern.QUALIFIED_IDENTIFIER)), true, 1);`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@ public SchemaMetaDataNodePath(final String databaseName, final String schemaName`
`48`	`48`	`* @return created search criteria`
`49`	`49`	`*/`
`50`	`50`	`public static NodePathSearchCriteria createSchemaSearchCriteria(final String databaseName, final boolean containsChildPath) {`
`51`		`- return new NodePathSearchCriteria(new SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER), false, containsChildPath, 1);`
	`51`	`+ return new NodePathSearchCriteria(new SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER), containsChildPath, 1);`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public TableMetaDataNodePath(final String databaseName, final String schemaName,`
`47`	`47`	`* @return created search criteria`
`48`	`48`	`*/`
`49`	`49`	`public static NodePathSearchCriteria createTableSearchCriteria(final String databaseName, final String schemaName) {`
`50`		`- return new NodePathSearchCriteria(new TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), false, true, 1);`
	`50`	`+ return new NodePathSearchCriteria(new TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), true, 1);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ public ViewMetaDataNodePath(final String databaseName, final String schemaName,`
`49`	`49`	`* @return created search criteria`
`50`	`50`	`*/`
`51`	`51`	`public static NodePathSearchCriteria createViewSearchCriteria(final String databaseName, final String schemaName) {`
`52`		`- return new NodePathSearchCriteria(new ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), false, true, 1);`
	`52`	`+ return new NodePathSearchCriteria(new ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), true, 1);`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public StatisticsDataNodePath(final String databaseName, final String schemaName`
`47`	`47`	`* @return created search criteria`
`48`	`48`	`*/`
`49`	`49`	`public static NodePathSearchCriteria createRowUniqueKeySearchCriteria() {`
`50`		`- return new NodePathSearchCriteria(new StatisticsDataNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, false, 4);`
	`50`	`+ return new NodePathSearchCriteria(new StatisticsDataNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, 4);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public final class StatisticsDatabaseNodePath implements NodePath {`
`41`	`41`	`* @return created search criteria`
`42`	`42`	`*/`
`43`	`43`	`public static NodePathSearchCriteria createDatabaseSearchCriteria(final boolean containsChildPath) {`
`44`		`- return new NodePathSearchCriteria(new StatisticsDatabaseNodePath(NodePathPattern.IDENTIFIER), false, containsChildPath, 1);`
	`44`	`+ return new NodePathSearchCriteria(new StatisticsDatabaseNodePath(NodePathPattern.IDENTIFIER), containsChildPath, 1);`
`45`	`45`	`}`
`46`	`46`	`}`