Do not use reflection for injecting the DslQueryProcessors
[aai/traversal.git] / aai-traversal / src / test / java / org / onap / aai / AAISetup.java
index e1cbe45..7849671 100644 (file)
@@ -37,6 +37,9 @@ import org.onap.aai.introspection.MoxyLoader;
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.rest.db.HttpEntry;
 import org.onap.aai.rest.dsl.DslQueryProcessor;
+import org.onap.aai.rest.dsl.V1DslQueryProcessor;
+import org.onap.aai.rest.dsl.V2DslQueryProcessor;
+import org.onap.aai.rest.dsl.v1.DslListener;
 import org.onap.aai.rest.search.GremlinServerSingleton;
 import org.onap.aai.serialization.db.EdgeSerializer;
 import org.onap.aai.setup.AAIConfigTranslator;
@@ -53,9 +56,8 @@ import org.springframework.test.context.junit4.rules.SpringMethodRule;
 @ContextConfiguration(
     classes = {ConfigConfiguration.class, AAIConfigTranslator.class, EdgeIngestor.class,
         EdgeSerializer.class, NodeIngestor.class, SpringContextAware.class,
-        IntrospectionConfig.class, RestBeanConfig.class, SearchConfiguration.class,
-        DslConfiguration.class, XmlFormatTransformerConfiguration.class,
-        GremlinServerSingleton.class})
+        IntrospectionConfig.class, RestBeanConfig.class, SearchConfiguration.class, XmlFormatTransformerConfiguration.class,
+        GremlinServerSingleton.class, V1DslQueryProcessor.class, V2DslQueryProcessor.class, DslListener.class, org.onap.aai.rest.dsl.v2.DslListener.class})
 @TestPropertySource(
     properties = {"schema.uri.base.path = /aai",
         "schema.ingest.file = src/test/resources/application-test.properties"})
@@ -84,9 +86,6 @@ public abstract class AAISetup {
     @Autowired
     protected EdgeIngestor edgeIngestor;
 
-    @Autowired
-    protected DslQueryProcessor dslQueryProcessor;
-
     @Autowired
     protected SchemaVersions schemaVersions;