[AAI-178 Amsterdam] Make Edge Properties to be

[aai/aai-common.git] / aai-core / src / main / java / org / openecomp / aai / parsers / query / QueryParser.java

diff --git a/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java b/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java
index f568f22..ee4e394 100644 (file)
--- a/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java
+++ b/aai-core/src/main/java/org/openecomp/aai/parsers/query/QueryParser.java
@@ -20,13 +20,14 @@
 
 package org.openecomp.aai.parsers.query;
 
-import java.net.URI;
-
+import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.openecomp.aai.db.props.AAIProperties;
 import org.openecomp.aai.introspection.Loader;
 import org.openecomp.aai.introspection.LoaderFactory;
 import org.openecomp.aai.query.builder.QueryBuilder;
 
+import java.net.URI;
+
 /**
  * The Class QueryParser.
  */
@@ -34,9 +35,9 @@ public abstract class QueryParser {
 
        protected Loader loader = null;
        protected Loader latestLoader = null;
-       protected QueryBuilder queryBuilder = null;
+       protected QueryBuilder<Vertex> queryBuilder = null;
        
-       protected QueryBuilder parentQueryBuilder = null;
+       protected QueryBuilder<Vertex> parentQueryBuilder = null;
        
        protected URI uri = null;
        
@@ -53,7 +54,7 @@ public abstract class QueryParser {
         * @param queryBuilder the query builder
         * @param uri the uri
         */
-       protected QueryParser(Loader loader, QueryBuilder queryBuilder, URI uri) {
+       protected QueryParser(Loader loader, QueryBuilder<Vertex> queryBuilder, URI uri) {
                this.uri = uri;
                this.queryBuilder = queryBuilder;
                this.loader = loader;
@@ -66,7 +67,7 @@ public abstract class QueryParser {
         * @param loader the loader
         * @param queryBuilder the query builder
         */
-       protected QueryParser(Loader loader, QueryBuilder queryBuilder) {
+       protected QueryParser(Loader loader, QueryBuilder<Vertex> queryBuilder) {
                this.queryBuilder = queryBuilder;
                this.loader = loader;
                this.latestLoader = LoaderFactory.createLoaderForVersion(loader.getModelType(), AAIProperties.LATEST);
@@ -105,7 +106,7 @@ public abstract class QueryParser {
         *
         * @return the query builder
         */
-       public QueryBuilder getQueryBuilder() {
+       public QueryBuilder<Vertex> getQueryBuilder() {
                return this.queryBuilder;
        }
        
@@ -123,7 +124,7 @@ public abstract class QueryParser {
         *
         * @return the parent query builder
         */
-       public QueryBuilder getParentQueryBuilder() {
+       public QueryBuilder<Vertex> getParentQueryBuilder() {
                if (this.parentQueryBuilder != null) {
                        return this.parentQueryBuilder;
                } else {