add release 16.0.1 container file

[usecase-ui/server.git] / server / src / main / java / org / onap / usecaseui / server / service / lcm / impl / SotnServiceQryServiceImpl.java

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java
index 4dd78c0..3d0329d 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java
@@ -15,50 +15,36 @@
  */
 package org.onap.usecaseui.server.service.lcm.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.RequiredArgsConstructor;
 import okhttp3.ResponseBody;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 import org.onap.usecaseui.server.bean.activateEdge.ServiceInstance;
 import org.onap.usecaseui.server.bean.lcm.sotne2eservice.ModelConfig;
 import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ResponseServiceInstanceWrapper;
 import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ServiceInstanceList;
 import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ServiceInstanceListWrapper;
-//import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ServiceSubscriptionWrapper;
 import org.onap.usecaseui.server.service.lcm.SotnServiceQryService;
-import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
-import org.onap.usecaseui.server.util.RestfulServices;
-import org.onap.usecaseui.server.util.UuiCommonUtil;
+import org.onap.usecaseui.server.service.lcm.domain.aai.AAIClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import retrofit2.Response;
 
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
+@RequiredArgsConstructor
 @Service("SotnServiceQry")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
 public class SotnServiceQryServiceImpl implements SotnServiceQryService {
 
     private static final Logger logger = LoggerFactory.getLogger(SotnServiceQryServiceImpl.class);
 
-    private AAIService aaiService;
-
-    public SotnServiceQryServiceImpl() {
-        this(RestfulServices.create(AAIService.class));
-    }
-
-    public SotnServiceQryServiceImpl(AAIService aaiService) {
-        this.aaiService = aaiService;
-    }
+    private final AAIClient aaiClient;
 
     @Override
     public String getServiceInstances(String serviceType) {
@@ -68,10 +54,9 @@ public class SotnServiceQryServiceImpl implements SotnServiceQryService {
 
         //serviceType = "generic";
         ObjectMapper mapper = new ObjectMapper();
-        JSONParser parser = new JSONParser();
 
         try {
-            Response<ResponseBody> response = aaiService.listServiceInstances(customerid, serviceType).execute();
+            Response<ResponseBody> response = aaiClient.listServiceInstances(customerid, serviceType).execute();
             if (response.isSuccessful()) {
                 String resultStr=new String(response.body().bytes());
                 ServiceInstanceListWrapper serviceInstances = mapper.readValue(resultStr, new TypeReference<ServiceInstanceListWrapper>() {
@@ -101,23 +86,14 @@ public class SotnServiceQryServiceImpl implements SotnServiceQryService {
     }
 
     public ModelConfig readFile() {
-        JSONParser parser = new JSONParser();
-        //String jsonPath = "/home/root1/Desktop/modelconfig.json";
-        //String absolutepath = "/home/root1/Desktop/Subhosree/gerrit clone for ui backend";//configure absolute path as per systempath
-        String jsonPath = "/home/modelconfig.json";
-        String jsonString = null;
         ObjectMapper mapper = new ObjectMapper();
-
         try {
-
-            Object object = parser.parse(new FileReader(jsonPath));
-            //System.out.println(object.toString());
-            ModelConfig modelInformation = mapper.readValue(object.toString(), new TypeReference<ModelConfig>() {
-            });
-
+            Resource resource = new ClassPathResource("modelconfig.json");
+            ModelConfig modelInformation = mapper.readValue(resource.getInputStream(), ModelConfig.class);
+            logger.info("subscriber id is: {}.", modelInformation.getSubscriberId());
             return modelInformation;
-        } catch (ParseException | IOException ex) {
-            logger.error("Exception occured while reading configuration file:" + ex);
+        } catch (IOException ex) {
+            logger.error("Exception occured while reading configuration file: {}", ex);
             return null;
         }
     }