sonar fixes

Issue-ID: AAI-2848
Change-Id: I45a408c00a450144dec723694eddd60eba883c47
Signed-off-by: David Brilla <david.brilla@tieto.com>

2 files changed, 5 insertions, 24 deletions

diff --git a/src/test/java/org/onap/aai/db/schema/AuditOXMTest.java b/src/test/java/org/onap/aai/db/schema/AuditOXMTest.java
index cba202a..add77ff 100644
--- a/src/test/java/org/onap/aai/db/schema/AuditOXMTest.java
+++ b/src/test/java/org/onap/aai/db/schema/AuditOXMTest.java
@@ -22,39 +22,23 @@ package org.onap.aai.db.schema;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.onap.aai.AAISetup;
-import org.onap.aai.introspection.Loader;
-import org.onap.aai.introspection.LoaderFactory;
-import org.onap.aai.introspection.ModelType;
-import org.onap.aai.setup.SchemaVersion;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.AdditionalMatchers.not;
 
 public class AuditOXMTest extends AAISetup {
 
-    private AuditOXM auditOXM;
-
     @Before
     public void setUp() {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
     }
 
     @Test
     public void getAllIntrospectors() {
-        auditOXM = new AuditOXM(loaderFactory, schemaVersions.getDefaultVersion(), edgeIngestor);
+        AuditOXM auditOXM = new AuditOXM(loaderFactory, schemaVersions.getDefaultVersion(), edgeIngestor);
         assertTrue(auditOXM.getAllIntrospectors().size() > 0);
     }
-
-    @Test
-    public void setEdgeIngestor() {
-    }
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/aai/util/SendDeleteMigrationNotificationsTest.java b/src/test/java/org/onap/aai/util/SendDeleteMigrationNotificationsTest.java
index 5df4a75..f89f87d 100644
--- a/src/test/java/org/onap/aai/util/SendDeleteMigrationNotificationsTest.java
+++ b/src/test/java/org/onap/aai/util/SendDeleteMigrationNotificationsTest.java
@@ -22,7 +22,6 @@ package org.onap.aai.util;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.janusgraph.core.JanusGraph;
-import org.janusgraph.core.JanusGraphFactory;
 import org.janusgraph.core.JanusGraphTransaction;
 import org.junit.*;
 import org.junit.runners.MethodSorters;
@@ -31,14 +30,12 @@ import org.onap.aai.AAISetup;
 import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.dbmap.AAIGraph;
 import org.onap.aai.exceptions.AAIException;
-import org.onap.aai.introspection.Introspector;
 import org.onap.aai.migration.EventAction;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.junit.Assert.assertEquals;
@@ -133,7 +130,7 @@ public class SendDeleteMigrationNotificationsTest extends AAISetup {
 	@Test
 	public void processEverything() throws Exception {
 		SendDeleteMigrationNotifications s  = spy(new SendDeleteMigrationNotifications(
-				loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.EMPTY_SET, 0, 0, "test", EventAction.DELETE, "DMAAP-LOAD"));
+				loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, 0, 0, "test", EventAction.DELETE, "DMAAP-LOAD"));
 		doNothing().when(s).trigger();
 		doNothing().when(s).cleanup();
 		s.process("/aai/");
@@ -144,7 +141,7 @@ public class SendDeleteMigrationNotificationsTest extends AAISetup {
 	@Test
 	public void processEverythingBatched2() throws Exception {
 		SendDeleteMigrationNotifications s  = spy(new SendDeleteMigrationNotifications(
-				loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.EMPTY_SET, 0, 2, "test", EventAction.DELETE, "DMAAP-LOAD"));
+				loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, 0, 2, "test", EventAction.DELETE, "DMAAP-LOAD"));
 		doNothing().when(s).trigger();
 		doNothing().when(s).cleanup();
 		s.process("/aai/");
@@ -155,7 +152,7 @@ public class SendDeleteMigrationNotificationsTest extends AAISetup {
 	@Test
 	public void processEverythingBatched3() throws Exception {
 		SendDeleteMigrationNotifications s  = spy(new SendDeleteMigrationNotifications(
-				loaderFactory, schemaVersions,  REALTIME_CONFIG, FILE, Collections.EMPTY_SET, 0, 3, "test", EventAction.DELETE, "DMAAP-LOAD"));
+				loaderFactory, schemaVersions,  REALTIME_CONFIG, FILE, 0, 3, "test", EventAction.DELETE, "DMAAP-LOAD"));
 		doNothing().when(s).trigger();
 		doNothing().when(s).cleanup();
 		s.process("/aai/");