Updating the new schema service ingest

Issue-ID: AAI-2006
Change-Id: I25360ea42d1e09ada6af00dbe99ceace978ee09a
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>

2 files changed, 51 insertions, 0 deletions

diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java
index 9958d72..02e390f 100644
--- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java
+++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java
@@ -20,11 +20,19 @@
  */
 package org.onap.aai.sparky;
 
+import org.onap.aai.config.EdgesConfiguration;
 import org.onap.aai.sparky.config.PropertyPasswordConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@ComponentScan(basePackages = {"org.onap.aai.config", "org.onap.aai.setup", "org.onap.aai.sparky"}, excludeFilters = {
+@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE,
+value = EdgesConfiguration.class)})
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
 public class Application {
   
   public static void main(String[] args) {
diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/SchemaConfiguration.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/SchemaConfiguration.java
new file mode 100644
index 0000000..ccaa833
--- /dev/null
+++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/SchemaConfiguration.java
@@ -0,0 +1,43 @@
+/**

+ * ============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.sparky.config;

+

+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.boot.autoconfigure.condition.ConditionalOnProperty;

+import org.springframework.context.annotation.Bean;

+import org.springframework.context.annotation.Configuration;

+import org.springframework.context.annotation.PropertySource;

+

+@Configuration

+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)

+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)

+public class SchemaConfiguration {

+

+    @Bean(name = "configTranslator")

+    @ConditionalOnProperty(name = "schema.translator.list", havingValue = "config", matchIfMissing = true)

+    public ConfigTranslator configTranslator(SchemaLocationsBean schemaLocationsBean, SchemaVersions schemaVersions) {

+        return new AAIConfigTranslator(schemaLocationsBean, schemaVersions);

+    }

+}