Merge pull request #16 from lzoubek/bugs/1080909

[BZ 1080909] DynaGroup expression evaluator is not strict when grouping by resource configuration property
rhq-project · Apr 22, 2014 · 4c111ac · 4c111ac
2 parents 44960d4 + 21bb0b2
commit 4c111ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...q/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java b/...q/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java
@@ -70,7 +70,7 @@ private String[][] getSuccessTestCases() {
         "SELECT res.id FROM Resource res " + //
             "  JOIN res.pluginConfiguration pluginConf, PropertySimple simple, PropertyDefinition simpleDef  " + //
             "  JOIN res.resourceType.pluginConfigurationDefinition pluginConfDef " + // 
-            " WHERE simple.name LIKE :arg1 ESCAPE '" + escapeChar + "'" + //
+            " WHERE simple.name = :arg1 " + //
             "   AND simple.stringValue = :arg2 " + //
             "   AND simple.configuration = pluginConf " + //
             "   AND simpleDef.configurationDefinition = pluginConfDef " + //
@@ -81,7 +81,7 @@ private String[][] getSuccessTestCases() {
         "SELECT res.id FROM Resource res " + //
             "  JOIN res.resourceConfiguration conf, PropertySimple simple, PropertyDefinition simpleDef  " + //
             "  JOIN res.resourceType.resourceConfigurationDefinition confDef " + // 
-            " WHERE simple.name LIKE :arg1 ESCAPE '" + escapeChar + "'" + //
+            " WHERE simple.name = :arg1 " + //
             "   AND simple.stringValue LIKE :arg2 ESCAPE '" + escapeChar + "'" + //
             "   AND simple.configuration = conf " + //
             "   AND simpleDef.configurationDefinition = confDef " + //
@@ -103,7 +103,7 @@ private String[][] getSuccessTestCases() {
         "  SELECT simple.stringValue FROM Resource res " + //
             "    JOIN res.resourceConfiguration conf, PropertySimple simple, PropertyDefinition simpleDef  " + //
             "    JOIN res.resourceType.resourceConfigurationDefinition confDef " + //
-            "   WHERE simple.name LIKE :arg1 ESCAPE '" + escapeChar + "'" + //
+            "   WHERE simple.name = :arg1 " + //
             "     AND simple.configuration = conf " + //
             "     AND simpleDef.configurationDefinition = confDef " + //
             "     AND simple.name = simpleDef.name AND simpleDef.type != 'PASSWORD' " + //
@@ -112,7 +112,7 @@ private String[][] getSuccessTestCases() {
         "  SELECT res.id FROM Resource res " + //
             "  JOIN res.resourceConfiguration conf, PropertySimple simple, PropertyDefinition simpleDef  " + //
             "  JOIN res.resourceType.resourceConfigurationDefinition confDef " + //
-            " WHERE simple.name LIKE :arg1 ESCAPE '" + escapeChar + "'" + //
+            " WHERE simple.name = :arg1 " + //
             "   AND simple.stringValue = :arg2 " + //
             "     AND simple.configuration = conf " + //
             "     AND simpleDef.configurationDefinition = confDef " + //
@@ -150,7 +150,7 @@ private String[][] getSuccessTestCases() {
         "SELECT res.id FROM Resource res " + //
             "  JOIN res.pluginConfiguration pluginConf, PropertySimple simple, PropertyDefinition simpleDef  " + //
             "  JOIN res.resourceType.pluginConfigurationDefinition pluginConfDef " + // 
-            " WHERE simple.name LIKE :arg1 ESCAPE '" + escapeChar + "'" + //
+            " WHERE simple.name = :arg1 " + //
             "   AND simple.stringValue IS NULL " + //
             "   AND simple.configuration = pluginConf " + //
             "   AND simpleDef.configurationDefinition = pluginConfDef " + //
@@ -811,6 +811,16 @@ public String[] getExpressions() {
         });
     }
 
+    @Test(expectedExceptions = InvalidExpressionException.class, expectedExceptionsMessageRegExp = "Unrecognized.*")
+    public void doNotAllowEmptyProperty() throws Exception {
+        evaluateExpressions(new ExpressionGenerator() {
+            @Override
+            public String[] getExpressions() {
+                return new String[] { "resource.greatGreatGrandParent.resourceConfiguration[] = 1" };
+            }
+        });
+    }
+
     private String cleanUp(String result) {
         return result.replaceAll("\\s+", " ").trim();
     }

diff --git a/...va/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java b/...va/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java
@@ -643,7 +643,7 @@ private void parseExpression(String expression) throws InvalidExpressionExceptio
                 addJoinCondition(joinCondition);
                 addJoinCondition(definitionJoinCondition);
 
-                populatePredicateCollections(PROP_SIMPLE_ALIAS + ".name", "%" + propertyName + "%", false, false);
+                populatePredicateCollections(PROP_SIMPLE_ALIAS + ".name", propertyName, false, false);
                 populatePredicateCollections(PROP_SIMPLE_ALIAS + ".stringValue", value);
 
                 whereStatics.add(PROP_SIMPLE_ALIAS + ".configuration = " + joinCondition.alias);