Fix all blocker sonar issues and some checkstyle

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / query / builder / HistoryTraversalURIOptimizedQuery.java

diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/HistoryTraversalURIOptimizedQuery.java b/aai-core/src/main/java/org/onap/aai/query/builder/HistoryTraversalURIOptimizedQuery.java
index aeb5cd1..119f852 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/HistoryTraversalURIOptimizedQuery.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/HistoryTraversalURIOptimizedQuery.java
@@ -20,29 +20,16 @@
 
 package org.onap.aai.query.builder;
 
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import java.util.Map;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.onap.aai.db.props.AAIProperties;
-import org.onap.aai.introspection.Introspector;
 import org.onap.aai.introspection.Loader;
-import org.onap.aai.schema.enums.ObjectMetadata;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 public class HistoryTraversalURIOptimizedQuery<E> extends TraversalURIOptimizedQuery {
 
-    protected Map<Integer, String> stepToAaiUri = new HashMap<>();
-
     public HistoryTraversalURIOptimizedQuery(Loader loader, GraphTraversalSource source) {
         super(loader, source);
     }
@@ -79,14 +66,14 @@ public class HistoryTraversalURIOptimizedQuery<E> extends TraversalURIOptimizedQ
         touchHistoryProperties(key);
     }
 
-    private void touchHistoryProperties(String key){
-        if(key != null && !key.isEmpty() && !key.equals(AAIProperties.NODE_TYPE)) {
+    private void touchHistoryProperties(String key) {
+        if (key != null && !key.isEmpty() && !key.equals(AAIProperties.NODE_TYPE)) {
             traversal.where(__.properties(key));
         }
     }
 
-    private void touchHistoryProperties(String key, Object value){
-        if(key != null && !key.isEmpty() && !key.equals(AAIProperties.NODE_TYPE)) {
+    private void touchHistoryProperties(String key, Object value) {
+        if (key != null && !key.isEmpty() && !key.equals(AAIProperties.NODE_TYPE)) {
             traversal.where(__.properties(key).hasValue(value));
         }
     }