Migrate Mockito 1 to version 2 in the traversal service

- update mockito and powermock
- update eelf-core since it has a compile time dependency to mockito 1.10.19 in version 1
- exclude the vaadin android-json since it leads to a warning in maven

Issue-ID: AAI-3545

Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Change-Id: I06354182c5af21ce1c8cb851f9e65c3c38e7102c

12 files changed, 162 insertions, 89 deletions

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 02f3eb6..d789c78 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -34,7 +34,8 @@
 	<artifactId>aai-traversal</artifactId>
 
 	<properties>
-	  <mockito.core.version>1.10.19</mockito.core.version>
+	  <mockito.core.version>2.4.0</mockito.core.version>
+		<powermock.version>1.7.0RC2</powermock.version>
 		<java.version>1.8</java.version>
 		<start-class>org.onap.aai.TraversalApp</start-class>
 
@@ -428,10 +429,10 @@
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 		</dependency>
-		<!-- eelf dependency -->
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
+			<version>2.0.0-oss</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
@@ -487,20 +488,28 @@
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
+			<artifactId>powermock-api-mockito2</artifactId>
+			<version>${powermock.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-javaagent</artifactId>
+			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
+			<artifactId>powermock-module-junit4-rule-agent</artifactId>
+			<version>${powermock.version}</version>
 			<scope>test</scope>
-			<version>1.6.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.beust</groupId>
@@ -528,16 +537,6 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-javaagent</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4-rule-agent</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>com.github.fge</groupId>
 			<artifactId>json-patch</artifactId>
 		</dependency>
@@ -634,6 +633,12 @@
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin.external.google</groupId>
+					<artifactId>android-json</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- Explicitly stating the security spring framework and exclude the bouncy 
 			castle since that is somehow overwriting our p12 file decryption that's built 
diff --git a/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java b/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java
index 23342f8..d57454d 100644
--- a/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java
+++ b/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java
@@ -19,7 +19,7 @@
  */
 package org.onap.aai;
 
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
@@ -29,7 +29,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
 
 import org.javatuples.Pair;
 import org.mockito.Mockito;
diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java
index 842a6ca..d6b43aa 100644
--- a/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java
@@ -19,15 +19,25 @@
  */
 package org.onap.aai.dbgraphgen;
 
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMapOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMapOf;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.janusgraph.graphdb.types.system.BaseVertexLabel;
@@ -38,7 +48,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.AAISetup;
 import org.onap.aai.db.DbMethHelper;
 import org.onap.aai.db.props.AAIProperties;
@@ -48,7 +58,7 @@ import org.onap.aai.introspection.ModelType;
 import org.onap.aai.serialization.db.DBSerializer;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class ModelBasedProcessingInvalidDataTest extends AAISetup {
 
     @Mock
@@ -91,8 +101,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
         startNodeFilterArrayOfHashes.add(map);
         Map<String, String> result = new HashMap<>();
 
-        Map<String, String> result1 = mockProcessor.getStartNodesAndModVersionIds("test", "test",
-            "test", "test", "test", "test", startNodeFilterArrayOfHashes, "test");
         assertNotNull(result);
 
     }
@@ -263,7 +271,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
 
     @Test(expected = AAIException.class)
     public void runDeleteByModelWithNullParams() throws AAIException {
-        Map<String, String> resultMock = new HashMap<String, String>();
 
         Map<String, String> result =
             processor.runDeleteByModel("test", "test", null, null, null, "test", "test");
@@ -332,9 +339,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
 
         resultSet.setVert(vert);
 
-        Map<String, String> result1 = processor.deleteAsNeededFromResultSet("test", "test",
-            resultSet, "test", "test", "test", resultMock);
-
         assertEquals(result.size(), 0);
 
     }
@@ -383,7 +387,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
         rsList.add(rs1);
         rs.setSubResultSet(rsList);
         Map<String, Object> map = new HashMap<String, Object>();
-        // map.put("test.filter",new Object());
 
         boolean result = processor.satisfiesFilters(rs, map);
         assertEquals(result, false);
@@ -419,14 +422,9 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
 
     @Test(expected = NullPointerException.class)
     public void collectInstanceDataTest() throws AAIException {
-
-        BaseVertexLabel bs = new BaseVertexLabel("test");
-        // bs.setId(80);
         EmptyVertex ev = new EmptyVertex();
-        // ev.setId(50l);
         Vertex thisLevelElemVtx = ev;
 
-        Multimap<String, String> thisMap = ArrayListMultimap.create();
         List<String> vidsTraversed = new ArrayList<String>();
         // only applies when collecting data using the default model for delete
         Multimap<String, String> validNextStepMap = ArrayListMultimap.create();
@@ -464,7 +462,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
     @Test(expected = AAIException.class)
     public void getModConstraintHashTest() throws AAIException {
         Vertex modelElementVtx = new EmptyVertex();
-        // modelElementVtx.property(AAIProperties.NODE_TYPE,"Model");
         Vertex modelElementVtx1 = new EmptyVertex();
         Map<String, Vertex> currentHash = new HashMap<String, Vertex>();
         currentHash.put("constraint", modelElementVtx1);
@@ -475,7 +472,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
     @Test(expected = AAIException.class)
     public void getModConstraintHashTestNull() throws AAIException {
         Vertex modelElementVtx = null;
-        // modelElementVtx.property(AAIProperties.NODE_TYPE,"Model");
         Vertex modelElementVtx1 = null;
         Map<String, Vertex> currentHash = new HashMap<String, Vertex>();
         currentHash.put("constraint", modelElementVtx1);
@@ -486,7 +482,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
     @Test(expected = NullPointerException.class)
     public void getTopElementForSvcOrResModelVerTest() throws AAIException {
         Vertex modelElementVtx = new EmptyVertex();
-        // modelElementVtx.property(AAIProperties.NODE_TYPE,"Model");
         Vertex modelElementVtx1 = new EmptyVertex();
         Map<String, Vertex> currentHash = new HashMap<String, Vertex>();
         currentHash.put("constraint", modelElementVtx1);
@@ -705,7 +700,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
         Multimap<String, String> thisMap = ArrayListMultimap.create();
         Vertex thisLevelElemVtx = new EmptyVertex();
         String incomingTrail = "test";
-        Map<String, Vertex> currentHash = new HashMap<String, Vertex>();
         List<String> vidsTraversed = new ArrayList<String>();
         int levelCounter = 1;
 
@@ -778,8 +772,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
 
     @Test(expected = NullPointerException.class)
     public void getModElementWidgetType() throws AAIException {
-        String appId = "test";
-        String transID = "test";
         Vertex thisLevelElemVtx = new EmptyVertex();
         String incomingTrail = "test";
         String vertex1 = processor.getModElementWidgetType(thisLevelElemVtx, incomingTrail);
@@ -926,7 +918,6 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup {
         String transID = "test";
 
         String modelVersionId = "test";
-        String modelInvId = "test";
         String modelName = "test";
         processor.validateModel(transID, appId, modelName, modelVersionId);
 
diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java
index 73896a0..8c6364d 100644
--- a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java
@@ -21,7 +21,7 @@ package org.onap.aai.dbgraphmap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -33,10 +33,19 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java
index c46af87..68e30aa 100644
--- a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java
@@ -19,16 +19,26 @@
  */
 package org.onap.aai.dbgraphmap;
 
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.eclipse.persistence.dynamic.DynamicEntity;
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java
index 845ddf9..f305e14 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java
@@ -23,17 +23,26 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.att.eelf.configuration.EELFManager;
 import com.jayway.jsonpath.JsonPath;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.janusgraph.core.JanusGraph;
@@ -164,7 +173,6 @@ public class GfpVserverDataStoredQueryTest extends AAISetup {
         String query = String.format("/aai/%s/query?format=resource_and_url", version.toString());
 
         UriInfo uriInfo = Mockito.mock(UriInfo.class);
-        HttpServletRequest httpServletRequest = Mockito.mock(HttpServletRequest.class);
 
         queryParameters.add("format", "resource_and_url");
         Mockito.when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
@@ -196,7 +204,6 @@ public class GfpVserverDataStoredQueryTest extends AAISetup {
         String query = String.format("/aai/%s/query?format=resource_and_url", version.toString());
 
         UriInfo uriInfo = Mockito.mock(UriInfo.class);
-        HttpServletRequest httpServletRequest = Mockito.mock(HttpServletRequest.class);
 
         queryParameters.add("format", "resource_and_url");
         Mockito.when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
@@ -231,7 +238,6 @@ public class GfpVserverDataStoredQueryTest extends AAISetup {
         String query = String.format("/aai/%s/query?format=resource_and_url", version.toString());
 
         UriInfo uriInfo = Mockito.mock(UriInfo.class);
-        HttpServletRequest httpServletRequest = Mockito.mock(HttpServletRequest.class);
 
         queryParameters.add("format", "resource_and_url");
         Mockito.when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java
index b7291d6..edb2db1 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java
@@ -19,16 +19,27 @@
  */
 package org.onap.aai.rest.search;
 
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import groovy.lang.MissingPropertyException;
 
 import java.net.URI;
-import java.util.*;
-
-import javax.ws.rs.core.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java
index 5d2002e..2f2a703 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java
@@ -21,16 +21,27 @@ package org.onap.aai.rest.search;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
@@ -38,7 +49,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.aai.AAISetup;
-import org.onap.aai.introspection.ModelType;
 import org.onap.aai.setup.SchemaVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +60,6 @@ public class ModelAndNamedQueryRestProviderTest extends AAISetup {
     private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
 
     private SchemaVersion version;
-    private static final ModelType introspectorFactoryType = ModelType.MOXY;
 
     static {
         VALID_HTTP_STATUS_CODES.add(200);
@@ -194,6 +203,6 @@ public class ModelAndNamedQueryRestProviderTest extends AAISetup {
         String message = String.format("Unable to find the %s in src/test/resources", filename);
         assertNotNull(message, inputStream);
 
-        return IOUtils.toString(inputStream);
+        return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
     }
 }
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java
index c137d6f..6d12842 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java
@@ -20,12 +20,17 @@
 package org.onap.aai.rest.search;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import com.att.eelf.configuration.EELFManager;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -61,7 +66,6 @@ import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException;
 import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 import org.onap.aai.setup.AAIConfigTranslator;
-import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 import org.slf4j.Logger;
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java
index 317eb4c..08136c2 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java
@@ -20,12 +20,17 @@
 package org.onap.aai.rest.search;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import com.att.eelf.configuration.EELFManager;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -62,7 +67,6 @@ import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 import org.onap.aai.setup.AAIConfigTranslator;
 import org.onap.aai.setup.SchemaConfigVersions;
-import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java
index 672c449..cb62719 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java
@@ -20,14 +20,26 @@
 package org.onap.aai.rest.search;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.anyObject;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -36,7 +48,6 @@ import org.mockito.Mockito;
 import org.onap.aai.AAISetup;
 import org.onap.aai.introspection.Loader;
 import org.onap.aai.introspection.ModelType;
-import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.setup.SchemaVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +60,6 @@ public class SearchProviderTest extends AAISetup {
 
     private SchemaVersion version;
     private static final ModelType introspectorFactoryType = ModelType.MOXY;
-    private static final QueryStyle queryStyle = QueryStyle.TRAVERSAL;
 
     private Loader loader;
 
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java
index 46ff650..97702fa 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java
@@ -21,15 +21,23 @@ package org.onap.aai.rest.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.att.eelf.configuration.EELFManager;
-
-import java.util.*;
-
-import javax.ws.rs.core.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
 import org.junit.Before;
 import org.junit.Test;