Integrate aai-schema-ingest library into aai-core

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

diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java
index 845b49c..9129911 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.parsers.query;
 
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.onap.aai.config.SpringContextAware;
 import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.introspection.Loader;
 import org.onap.aai.introspection.LoaderFactory;
 import org.onap.aai.query.builder.QueryBuilder;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
 
 import java.net.URI;
 
@@ -59,7 +60,9 @@ public abstract class QueryParser {
                this.uri = uri;
                this.queryBuilder = queryBuilder;
                this.loader = loader;
-               this.latestLoader = LoaderFactory.createLoaderForVersion(loader.getModelType(), AAIProperties.LATEST);
+               LoaderFactory loaderFactory = SpringContextAware.getBean(LoaderFactory.class);
+               SchemaVersion latest = SpringContextAware.getBean(SchemaVersions.class).getDefaultVersion();
+               this.latestLoader = loaderFactory.createLoaderForVersion(loader.getModelType(), latest);
        }
        
        /**
@@ -71,7 +74,9 @@ public abstract class QueryParser {
        protected QueryParser(Loader loader, QueryBuilder<Vertex> queryBuilder) {
                this.queryBuilder = queryBuilder;
                this.loader = loader;
-               this.latestLoader = LoaderFactory.createLoaderForVersion(loader.getModelType(), AAIProperties.LATEST);
+               LoaderFactory loaderFactory = SpringContextAware.getBean(LoaderFactory.class);
+               SchemaVersion latest = SpringContextAware.getBean(SchemaVersions.class).getDefaultVersion();
+               this.latestLoader = loaderFactory.createLoaderForVersion(loader.getModelType(), latest);
        }
        
        /**