Clear eclipse warnings and sonar

Removing warnings introduced with A&AI code. This should also
address sonar criticals and majors.

Issue-ID: POLICY-140
Change-Id: I3f8186dd9c5aa52bfbb061bf95d67b5614b3fb2e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

7 files changed, 20 insertions, 40 deletions

diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponseWrapper.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponseWrapper.java
index 57140cebe..a641383df 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponseWrapper.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponseWrapper.java
@@ -24,6 +24,11 @@ import java.util.UUID;
 import org.onap.policy.aai.AAIGETResponse;
 
 public class AAIGETResponseWrapper implements Serializable {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 9167822470867043968L;
+	
 	public UUID requestID;
 	public AAIGETResponse aairesponse;
 	
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java
index b318f72ef..8ab94e9a4 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java
@@ -21,8 +21,6 @@
 package org.onap.policy.aai;
 
 import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
index 51954ac6f..3d33eab1e 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
@@ -21,19 +21,10 @@
 package org.onap.policy.aai;
 
 import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.onap.policy.aai.AAIGETVserverResponse;
-import org.onap.policy.aai.AAIGETVnfResponse;
-import org.onap.policy.aai.RelatedToPropertyItem;
-import org.onap.policy.aai.RelationshipDataItem;
-import org.onap.policy.aai.RelationshipData;
 import org.onap.policy.aai.util.Serialization;
-import org.onap.policy.aai.AAINQRequest;
-import org.onap.policy.aai.AAINQResponse;
 import org.onap.policy.rest.RESTManager;
 import org.onap.policy.rest.RESTManager.Pair;
 import org.slf4j.Logger;
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java
index 9b207ef68..a040f0d61 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java
@@ -20,12 +20,16 @@
 
 package org.onap.policy.aai;
 
-import java.util.List;
-import java.util.LinkedList;
+import java.io.Serializable;
 
 import com.google.gson.annotations.SerializedName;
 
-public class RelationshipDataItem {
+public class RelationshipDataItem implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 550450041634939767L;
 	
 	@SerializedName("relationship-key")
 	public String relationshipKey;
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
index 14f601730..b31b3a6dc 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
@@ -25,9 +25,13 @@ import java.io.Serializable;
 import java.util.List; 
 import java.util.LinkedList; 
 
-public class RelationshipList {
+public class RelationshipList implements Serializable {
 
-    @SerializedName("relationship-list")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 6115655704973981989L;
+	@SerializedName("relationship-list")
     public List<Relationship> relationshipList = new LinkedList<>();
 	
 	public RelationshipList() {
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java
index 3b489155c..e668ca372 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVnfResponseTest.java
@@ -20,22 +20,11 @@
 
 package org.onap.policy.aai;
 
-import static org.junit.Assert.*;
-import java.util.List; 
-import java.util.LinkedList; 
-import org.onap.policy.aai.RelationshipDataItem; 
-import org.onap.policy.aai.RelationshipData; 
-import org.onap.policy.aai.RelatedToPropertyItem;
-import org.onap.policy.aai.Relationship;
-import org.onap.policy.aai.RelatedToProperty;
-import org.onap.policy.aai.RelationshipList;
+import org.junit.Test;
 import org.onap.policy.aai.util.Serialization;
-import org.onap.policy.aai.AAIGETVnfResponse; 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.junit.Test;
-
 public class AAIGETVnfResponseTest {
 	private static final Logger logger = LoggerFactory.getLogger(AAIGETVnfResponseTest.class);
 
diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java
index b24826576..83d2a2682 100644
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AAIGETVserverResponseTest.java
@@ -20,22 +20,11 @@
 
 package org.onap.policy.aai;
 
-import static org.junit.Assert.*;
-import java.util.List; 
-import java.util.LinkedList; 
-import org.onap.policy.aai.RelationshipDataItem; 
-import org.onap.policy.aai.RelationshipData; 
-import org.onap.policy.aai.RelatedToPropertyItem;
-import org.onap.policy.aai.Relationship;
-import org.onap.policy.aai.RelatedToProperty;
-import org.onap.policy.aai.RelationshipList;
+import org.junit.Test;
 import org.onap.policy.aai.util.Serialization;
-import org.onap.policy.aai.AAIGETVserverResponse; 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.junit.Test;
-
 public class AAIGETVserverResponseTest {
 	private static final Logger logger = LoggerFactory.getLogger(AAIGETVserverResponseTest.class);