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>

2 files changed, 15 insertions, 42 deletions

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index 2248fcd48..0fb25b1bf 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -26,18 +26,17 @@ import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.List; 
 import java.util.UUID;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Iterator; 
 
+import org.onap.policy.aai.AAIGETVnfResponse;
+import org.onap.policy.aai.AAIGETVserverResponse;
+import org.onap.policy.aai.AAIManager;
 import org.onap.policy.controlloop.ControlLoopEventStatus;
+import org.onap.policy.controlloop.ControlLoopException;
 import org.onap.policy.controlloop.ControlLoopNotificationType;
 import org.onap.policy.controlloop.ControlLoopOperation;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.VirtualControlLoopNotification;
-import org.onap.policy.controlloop.ControlLoopException;
 import org.onap.policy.controlloop.policy.FinalResult;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.controlloop.processor.ControlLoopProcessor;
@@ -49,13 +48,6 @@ import org.onap.policy.guard.TargetLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.onap.policy.aai.AAIManager;
-import org.onap.policy.aai.AAIGETVserverResponse;
-import org.onap.policy.aai.AAIGETVnfResponse;
-import org.onap.policy.aai.RelatedToPropertyItem;
-import org.onap.policy.aai.RelationshipList; 
-import org.onap.policy.aai.Relationship;
-
 public class ControlLoopEventManager implements LockCallback, Serializable {
 	
 	/**
@@ -580,7 +572,6 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
 	}
 	
 	public static boolean isClosedLoopDisabled(AAIGETVnfResponse aaiResponse) {
-       	RelationshipList relationshipList = new RelationshipList();
        	if (aaiResponse != null && aaiResponse.isClosedLoopDisabled != null) {
        		String value = aaiResponse.isClosedLoopDisabled; 
        		if ("true".equalsIgnoreCase(value) || "T".equalsIgnoreCase(value) ||
@@ -593,7 +584,6 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
 	}
 	
 	public static boolean isClosedLoopDisabled(AAIGETVserverResponse aaiResponse) {
-       	RelationshipList relationshipList = new RelationshipList();
        	if (aaiResponse != null && aaiResponse.isClosedLoopDisabled != null) {
        		String value = aaiResponse.isClosedLoopDisabled; 
        		if ("true".equalsIgnoreCase(value) || "T".equalsIgnoreCase(value) ||
@@ -624,9 +614,8 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
 
 		try {
 	        if (vserverName != null) {
-	    	   AAIManager manager = new AAIManager(); 
 	   		   String url = "https://aai-ext1.test.att.com:8443/aai/v11/nodes/vservers?vserver-name="; 
-			   response = manager.getQueryByVserverName(url, user, password, requestID, vserverName);
+			   response = AAIManager.getQueryByVserverName(url, user, password, requestID, vserverName);
 	        } 
 	    } catch (Exception e) {
 	    	logger.error("getAAIVserverInfo exception: ", e);
@@ -646,13 +635,11 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
  
 		try {
             if (vnfName != null) {
-	        	AAIManager manager = new AAIManager(); 
 		   	    String url = "https://aai-ext1.test.att.com:8443/aai/v11/network/generic-vnfs/generic-vnf?vnf-name="; 
-			    response = manager.getQueryByVnfName(url, user, password, requestID, vnfName);	        	
+			    response = AAIManager.getQueryByVnfName(url, user, password, requestID, vnfName);	        	
 	        } else if (vnfID != null) {
-	        	AAIManager manager = new AAIManager(); 
 			    String url = "https://aai-ext1.test.att.com:8443/aai/v11/network/generic-vnfs/generic-vnf/"; 
-			    response = manager.getQueryByVnfID(url, user, password, requestID, vnfID);	        	
+			    response = AAIManager.getQueryByVnfID(url, user, password, requestID, vnfID);	        	
 	        }
 	    } catch (Exception e) {
 	    	logger.error("getAAIVnfInfo exception: ", e);
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
index ef7a1a94c..2e208748f 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
@@ -20,40 +20,26 @@
 
 package org.onap.policy.controlloop.eventmanager;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.time.Instant;
 import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.UUID;
 
 import org.junit.Test;
-import org.onap.policy.aai.AAIGETVserverResponse;
 import org.onap.policy.aai.AAIGETVnfResponse;
+import org.onap.policy.aai.AAIGETVserverResponse;
+import org.onap.policy.aai.RelatedToProperty;
 import org.onap.policy.aai.RelatedToPropertyItem;
 import org.onap.policy.aai.Relationship;
 import org.onap.policy.aai.RelationshipData;
 import org.onap.policy.aai.RelationshipDataItem;
 import org.onap.policy.aai.RelationshipList;
-import org.onap.policy.aai.AAIManager;
-import org.onap.policy.aai.RelatedToProperty;
-import org.onap.policy.appc.Request;
-import org.onap.policy.appc.Response;
-import org.onap.policy.appc.ResponseCode;
-import org.onap.policy.appc.ResponseValue;
 import org.onap.policy.controlloop.ControlLoopEventStatus;
-
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.controlloop.ControlLoopException;
 import org.onap.policy.controlloop.Util;
+import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.policy.ControlLoopPolicy;
-import org.onap.policy.controlloop.policy.PolicyResult;
-import org.onap.policy.controlloop.processor.ControlLoopProcessor;
-import org.onap.policy.controlloop.processor.ControlLoopProcessorTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,6 +65,7 @@ public class ControlLoopEventManagerTest {
 		final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
 		onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
 		try {
+			@SuppressWarnings("unused")
 			ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.closedLoopControlName, onset.requestID);
 			onset.closedLoopEventStatus = ControlLoopEventStatus.ONSET; 
 			 
@@ -104,32 +91,31 @@ public class ControlLoopEventManagerTest {
 		onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
 		
 		try {
-			ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.closedLoopControlName, onset.requestID);
 			onset.closedLoopEventStatus = ControlLoopEventStatus.ONSET; 
 			
 			logger.info("testIsClosedLoopDisabled --");
-			AAIManager manager = new AAIManager(); 
 			String user = "POLICY";
 			String password = "POLICY";
 			String vnfID = "83f674e8-7555-44d7-9a39-bdc3770b0491";
 			String url = "https://aai-ext1.test.att.com:8443/aai/v11/network/generic-vnfs/generic-vnf/"; 
 			AAIGETVnfResponse response = getQueryByVnfID2(url, user, password, onset.requestID, vnfID); 
 			assertNotNull(response);
-			boolean disabled = eventManager.isClosedLoopDisabled(response);
+			boolean disabled = ControlLoopEventManager.isClosedLoopDisabled(response);
 			logger.info("QueryByVnfID - isClosedLoopDisabled: " + disabled); 
 
 			String vnfName = "lll_vnf_010317";
 			url = "https://aai-ext1.test.att.com:8443/aai/v11/network/generic-vnfs/generic-vnf?vnf-name="; 
 			response = getQueryByVnfName2(url, user, password, onset.requestID, vnfName); 
 			assertNotNull(response);
-			disabled = eventManager.isClosedLoopDisabled(response);
+			disabled = ControlLoopEventManager.isClosedLoopDisabled(response);
 			logger.info("QueryByVnfName2 - isClosedLoopDisabled: " + disabled); 
 
 			String vserverName = "USMSO1SX7NJ0103UJZZ01-vjunos0";
 			url = "https://aai-ext1.test.att.com:8443//aai/v11/nodes/vservers?vserver-name="; 
+			@SuppressWarnings("unused")
 			AAIGETVserverResponse response2 = getQueryByVserverName2(url, user, password, onset.requestID, vserverName); 
 			assertNotNull(response);
-			disabled = eventManager.isClosedLoopDisabled(response);
+			disabled = ControlLoopEventManager.isClosedLoopDisabled(response);
 			logger.info("QueryByVserverName - isClosedLoopDisabled: " + disabled); 
 		} catch (Exception e) {
 			fail(e.getMessage());