Merge pull request #346 from georchestra/csw-get-records-wildcard-fix

Fix: attempt to fix CSW filters with empty escapeChar

Author: pmauduit

csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2Es.java

@@ -158,7 +158,9 @@ protected static String convertLikePattern(PropertyIsLike filter) {
         // For example, if the wildcard is % and the escape character is \:
         //  - in the previous replacement %afr\%ca% becomes *afr\*ca*
         //  - and with this replacement *afr\*ca* becomes *afr\%ca*
-        result = result.replaceAll(Pattern.quote(escapeWildcardDefault), wildcardChar);
+        // Skip if the escapeChar is an empty string, to avoid reverting previous change
+        if (! StringUtils.isEmpty(filter.getEscape()))
+            result = result.replaceAll(Pattern.quote(escapeWildcardDefault), wildcardChar);
 
         if (wildcardChar.equals("%")) {
             // Escape % for String.format used in SearchController to process the csw filter
@@ -171,7 +173,9 @@ protected static String convertLikePattern(PropertyIsLike filter) {
             String escapeSinglecharDefault = filter.getEscape() + "?";
 
             result = result.replaceAll(Pattern.quote(singleChar), "?");
-            result = result.replaceAll(Pattern.quote(escapeSinglecharDefault), singleChar);
+            // Skip if the escapeChar is an empty string, to avoid reverting previous change
+            if (! StringUtils.isEmpty(filter.getEscape()))
+                result = result.replaceAll(Pattern.quote(escapeSinglecharDefault), singleChar);
 
             if (singleChar.equals("%")) {
                 result = result.replace( singleChar, "%%");

csw-server/src/test/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2EsTest.java

@@ -195,6 +195,26 @@ void testPropertyIsLike() throws IOException {
         assertFilterEquals(expected, input);
     }
 
+    @Test
+    void testUuidPropertyIsLike() throws IOException {
+
+        final String input =
+            "      <Filter xmlns=\"http://www.opengis.net/ogc\">\n" +
+            "         <PropertyIsLike wildCard=\"%\" singleChar=\"_\" escapeChar=\"\">\n" +
+            "            <PropertyName>dc:identifier</PropertyName>\n" +
+            "            <Literal>%</Literal>\n" +
+            "        </PropertyIsLike>\n" +
+            "      </Filter>\n";
+
+        // EXPECTED:
+        final ObjectNode expected = EsJsonHelper.boolbdr(). //
+            must(array(queryStringPart("dc:identifier", "*"))). //
+            filter(queryStringPart()). //
+            bld();
+
+        assertFilterEquals(expected, input);
+    }
+
     @Test
     void testPropertyIsLikeSpecialChars() throws IOException {