From b143c512a2a9c7c066c03de1b74b9c72c8d1c37a Mon Sep 17 00:00:00 2001
From: Bruno Sakoto <bruno.sakoto@bell.ca>
Date: Thu, 28 Oct 2021 11:23:31 +0200
Subject: [PATCH 1/1] Remove org.jetbrains.annotations dependency

It is not part of spring boot 2.5.5 anymore
and using it to enforce code invariant is not consistent
in the overall code base.

Issue-ID: CPS-582
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I6b2c1b8340cda376b70daa2ac092b3d02daa8960
---
 cps-ncmp-service/pom.xml                                             | 4 ----
 .../java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java     | 4 ----
 cps-ri/pom.xml                                                       | 4 ----
 .../onap/cps/spi/repository/FragmentRepositoryCpsPathQueryImpl.java  | 5 -----
 4 files changed, 17 deletions(-)

diff --git a/cps-ncmp-service/pom.xml b/cps-ncmp-service/pom.xml
index e82c95e11..b70279303 100644
--- a/cps-ncmp-service/pom.xml
+++ b/cps-ncmp-service/pom.xml
@@ -66,9 +66,5 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java
index f7421cdb7..562c33065 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java
@@ -22,7 +22,6 @@ package org.onap.cps.ncmp.api.impl.operation;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
 import org.onap.cps.ncmp.api.impl.client.DmiRestClient;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -165,7 +164,6 @@ public class DmiOperations {
         return dmiRestClient.postOperationWithJsonData(stringBuilder.toString(), jsonBody, new HttpHeaders());
     }
 
-    @NotNull
     private String getDmiResourceUrl(final String dmiServiceName,
                                      final String cmHandle,
                                      final String resourceName) {
@@ -176,7 +174,6 @@ public class DmiOperations {
         return stringBuilder.toString();
     }
 
-    @NotNull
     private String getDmiDatastoreUrl(final String dmiServiceName,
                                       final String cmHandle,
                                       final String resourceId,
@@ -188,7 +185,6 @@ public class DmiOperations {
         return stringBuilder.toString();
     }
 
-    @NotNull
     private StringBuilder getStringBuilderForPassThroughUrl(final String dmiServiceName,
                                                             final String cmHandle,
                                                             final String resourceId,
diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index b7aa4193d..8d860b004 100644
--- a/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
@@ -100,10 +100,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-        </dependency>
         <!-- T E S T   D E P E N D E N C I E S -->
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepositoryCpsPathQueryImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepositoryCpsPathQueryImpl.java
index 4aa3e5fb3..fddedcad2 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepositoryCpsPathQueryImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepositoryCpsPathQueryImpl.java
@@ -28,8 +28,6 @@ import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.onap.cps.cpspath.parser.CpsPathPrefixType;
 import org.onap.cps.cpspath.parser.CpsPathQuery;
 import org.onap.cps.spi.entities.FragmentEntity;
@@ -63,7 +61,6 @@ public class FragmentRepositoryCpsPathQueryImpl implements FragmentRepositoryCps
         return query.getResultList();
     }
 
-    @NotNull
     private static String getSimilarToXpathSqlRegex(final CpsPathQuery cpsPathQuery) {
         final var xpathRegexBuilder = new StringBuilder();
         if (CpsPathPrefixType.ABSOLUTE.equals(cpsPathQuery.getCpsPathPrefixType())) {
@@ -76,13 +73,11 @@ public class FragmentRepositoryCpsPathQueryImpl implements FragmentRepositoryCps
         return xpathRegexBuilder.toString();
     }
 
-    @NotNull
     private static String escapeXpath(final String xpath) {
         // See https://jira.onap.org/browse/CPS-500 for limitations of this basic escape mechanism
         return xpath.replace("[@", "\\[@");
     }
 
-    @Nullable
     private static Integer getTextValueAsInt(final CpsPathQuery cpsPathQuery) {
         try {
             return Integer.parseInt(cpsPathQuery.getTextFunctionConditionValue());
-- 
2.16.6