Merge "[AAI] Unnecessary packages must be cleared from all java files for aai-traversal"

diff --cc aai-traversal/src/main/java/org/onap/aai/TraversalApp.java
index fccdeb3,9a4a968..619bee9
--- 1/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java
--- 2/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java
+++ b/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java
@@@ -20,12 -20,11 +20,10 @@@
  package org.onap.aai;
  
  import java.util.Map;
- 
  import javax.annotation.PostConstruct;
  import javax.annotation.PreDestroy;
- 
  import org.apache.commons.lang3.exception.ExceptionUtils;
  import org.onap.aai.aailog.logs.AaiDebugLog;
 -import org.onap.aai.config.PropertyPasswordConfiguration;
  import org.onap.aai.config.SpringContextAware;
  import org.onap.aai.dbmap.AAIGraph;
  import org.onap.aai.exceptions.AAIException;

diff --cc aai-traversal/src/main/java/org/onap/aai/rest/TraversalConsumer.java
Simple merge

diff --cc aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java
index 883b9d2,351a961..4424a3c
--- 1/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java
--- 2/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java
+++ b/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java
@@@ -29,10 -27,9 +27,8 @@@ import java.util.Collection
  import java.util.Comparator;
  import java.util.Set;
  import java.util.logging.Logger;
- 
  import javax.annotation.Priority;
- 
  import org.glassfish.jersey.server.ResourceConfig;
 -import org.glassfish.jersey.servlet.ServletProperties;
  import org.onap.aai.rest.*;
  import org.onap.aai.rest.search.ModelAndNamedQueryRestProvider;
  import org.onap.aai.rest.search.SearchProvider;

diff --cc aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java
Simple merge