Merge branch 'develop' into main

.github/dependabot.yml

@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "java"
+  - package-ecosystem: "maven"
     directory: "/"
     schedule:
         interval: "monthly"

.github/workflows/branch-cicd.yaml

@@ -106,7 +106,7 @@ jobs:
 
             -
                 name: Set up Python 3
-                uses: actions/setup-python@v4
+                uses: actions/setup-python@v5
                 with:
                     python-version: '3.9'
 

.github/workflows/unstable-cicd.yaml

@@ -67,17 +67,17 @@ jobs:
                     key: pds-${{runner.os}}-mvn-${{hashFiles('**/pom.xml')}}
                     # To restore a set of files, we only need to match a prefix of the saved key.
                     restore-keys: pds-${{runner.os}}-mvn-
-            -
-                name: 🤠 Roundup
-                uses: NASA-PDS/roundup-action@stable
-                with:
-                    assembly: unstable
-                    packages: openjdk17-jdk
-                env:
-                    ossrh_username: ${{secrets.OSSRH_USERNAME}}
-                    ossrh_password: ${{secrets.OSSRH_PASSWORD}}
-                    CODE_SIGNING_KEY: ${{secrets.CODE_SIGNING_KEY}}
-                    ADMIN_GITHUB_TOKEN: ${{secrets.ADMIN_GITHUB_TOKEN}}
+            # -
+            #     name: 🤠 Roundup
+            #     uses: NASA-PDS/roundup-action@ff-only
+            #     with:
+            #         assembly: unstable
+            #         packages: openjdk17-jdk
+            #     env:
+            #         ossrh_username: ${{secrets.OSSRH_USERNAME}}
+            #         ossrh_password: ${{secrets.OSSRH_PASSWORD}}
+            #         CODE_SIGNING_KEY: ${{secrets.CODE_SIGNING_KEY}}
+            #         ADMIN_GITHUB_TOKEN: ${{secrets.ADMIN_GITHUB_TOKEN}}
             -
                 name: 🫙 Jar File Determination
                 id: jarrer
@@ -111,7 +111,8 @@ jobs:
                     cd registry/docker/certs
                     ./generate-certs.sh
                     cd ..
-                    docker image inspect nasapds/registry-api-service:latest >/dev/null
+                    docker image pull ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest
+                    docker image inspect ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest >/dev/null
                     docker compose \
                         --ansi never --profile int-registry-batch-loader --project-name registry \
                         up --detach --quiet-pull

README.md

@@ -127,5 +127,3 @@ Launch the test in command line:
     newman run docker/postman/postman_collection.json --env-var baseUrl=http://localhost:8080
 
 
-
-

service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java

@@ -14,6 +14,7 @@
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.apache.commons.lang3.StringUtils;
 import org.opensearch.client.opensearch._types.FieldSort;
 import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.opensearch._types.SortOptions;
@@ -339,8 +340,7 @@ public RegistrySearchRequestBuilder constrainByQueryString(String q) throws Unpa
       }
       return this;
     } catch (RecognitionException | ParseCancellationException e) {
-      String sanitizedQ = q.replace('\n', ' ').replace('\r', ' ');
-      log.info("Unable to parse q " + sanitizedQ + " error message is " + e);
+      log.info("Unable to parse q " + StringUtils.normalizeSpace(q) + "error message is " + e);
       throw new UnparsableQParamException(
           "q string value:" + q + " Error message " + e.getMessage());
     }