Merge "Policy Executor: handle errors, part 2 (fighting between IntelliJ and Checkstyle best practices)"

2 files changed, 7 insertions, 0 deletions

diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index c3ad6a2aed..bcf6c802de 100644
--- a/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
@@ -68,6 +68,11 @@
             <artifactId>postgresql</artifactId>

             <version>${postgres.version}</version>

         </dependency>

+        <!-- Disable SpotBug Rules -->

+        <dependency>

+            <groupId>com.github.spotbugs</groupId>

+            <artifactId>spotbugs-annotations</artifactId>

+        </dependency>

         <!-- Add Hibernate support for Postgres datatype JSONB and Postgres arrays -->

         <dependency>

             <groupId>io.hypersistence</groupId>

diff --git a/cps-ri/src/main/java/org/onap/cps/ri/repository/ModuleReferenceRepositoryImpl.java b/cps-ri/src/main/java/org/onap/cps/ri/repository/ModuleReferenceRepositoryImpl.java
index 702b5896c7..4ca02a9c3c 100644
--- a/cps-ri/src/main/java/org/onap/cps/ri/repository/ModuleReferenceRepositoryImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/ri/repository/ModuleReferenceRepositoryImpl.java
@@ -20,6 +20,7 @@
 
 package org.onap.cps.ri.repository;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.Query;
@@ -118,6 +119,7 @@ public class ModuleReferenceRepositoryImpl implements ModuleReferenceQuery {
         query.setParameter(4, dataspaceName);
     }
 
+    @SuppressFBWarnings(value = "VA_FORMAT_STRING_USES_NEWLINE", justification = "no \n in string just in file format")
     private String buildModuleReferencesSqlQuery(final String parentFragmentClause, final String childFragmentClause) {
         return """
                 WITH Fragment AS (