Merge branch 'georchestra-gn4.2.x' into georchestra-gn4.2.x-rebase

.backportrc.json

@@ -0,0 +1,3 @@
+{
+  "autoMerge": true
+}

.github/workflows/backport.yml

@@ -0,0 +1,24 @@
+name: Automatic backport action
+
+on:
+  pull_request_target:
+    types: ["closed"]
+
+jobs:
+  backport:
+    name: Backport PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Backport Action
+        uses: sqren/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          auto_backport_label_prefix: backport-to-
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log

.github/workflows/georchestra-gn4.yml

@@ -62,3 +62,4 @@ jobs:
       with:
         name: geonetwork.war
         path: web/target/geonetwork.war
+

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

@@ -449,7 +449,7 @@ public Element search(ServiceContext context, int startPos, int maxRecords,
 
         try {
             String filterQueryString = esFilterBuilder.build(context, "metadata", false, node);
-            String jsonQuery = String.format(elasticSearchQuery, filterQueryString);
+            String jsonQuery = StringUtils.replace(elasticSearchQuery, "{@}", filterQueryString);
 
             ObjectMapper objectMapper = new ObjectMapper();
             esJsonQuery = objectMapper.readTree(jsonQuery);