Modify Unit Tests

[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 c62cf23..ebebba6 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,34 +15,28 @@
  */
 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 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.customer.impl.CcvpnCustomerServiceImpl;
 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.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.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Service("SotnServiceQry")
@@ -70,7 +64,6 @@ public class SotnServiceQryServiceImpl implements SotnServiceQryService {
 
         //serviceType = "generic";
         ObjectMapper mapper = new ObjectMapper();
-        JSONParser parser = new JSONParser();
 
         try {
             Response<ResponseBody> response = aaiService.listServiceInstances(customerid, serviceType).execute();
@@ -103,17 +96,14 @@ public class SotnServiceQryServiceImpl implements SotnServiceQryService {
     }
 
     public ModelConfig readFile() {
-        JSONParser parser = new JSONParser();
-        ClassLoader classLoader = new SotnServiceQryServiceImpl().getClass().getClassLoader();
-        File file = new File(classLoader.getResource("modelconfig.json").getFile());
         ObjectMapper mapper = new ObjectMapper();
         try {
-            Object object = parser.parse(new FileReader(file));
-            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;
         }
     }