1 files changed, 137 insertions, 136 deletions
diff --git a/src/test/java/org/onap/aai/AAISetup.java b/src/test/java/org/onap/aai/AAISetup.java
index 59afe60..5ceafa7 100644
--- a/src/test/java/org/onap/aai/AAISetup.java
+++ b/src/test/java/org/onap/aai/AAISetup.java
@@ -1,137 +1,138 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * 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.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.aai;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
-import org.janusgraph.core.JanusGraph;
-import org.janusgraph.core.JanusGraphFactory;
-import org.janusgraph.core.JanusGraphTransaction;
-import org.junit.*;
-import org.onap.aai.config.*;
-import org.onap.aai.db.schema.AuditorFactory;
-import org.onap.aai.edges.EdgeIngestor;
-import org.onap.aai.introspection.LoaderFactory;
-import org.onap.aai.introspection.MoxyLoader;
-import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.rest.db.HttpEntry;
-import org.onap.aai.serialization.db.EdgeSerializer;
-import org.onap.aai.setup.AAIConfigTranslator;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.SchemaVersions;
-import org.onap.aai.setup.SchemaVersion;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.rules.SpringClassRule;
-import org.springframework.test.context.junit4.rules.SpringMethodRule;
-
-@ContextConfiguration(classes = {
-        SchemaLocationsBean.class,
-        AAIConfigTranslator.class,
-        SchemaVersions.class,
-        NodeIngestor.class,
-        EdgeIngestor.class,
-        EdgeSerializer.class,
-        SpringContextAware.class,
-        AuditorConfiguration.class,
-        DslConfiguration.class,
-        IntrospectionConfig.class,
-        RestBeanConfig.class
-})
-@TestPropertySource(properties = {
-        "schema.uri.base.path = /aai",
-        "schema.ingest.file = src/main/resources/application.properties"
-})
-public abstract class AAISetup {
-
-    @Autowired
-    protected NodeIngestor nodeIngestor;
-
-    @Autowired
-    protected LoaderFactory loaderFactory;
-
-    @Autowired
-    protected Map<SchemaVersion, MoxyLoader> moxyLoaderInstance;
-
-    @Autowired
-    protected HttpEntry traversalHttpEntry;
-
-    @Autowired
-    protected HttpEntry traversalUriHttpEntry;
-
-    @Autowired
-    protected EdgeSerializer edgeSerializer;
-
-    @Autowired
-    protected SchemaVersions schemaVersions;
-
-    @Autowired
-    protected EdgeIngestor edgeIngestor;
-
-    @Autowired
-    protected AuditorFactory auditorFactory;
-
-    @Value("${schema.uri.base.path}")
-    protected String basePath;
-
-    @ClassRule
-    public static final SpringClassRule springClassRule = new SpringClassRule();
-
-    @Rule
-    public final SpringMethodRule springMethodRule = new SpringMethodRule();
-
-    protected static JanusGraph graph;
-    protected static JanusGraphTransaction tx;
-
-    @BeforeClass
-    public static void setupBundleconfig() throws Exception {
-        System.setProperty("AJSC_HOME", "./");
-        System.setProperty("BUNDLECONFIG_DIR", "src/main/resources/");
-        System.setProperty("org.onap.aai.graphadmin.started", "true");
-        graph = JanusGraphFactory.build().set("storage.backend","inmemory").open();
-        tx = graph.newTransaction();
-    }
-
-    @AfterClass
-    public static void cleanUpGraph() {
-        tx.tx().rollback();
-        graph.close();
-    }
-
-    public String getPayload(String filename) throws IOException {
-
-        InputStream inputStream = getClass()
-                .getClassLoader()
-                .getResourceAsStream(filename);
-
-        String message = String.format("Unable to find the %s in src/test/resources", filename);
-        assertNotNull(message, inputStream);
-
-        String resource = IOUtils.toString(inputStream);
-        return resource;
-    }
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphFactory;
+import org.janusgraph.core.JanusGraphTransaction;
+import org.junit.*;
+import org.onap.aai.config.*;
+import org.onap.aai.db.schema.AuditorFactory;
+import org.onap.aai.edges.EdgeIngestor;
+import org.onap.aai.introspection.LoaderFactory;
+import org.onap.aai.introspection.MoxyLoader;
+import org.onap.aai.nodes.NodeIngestor;
+import org.onap.aai.rest.db.HttpEntry;
+import org.onap.aai.serialization.db.EdgeSerializer;
+import org.onap.aai.setup.AAIConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaVersion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.rules.SpringClassRule;
+import org.springframework.test.context.junit4.rules.SpringMethodRule;
+
+@ContextConfiguration(classes = {
+        SchemaLocationsBean.class,
+        AAIConfigTranslator.class,
+        SchemaVersions.class,
+        NodeIngestor.class,
+        EdgeIngestor.class,
+        EdgeSerializer.class,
+        SpringContextAware.class,
+        AuditorConfiguration.class,
+        DslConfiguration.class,
+        IntrospectionConfig.class,
+        RestBeanConfig.class
+})
+@TestPropertySource(properties = {
+        "schema.uri.base.path = /aai",
+        "schema.ingest.file = src/main/resources/application.properties",
+        "schema.translator.list = config"
+})
+public abstract class AAISetup {
+
+    @Autowired
+    protected NodeIngestor nodeIngestor;
+
+    @Autowired
+    protected LoaderFactory loaderFactory;
+
+    @Autowired
+    protected Map<SchemaVersion, MoxyLoader> moxyLoaderInstance;
+
+    @Autowired
+    protected HttpEntry traversalHttpEntry;
+
+    @Autowired
+    protected HttpEntry traversalUriHttpEntry;
+
+    @Autowired
+    protected EdgeSerializer edgeSerializer;
+
+    @Autowired
+    protected SchemaVersions schemaVersions;
+
+    @Autowired
+    protected EdgeIngestor edgeIngestor;
+
+    @Autowired
+    protected AuditorFactory auditorFactory;
+
+    @Value("${schema.uri.base.path}")
+    protected String basePath;
+
+    @ClassRule
+    public static final SpringClassRule springClassRule = new SpringClassRule();
+
+    @Rule
+    public final SpringMethodRule springMethodRule = new SpringMethodRule();
+
+    protected static JanusGraph graph;
+    protected static JanusGraphTransaction tx;
+
+    @BeforeClass
+    public static void setupBundleconfig() throws Exception {
+        System.setProperty("AJSC_HOME", "./");
+        System.setProperty("BUNDLECONFIG_DIR", "src/main/resources/");
+        System.setProperty("org.onap.aai.graphadmin.started", "true");
+        graph = JanusGraphFactory.build().set("storage.backend","inmemory").open();
+        tx = graph.newTransaction();
+    }
+
+    @AfterClass
+    public static void cleanUpGraph() {
+        tx.tx().rollback();
+        graph.close();
+    }
+
+    public String getPayload(String filename) throws IOException {
+
+        InputStream inputStream = getClass()
+                .getClassLoader()
+                .getResourceAsStream(filename);
+
+        String message = String.format("Unable to find the %s in src/test/resources", filename);
+        assertNotNull(message, inputStream);
+
+        String resource = IOUtils.toString(inputStream);
+        return resource;
+    }
 }
 \ No newline at end of file