Upgrade version of aai-common

* Configure Spike with schema ingestion beans.
* Update OXMModelLoader and EdgeRulesLoader to make use of schema
  ingestion beans. Here there is an acknowledged awkward marrying of
  bean creation and static method use.
* Update tests to mock schema ingestion beans and organise test
  resources.

Change-Id: I1f043aa5852dbd2737a804ebc282a12afb9fb39f
Issue-ID: AAI-1951
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>

1 files changed, 62 insertions, 0 deletions

diff --git a/src/main/java/org/onap/aai/spike/SchemaIngestConfiguration.java b/src/main/java/org/onap/aai/spike/SchemaIngestConfiguration.java
new file mode 100644
index 0000000..fcb1e71
--- /dev/null
+++ b/src/main/java/org/onap/aai/spike/SchemaIngestConfiguration.java
@@ -0,0 +1,62 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * 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.spike;
+
+import org.onap.aai.edges.EdgeIngestor;
+import org.onap.aai.nodes.NodeIngestor;
+import org.onap.aai.setup.AAIConfigTranslator;
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersions;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
+public class SchemaIngestConfiguration {
+
+    @Bean
+    public SchemaVersions schemaVersions() {
+        return new SchemaVersions();
+    }
+
+    @Bean
+    public SchemaLocationsBean schemaLocationsBean() {
+        return new SchemaLocationsBean();
+    }
+
+    @Bean
+    public ConfigTranslator configTranslator() {
+        return new AAIConfigTranslator(schemaLocationsBean(), schemaVersions());
+    }
+
+    @Bean
+    public NodeIngestor nodeIngestor() {
+        return new NodeIngestor(configTranslator());
+    }
+
+    @Bean
+    public EdgeIngestor edgeIngestor() {
+        return new EdgeIngestor(configTranslator(), schemaVersions());
+    }
+
+}