Organise imports to ONAP Java standards

[aai/search-data-service.git] / src / main / java / org / onap / aai / sa / searchdbabstraction / service / SearchService.java

diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
index 7b16a35..2d7a290 100644 (file)
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
@@ -20,15 +20,15 @@
  */
 package org.onap.aai.sa.searchdbabstraction.service;
 
+import java.io.FileInputStream;
+import java.util.Properties;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
 import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
 import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
 import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
-
-import java.io.FileInputStream;
-import java.util.Properties;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 public class SearchService {
@@ -36,6 +36,9 @@ public class SearchService {
 
   static Logger logger = LoggerFactory.getInstance().getLogger(SearchService.class.getName());
 
+  @Autowired
+  private  ElasticSearchConfig esConfig;
+
   public SearchService() {
     try {
       start();
@@ -47,8 +50,6 @@ public class SearchService {
   protected void start() throws Exception {
     Properties configProperties = new Properties();
     configProperties.load(new FileInputStream(SearchDbConstants.ES_CONFIG_FILE));
-    ElasticSearchConfig esConfig = new ElasticSearchConfig(configProperties);
-
     esController = new ElasticSearchHttpController(esConfig);
     logger.info(SearchDbMsgs.SERVICE_STARTED);
   }