summaryrefslogtreecommitdiffstats
path: root/cps-ri
diff options
context:
space:
mode:
authorBruno Sakoto <bruno.sakoto@bell.ca>2021-10-28 11:23:31 +0200
committerBruno Sakoto <bruno.sakoto@bell.ca>2021-10-28 12:59:03 +0000
commitb143c512a2a9c7c066c03de1b74b9c72c8d1c37a (patch)
treed833cfab3bb74929382573e2cd326423eb0df0d4 /cps-ri
parent717215a36dde7bedb4257e693650c8728056b9d6 (diff)
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
Diffstat (limited to 'cps-ri')
-rw-r--r--cps-ri/pom.xml4
-rw-r--r--cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepositoryCpsPathQueryImpl.java5
2 files changed, 0 insertions, 9 deletions
diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index b7aa4193d1..8d860b0041 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 4aa3e5fb36..fddedcad27 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());