Only load SchemaService related beans in aai-common when schema.translator.list=schem...

[aai/aai-common.git] / aai-schema-ingest / src / main / java / org / onap / aai / setup / SchemaServiceTranslator.java

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java
index 8c29f96..ec6e41a 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java
@@ -20,34 +20,36 @@
 
 package org.onap.aai.setup;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.io.*;
-import java.util.*;
-
-import javax.ws.rs.HttpMethod;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.onap.aai.restclient.RestClient;
-import org.onap.aai.restclient.RestClientFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * <b>AAIConfigTranslator</b> is responsible for looking at the schema files and
  * edge files based on the available versions Also has the ability to exclude
  * them based on the node.exclusion.pattern
  */
+@Component
+@ConditionalOnProperty(name = "schema.translator.list", havingValue = "schema-service", matchIfMissing = false)
 public class SchemaServiceTranslator extends Translator {
 
-    private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(SchemaServiceTranslator.class);
-
-    private static final String SchemaServiceClientType = "schema.service";
+    private static final Logger LOGGER = LoggerFactory.getLogger(SchemaServiceTranslator.class);
 
     @Value("${schema.service.nodes.endpoint}")
     private String nodeSchemaUri;
@@ -56,7 +58,7 @@ public class SchemaServiceTranslator extends Translator {
     private String edgeSchemaUri;
 
     @Autowired
-    private RestClientFactory restClientFactory;
+    private RestClient restClient;
 
     public SchemaServiceTranslator(SchemaVersions schemaVersions) {
         super(schemaVersions);
@@ -64,26 +66,27 @@ public class SchemaServiceTranslator extends Translator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.onap.aai.setup.ConfigTranslator#getNodeFiles()
      */
 
     @Override
     public List<InputStream> getVersionNodeStream(SchemaVersion version) throws IOException {
 
-        List<InputStream> inputStreams = new ArrayList<>();
-        String content = "";
-        String uri = nodeSchemaUri + version.toString();
-        Map<String, String> headersMap = new HashMap<>();
-
+        final Map<String, String> headersMap = new HashMap<>();
         headersMap.put(HttpHeaders.ACCEPT, MediaType.APPLICATION_XML.toString());
         headersMap.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML.toString());
-        RestClient restClient = restClientFactory.getRestClient(SchemaServiceClientType);
+        final String content = "";
+        final String uri = nodeSchemaUri + version.toString();
         ResponseEntity<Resource> schemaResponse = restClient.getGetResource(content, uri, headersMap);
+
         verifySchemaServiceResponse(schemaResponse.getStatusCode());
         LOGGER.debug("SchemaResponse Status code" + schemaResponse.getStatusCode());
-        inputStreams.add(schemaResponse.getBody().getInputStream());
-        return inputStreams;
+        
+        Resource resultBody = schemaResponse.getBody();
+        return resultBody != null
+            ? Collections.singletonList(resultBody.getInputStream())
+            : Collections.emptyList();
     }
 
     @Override
@@ -91,18 +94,14 @@ public class SchemaServiceTranslator extends Translator {
         /*
          * Call Schema MS to get versions using RestTemplate
          */
-        List<String> inputStreams = new ArrayList<>();
-        String content = "";
-        String uri = edgeSchemaUri + version.toString();
-        Map<String, String> headersMap = new HashMap<>();
-
-        RestClient restClient = restClientFactory.getRestClient(SchemaServiceClientType);
+        final String content = "";
+        final String uri = edgeSchemaUri + version.toString();
+        final Map<String, String> headersMap = new HashMap<>();
 
         ResponseEntity<String> schemaResponse = restClient.getGetRequest(content, uri, headersMap);
         verifySchemaServiceResponse(schemaResponse.getStatusCode());
         LOGGER.debug("SchemaResponse Status code" + schemaResponse.getStatusCode());
-        inputStreams.add(schemaResponse.getBody());
-        return inputStreams;
+        return Collections.singletonList(schemaResponse.getBody());
 
     }