Sonarqube bugs and security hotspot fixes

- Replaced invalid SpEL expressions using @Value with proper syntax for list initialization.
- Updated regex pattern initialization to avoid excessive backtracking.

Issue-ID: AAI-4185
Change-Id: I84fa115e74bf5365b7eac7bbac413cb98c3487af
Signed-off-by: akshay.khairnar@t-systems.com <akshay.khairnar@t-systems.com>

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 3da35f2..a5da1cf 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>

-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>

     </parent>
     <artifactId>aai-annotations</artifactId>
     <name>aai-annotations</name>
     </parent>
     <artifactId>aai-annotations</artifactId>
     <name>aai-annotations</name>

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index f492574..7e58e16 100644 (file)
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>

-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>

     </parent>
     <artifactId>aai-queries</artifactId>
     <name>aai-queries</name>
     </parent>
     <artifactId>aai-queries</artifactId>
     <name>aai-queries</name>

diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index 0fa3bbd..55c7106 100644 (file)
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>

-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>

     </parent>
     <artifactId>aai-schema-gen</artifactId>
     <name>aai-schema-gen</name>
     </parent>
     <artifactId>aai-schema-gen</artifactId>
     <name>aai-schema-gen</name>

diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index add572f..bdbe648 100644 (file)
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>

-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>

     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>aai-schema-service</artifactId>
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>aai-schema-service</artifactId>

diff --git a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/SchemaLocationsBean.java b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/SchemaLocationsBean.java
index 3582c5e..a058d73 100644 (file)
--- a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/SchemaLocationsBean.java
+++ b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/config/SchemaLocationsBean.java
@@ -54,13 +54,13 @@ public class SchemaLocationsBean {
     @Value("${schema.edges.location}")
     private String edgeDirectory;
 
     @Value("${schema.edges.location}")
     private String edgeDirectory;
 

-    @Value("${schema.nodes.inclusion.list:}#{T(java.util.Arrays).asList(\".*oxm(.*).xml\")}")
+    @Value("#{'${schema.nodes.inclusion.list:.*oxm(.*).xml}'.split(',')}")

     private List<String> nodesInclusionPattern;
 
     @Value("${schema.nodes.exclusion.list:}#{T(java.util.Collections).emptyList()}")
     private List<String> nodesExclusionPattern;
 
     private List<String> nodesInclusionPattern;
 
     @Value("${schema.nodes.exclusion.list:}#{T(java.util.Collections).emptyList()}")
     private List<String> nodesExclusionPattern;
 

-    @Value("${schema.edges.inclusion.list:}#{T(java.util.Arrays).asList(\"DbEdgeRules_.*.json\")}")
+    @Value("#{'${schema.edges.inclusion.list:DbEdgeRules_.*.json}'.split(',')}")

     private List<String> edgesInclusionPattern;
 
     @Value("${schema.edges.exclusion.list:}#{T(java.util.Collections).emptyList()}")
     private List<String> edgesInclusionPattern;
 
     @Value("${schema.edges.exclusion.list:}#{T(java.util.Collections).emptyList()}")

diff --git a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/pre/RequestHeaderManipulation.java b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/pre/RequestHeaderManipulation.java
index fea4a9b..dcb068e 100644 (file)
--- a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/pre/RequestHeaderManipulation.java
+++ b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/pre/RequestHeaderManipulation.java
@@ -38,7 +38,7 @@ import org.onap.aai.schemaservice.interceptors.AAIHeaderProperties;
 public class RequestHeaderManipulation extends AAIContainerFilter
     implements ContainerRequestFilter {
 
 public class RequestHeaderManipulation extends AAIContainerFilter
     implements ContainerRequestFilter {
 

-    public static final Pattern EXTRACT_VERSION_PATTERN = Pattern.compile("^(v[1-9][0-9]*).*$");
+    private static final Pattern EXTRACT_VERSION_PATTERN = Pattern.compile("^(v[1-9]\\d{0,9}).*");

 
     @Override
     public void filter(ContainerRequestContext requestContext) {
 
     @Override
     public void filter(ContainerRequestContext requestContext) {

diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index edbe92b..dc366f9 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>

-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>

     </parent>
     <artifactId>aai-schema</artifactId>
     <name>aai-schema</name>
     </parent>
     <artifactId>aai-schema</artifactId>
     <name>aai-schema</name>

diff --git a/pom.xml b/pom.xml
index 242a089..ecab766 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>schema-service</artifactId>
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>schema-service</artifactId>

-    <version>1.13.1-SNAPSHOT</version>
+    <version>1.13.2-SNAPSHOT</version>

     <name>aai-schema-service</name>
     <packaging>pom</packaging>
     <modules>
     <name>aai-schema-service</name>
     <packaging>pom</packaging>
     <modules>

diff --git a/version.properties b/version.properties
index ddff0da..7310082 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 major_version=1
 minor_version=13
 # because they are used in Jenkins, whose plug-in doesn't support
 major_version=1
 minor_version=13

-patch_version=1
+patch_version=2

 
 base_version=${major_version}.${minor_version}.${patch_version}
 # Release must be completed with GIT information # in Jenkins
 
 base_version=${major_version}.${minor_version}.${patch_version}
 # Release must be completed with GIT information # in Jenkins