Merge "Fix sonar critical"

5 files changed, 28 insertions, 9 deletions

diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
index aac90f7a6..a31007f32 100644
--- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
@@ -437,7 +437,7 @@ public class SOActorServiceProvider implements Actor {
 	/**
 	 * @param vnfItemVnfId the vnfItemVnfId to set
 	 */
-	private void setVnfItemVnfId(String vnfItemVnfId) {
+	private static void setVnfItemVnfId(String vnfItemVnfId) {
 		SOActorServiceProvider.vnfItemVnfId = vnfItemVnfId;
 	}
 
@@ -535,7 +535,7 @@ public class SOActorServiceProvider implements Actor {
 	/**
 	 * @param serviceItemServiceInstanceId the serviceItemServiceInstanceId to set
 	 */
-	private void setServiceItemServiceInstanceId(
+	private static void setServiceItemServiceInstanceId(
 			String serviceItemServiceInstanceId) {
 		SOActorServiceProvider.serviceItemServiceInstanceId = serviceItemServiceInstanceId;
 	}
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java
index afb847e09..9ee6f2310 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java
@@ -59,9 +59,19 @@ import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
 
 
 public class PIPEngineGetHistory extends StdConfigurableEngine{
+	
 	private interface DateUtil{
+		public class DateUtilException extends Exception {
+			private static final long serialVersionUID = 2612662650481443076L;
+
+			public DateUtilException(String message) {
+				super(message);
+			}
+			
+		}
+		
         public long getMs();
-        public DateUtil init(String sqlValUnit) throws Exception;
+        public DateUtil init(String sqlValUnit) throws DateUtilException;
     }
 
 	private static final Logger logger = LoggerFactory.getLogger(PIPEngineGetHistory.class);
@@ -338,10 +348,10 @@ public class PIPEngineGetHistory extends StdConfigurableEngine{
 			private double multiplier = 0;
 
 			@Override
-			public DateUtil init(String sqlValUnit) throws Exception{
+			public DateUtil init(String sqlValUnit) throws DateUtilException{
 				String[] split = sqlValUnit.split(" ");
 				if(split.length != 2){
-					throw new Exception("Invalid Value Unit pair for SQL");
+					throw new DateUtilException("Invalid Value Unit pair for SQL");
 				}
 
 				ms = Long.parseLong(split[0]);
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
index 12e80d50e..2f8acf697 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
@@ -20,13 +20,18 @@
 
 package org.onap.policy.aai;
 
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 
-public class RelatedToProperty {
+public class RelatedToProperty implements Serializable {
   
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2088088164920423658L;
 	@SerializedName("related-to-property")
 	public List<RelatedToPropertyItem> relatedTo = new LinkedList<RelatedToPropertyItem>();
 
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
index e5bc05599..2ad373104 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
@@ -21,12 +21,17 @@
 package org.onap.policy.aai;
 
 import java.util.List;
+import java.io.Serializable;
 import java.util.LinkedList;
 
 import com.google.gson.annotations.SerializedName;
 
-public class RelationshipData {
+public class RelationshipData implements Serializable {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6809180843309562121L;
 	@SerializedName("relationship-data")
 	public List<RelationshipDataItem> relationshipData = new LinkedList<>();
 	
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
index dc53e267a..f5d42c9ce 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
@@ -32,10 +32,9 @@ import java.util.UUID;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.aai.AAIGETResponse;
 import org.onap.policy.aai.AAIGETVnfResponse;
-import org.onap.policy.aai.AAINQInstanceFilters;
 import org.onap.policy.aai.AAIManager;
+import org.onap.policy.aai.AAINQInstanceFilters;
 import org.onap.policy.aai.AAINQNamedQuery;
 import org.onap.policy.aai.AAINQQueryParameters;
 import org.onap.policy.aai.AAINQRequest;