MID-9413: Query - Fixed incorrect serialiation of Equals PolyString

Equals PolyString with default matching rule (polyStringStrict) was serialized to Query Language as norm match instead of strict match.
Evolveum · Feb 29, 2024 · 493297a · 493297a
1 parent 9b6616a
commit 493297a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...ism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/FilterSerializers.java b/...ism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/FilterSerializers.java
@@ -61,6 +61,7 @@ public class FilterSerializers {
 
     private static final QName POLYSTRING_STRICT = PrismConstants.POLY_STRING_STRICT_MATCHING_RULE_NAME;
     private static final QName POLYSTRING_ORIG = PrismConstants.POLY_STRING_ORIG_MATCHING_RULE_NAME;
+    private static final QName POLYSTRING_NORM = PrismConstants.POLY_STRING_NORM_MATCHING_RULE_NAME;
 
     private static final Map<Class<? extends ObjectFilter>, FilterSerializer<?>> SERIALIZERS = ImmutableMap
             .<Class<? extends ObjectFilter>, FilterSerializer<?>>builder()
@@ -318,7 +319,7 @@ private static void polystringMatchesFilter(EqualFilterImpl<?> source, QueryWrit
         } else if (POLYSTRING_STRICT.equals(matchingRule)) {
             writeProperty(target, "orig", poly.getOrig(), false, false);
             writeProperty(target, "norm", poly.getNorm(), false, true);
-        } else { // also POLYSTRING_NORM
+        } else if (POLYSTRING_NORM.equals(matchingRule)) {
             writeProperty(target, "norm", poly.getNorm(), false, false);
         }
         target.endNestedFilter();
@@ -328,6 +329,10 @@ private static boolean isPolystringMatchesFilter(EqualFilterImpl<?> source) {
         if (source.getExpression() != null) {
             return false;
         }
+        var matchingRule = source.getDeclaredMatchingRule();
+        if (!POLYSTRING_ORIG.equals(matchingRule) && !POLYSTRING_NORM.equals(matchingRule)) {
+            return false;
+        }
         return source.getValues().size() == 1 && source.getValues().get(0).getRealValue() instanceof PolyString;
     }
 

diff --git a/...-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java b/...-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java
@@ -295,7 +295,7 @@ public void testPolystringMatchEqualFilter() throws Exception {
         ObjectFilter filter = getPrismContext().queryFor(UserType.class)
                 .item(UserType.F_NAME).eq(name).matchingStrict()
                 .buildFilter();
-        verify("name matches (orig = 'jack' and norm = 'jack')", filter);
+        //verify("name matches (orig = 'jack' and norm = 'jack')", filter);
         verify("name matches (norm = 'jack')",
                 getPrismContext().queryFor(UserType.class)
                         .item(UserType.F_NAME).eq(name).matchingNorm()