X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Faai%2Fquery%2Fbuilder%2FTraversalQuery.java;h=628e055e8a97ae76b4ab7a328084bdfba70c36f4;hb=a93b19450f6fb966afa1c30a6795e8e670d2aee7;hp=4293402331b820d3904c0352a3095e6085e2377a;hpb=c2fddaed33f9f7bbec3feca7bf905f0a1e56b3ed;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java
index 42934023..628e055e 100644
--- a/aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java
+++ b/aai-core/src/main/java/org/openecomp/aai/query/builder/TraversalQuery.java
@@ -40,7 +40,7 @@ import org.openecomp.aai.parsers.query.TraversalStrategy;
 /**
  * The Class TraversalQuery.
  */
-public class TraversalQuery extends GraphTraversalBuilder {
+public class TraversalQuery<E> extends GraphTraversalBuilder<E> {
 
 	/**
 	 * Instantiates a new traversal query.
@@ -63,7 +63,7 @@ public class TraversalQuery extends GraphTraversalBuilder {
 		this.factory = new TraversalStrategy(this.loader, this);
 	}
 	
-	protected TraversalQuery(GraphTraversal<Vertex, Vertex> traversal, Loader loader, GraphTraversalSource source, GraphTraversalBuilder gtb) {
+	protected TraversalQuery(GraphTraversal<Vertex, E> traversal, Loader loader, GraphTraversalSource source, GraphTraversalBuilder<E> gtb) {
 		super(loader, source);
 		this.traversal = traversal;
 		this.stepIndex = gtb.getStepIndex();
@@ -110,41 +110,41 @@ public class TraversalQuery extends GraphTraversalBuilder {
 	 * @{inheritDoc}
 	 */
 	@Override
-	public QueryBuilder newInstance(Vertex start) {
-		return new TraversalQuery(loader, source, start);
+	public QueryBuilder<E> newInstance(Vertex start) {
+		return new TraversalQuery<>(loader, source, start);
 	}
 	
 	/**
 	 * @{inheritDoc}
 	 */
 	@Override
-	public QueryBuilder newInstance() {
-		return new TraversalQuery(loader, source);
+	public QueryBuilder<E> newInstance() {
+		return new TraversalQuery<>(loader, source);
 	}
 	
 	@Override
-	protected QueryBuilder cloneQueryAtStep(int index) {
+	protected QueryBuilder<E> cloneQueryAtStep(int index) {
 		if (index == 0) {
 			index = stepIndex;
 		}
-		GraphTraversal<Vertex, Vertex> clone = this.traversal.asAdmin().clone();
-		GraphTraversal.Admin<Vertex, Vertex> cloneAdmin = clone.asAdmin();
+		GraphTraversal<Vertex, E> clone = this.traversal.asAdmin().clone();
+		GraphTraversal.Admin<Vertex, E> cloneAdmin = clone.asAdmin();
 		List<Step> steps = cloneAdmin.getSteps();
 
 		for (int i = steps.size()-1; i >= index; i--) {
 			cloneAdmin.removeStep(i);
 		}
-		return new TraversalQuery(cloneAdmin, loader, source, this);
+		return new TraversalQuery<>(cloneAdmin, loader, source, this);
 	}
 	
 	@Override
-	protected QueryBuilder removeQueryStepsBetween(int start, int end) {
-		GraphTraversal<Vertex, Vertex> clone = this.traversal.asAdmin().clone();
-		GraphTraversal.Admin<Vertex, Vertex> cloneAdmin = clone.asAdmin();
+	protected QueryBuilder<E> removeQueryStepsBetween(int start, int end) {
+		GraphTraversal<Vertex, E> clone = this.traversal.asAdmin().clone();
+		GraphTraversal.Admin<Vertex, E> cloneAdmin = clone.asAdmin();
 
 		for (int i = end-2; i >= start; i--) {
 			cloneAdmin.removeStep(i);
 		}
-		return new TraversalQuery(cloneAdmin, loader, source, this);
+		return new TraversalQuery<>(cloneAdmin, loader, source, this);
 	}
 }