Merge branch 'master' into RMB-1047

Author: julianladisch

cql2pgjson/src/main/java/org/folio/cql2pgjson/CQL2PgJSON.java

@@ -828,7 +828,7 @@ private String queryByFt(String index, DbIndex dbIndex, IndexTextAndJsonValues v
     }
 
     // Clean the term. Remove stand-alone ' *', not valid word.
-    String term = node.getTerm().replaceAll(" +[*]", "").trim();
+    String term = node.getTerm().replace(" *", " ").trim();
     Index schemaIndex = null;
     if (targetTable != null) {
       schemaIndex = DbSchemaUtils.getIndex(index, targetTable.getFullTextIndex());

cql2pgjson/src/test/java/org/folio/cql2pgjson/CQL2PgJSONTest.java

@@ -936,6 +936,8 @@ public void idMatch(String testcase) {
     "name == \"Lea Long\"           # Lea Long",
     "name <> \"Lea Long\"           # Jo Jane; Ka Keller",
     "name = \"Lea *\"               # Lea Long", // Loose '*' should be ignored
+    "name = \"Lea * Long\"          # Lea Long",
+    "name = \"Lea  *  Long\"        # Lea Long",
     "name = \"*\"                   # Jo Jane; Ka Keller; Lea Long", // special case
     "name = \"Le* Lo*\"             # Lea Long",
     "name = \" * * \"               # Jo Jane; Ka Keller; Lea Long",