import com.alibaba.fastjson.JSONArray;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+
import org.apache.commons.collections.MapUtils;
import org.onap.usecaseui.server.bean.HttpResponseResult;
import org.onap.usecaseui.server.bean.intent.CCVPNInstance;
import com.fasterxml.jackson.databind.ObjectMapper;
@RestController
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
+@RequiredArgsConstructor
@CrossOrigin(origins = "*")
@RequestMapping("/intent")
public class IntentController {
@Resource(name = "IntentInstanceService")
private IntentInstanceService intentInstanceService;
- private IntentApiService intentApiService;
+ private final IntentApiService intentApiService;
private ObjectMapper omAlarm = new ObjectMapper();
@Resource(name = "SlicingService")
private SlicingService slicingService;
- public IntentController() {
- this(RestfulServices.create(IntentApiService.class));
- }
- public IntentController(IntentApiService intentApiService) {
- this.intentApiService = intentApiService;
- }
-
@GetMapping(value="/listModel",produces = "application/json;charset=utf8")
public String getModels() throws JsonProcessingException {
List<IntentModel> listModels = intentService.listModels();
package org.onap.usecaseui.server.service.customer.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.RequiredArgsConstructor;
+
import com.fasterxml.jackson.core.type.TypeReference;
import okhttp3.ResponseBody;
import org.onap.usecaseui.server.constant.Constant;
import org.onap.usecaseui.server.service.customer.CcvpnCustomerService;
import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import retrofit2.Response;
-import java.io.File;
import java.io.IOException;
import java.util.*;
-import java.util.stream.Collectors;
-
+@RequiredArgsConstructor
@Service("CcvpnCustomerService")
public class CcvpnCustomerServiceImpl implements CcvpnCustomerService {
private static final Logger logger = LoggerFactory.getLogger(CcvpnCustomerServiceImpl.class);
- private AAIService aaiService;
-
- public CcvpnCustomerServiceImpl() {
- this(RestfulServices.create(AAIService.class));
- }
-
- public CcvpnCustomerServiceImpl(AAIService aaiService) {
- this.aaiService = aaiService;
- }
+ private final AAIService aaiService;
@Override
public ServiceInstances getServiceInstances(String customerId, String serviceType) {
import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
import org.onap.usecaseui.server.service.lcm.domain.aai.bean.*;
import org.onap.usecaseui.server.service.lcm.domain.aai.exceptions.AAIException;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
import retrofit2.Response;
+@RequiredArgsConstructor
@Service("OrchestratorService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class DefaultOrchestratorService implements OrchestratorService {
private static final Logger logger = LoggerFactory.getLogger(DefaultOrchestratorService.class);
- private AAIService aaiService;
-
- public DefaultOrchestratorService() {
- this(RestfulServices.create(AAIService.class));
- }
-
- public DefaultOrchestratorService(AAIService aaiService) {
- this.aaiService = aaiService;
- }
+ private final AAIService aaiService;
@Override
public List<AAIEsrNfvo> listOrchestrator() {
import static org.onap.usecaseui.server.service.lcm.domain.sdc.consts.SDCConsts.DISTRIBUTION_STATUS_DISTRIBUTED;
import static org.onap.usecaseui.server.service.lcm.domain.sdc.consts.SDCConsts.RESOURCETYPE_VF;
-import static org.onap.usecaseui.server.util.RestfulServices.create;
import static org.onap.usecaseui.server.util.RestfulServices.extractBody;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
import org.onap.usecaseui.server.bean.ServiceBean;
import org.onap.usecaseui.server.bean.ServiceInstanceOperations;
import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAICustomer;
import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIServiceSubscription;
-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.stereotype.Service;
import com.alibaba.fastjson.JSON;
import okhttp3.ResponseBody;
import retrofit2.Response;
+@RequiredArgsConstructor
@Service("ServiceInstanceService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class DefaultServiceInstanceService implements ServiceInstanceService {
- private static final Logger logger = LoggerFactory.getLogger(DefaultServiceInstanceService.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultServiceInstanceService.class);
- private AAIService aaiService;
-
- @Resource(name="ServiceLcmService")
- private ServiceLcmService serviceLcmService;
-
- @Resource(name="CustomerService")
- private CustomerService customerService;
+ private final AAIService aaiService;
+
+ @Resource(name = "ServiceLcmService")
+ private ServiceLcmService serviceLcmService;
+
+ @Resource(name = "CustomerService")
+ private CustomerService customerService;
+
+ public void setCustomerService(CustomerService customerService) {
+ this.customerService = customerService;
+ }
- public void setCustomerService(CustomerService customerService) {
- this.customerService = customerService;
- }
-
public void setServiceLcmService(ServiceLcmService serviceLcmService) {
this.serviceLcmService = serviceLcmService;
}
- public DefaultServiceInstanceService() {
- this(RestfulServices.create(AAIService.class));
- }
-
- public DefaultServiceInstanceService(AAIService aaiService) {
- this.aaiService = aaiService;
- }
-
- @Override
- public List<String> listServiceInstances(String customerId, String serviceType) {
- List<String> result = new ArrayList<>();
- try {
- Response<ResponseBody> response = aaiService.listServiceInstances(customerId, serviceType).execute();
- if (response.isSuccessful()) {
- String resultStr=new String(response.body().bytes());
- JSONObject object = JSONObject.parseObject(resultStr);
- if(UuiCommonUtil.isNotNullOrEmpty(object)){
- result=this.parseServiceInstance(object, customerId, serviceType);
- }
- return result;
- } else {
- logger.info(String.format("Can not get service instances[code=%s, message=%s]", response.code(), response.message()));
- return Collections.emptyList();
- }
- } catch (IOException e) {
- logger.error("list services instances occur exception"+e.getMessage());
- return Collections.emptyList();
- }
- }
-
-
- private List<String> parseServiceInstance(JSONObject objects,String customerId,String serviceType) throws JsonProcessingException{
- List<String> result = new ArrayList<>();
- JSONArray serviceInstances=objects.getJSONArray("service-instance");
- for(Object serviceInstance:serviceInstances){
- JSONObject object = JSON.parseObject(serviceInstance+"");
- String serviceInstanceId=object.get("service-instance-id").toString();
- ServiceBean serviceBean = serviceLcmService.getServiceBeanByServiceInStanceId(serviceInstanceId);
- ServiceInstanceOperations serviceInstanceOperations = serviceLcmService.getServiceInstanceOperationById(serviceInstanceId);
- if(!UuiCommonUtil.isNotNullOrEmpty(serviceBean)){
- continue;
- }
- String serviceDomain = serviceBean.getServiceDomain();
- object.put("serviceDomain",serviceDomain);
- object.put("operationResult",serviceInstanceOperations.getOperationResult());
- object.put("operationId",serviceInstanceOperations.getOperationId());
- object.put("operationType",serviceInstanceOperations.getOperationType());
- result.add(object.toString());
- }
- return result;
- }
-
+ @Override
+ public List<String> listServiceInstances(String customerId, String serviceType) {
+ List<String> result = new ArrayList<>();
+ try {
+ Response<ResponseBody> response = aaiService.listServiceInstances(customerId, serviceType).execute();
+ if (response.isSuccessful()) {
+ String resultStr = new String(response.body().bytes());
+ JSONObject object = JSONObject.parseObject(resultStr);
+ if (UuiCommonUtil.isNotNullOrEmpty(object)) {
+ result = this.parseServiceInstance(object, customerId, serviceType);
+ }
+ return result;
+ } else {
+ logger.info(
+ String.format("Can not get service instances[code=%s, message=%s]", response.code(), response.message()));
+ return Collections.emptyList();
+ }
+ } catch (IOException e) {
+ logger.error("list services instances occur exception" + e.getMessage());
+ return Collections.emptyList();
+ }
+ }
+
+ private List<String> parseServiceInstance(JSONObject objects, String customerId, String serviceType)
+ throws JsonProcessingException {
+ List<String> result = new ArrayList<>();
+ JSONArray serviceInstances = objects.getJSONArray("service-instance");
+ for (Object serviceInstance : serviceInstances) {
+ JSONObject object = JSON.parseObject(serviceInstance + "");
+ String serviceInstanceId = object.get("service-instance-id").toString();
+ ServiceBean serviceBean = serviceLcmService.getServiceBeanByServiceInStanceId(serviceInstanceId);
+ ServiceInstanceOperations serviceInstanceOperations = serviceLcmService
+ .getServiceInstanceOperationById(serviceInstanceId);
+ if (!UuiCommonUtil.isNotNullOrEmpty(serviceBean)) {
+ continue;
+ }
+ String serviceDomain = serviceBean.getServiceDomain();
+ object.put("serviceDomain", serviceDomain);
+ object.put("operationResult", serviceInstanceOperations.getOperationResult());
+ object.put("operationId", serviceInstanceOperations.getOperationId());
+ object.put("operationType", serviceInstanceOperations.getOperationType());
+ result.add(object.toString());
+ }
+ return result;
+ }
+
@Override
public String getRelationShipData(String customerId, String serviceType, String serviceId) {
- try {
- Response<ResponseBody> response = aaiService.getAAIServiceInstance(customerId, serviceType,serviceId).execute();
- if (response.isSuccessful()) {
- String result=new String(response.body().bytes());
- return result;
- } else {
- logger.info(String.format("Can not get service instances[code=%s, message=%s]", response.code(), response.message()));
- return "";
- }
- } catch (IOException e) {
- logger.error("list services instances occur exception:"+e.getMessage());
- return "";
- }
+ try {
+ Response<ResponseBody> response = aaiService.getAAIServiceInstance(customerId, serviceType, serviceId).execute();
+ if (response.isSuccessful()) {
+ String result = new String(response.body().bytes());
+ return result;
+ } else {
+ logger.info(
+ String.format("Can not get service instances[code=%s, message=%s]", response.code(), response.message()));
+ return "";
+ }
+ } catch (IOException e) {
+ logger.error("list services instances occur exception:" + e.getMessage());
+ return "";
+ }
}
-
+
@Override
- public String serviceNumByCustomer() throws JsonProcessingException{
- Map<String,Object> result = new HashMap();
+ public String serviceNumByCustomer() throws JsonProcessingException {
+ Map<String, Object> result = new HashMap();
ObjectMapper omAlarm = new ObjectMapper();
List<AAICustomer> customers = customerService.listCustomer();
- int total =0;
- List<Map<String,Object>> list = new ArrayList<>();
- if(customers.size()>0){
- for(AAICustomer customer : customers){
- Map<String,Object> customerMap = new HashMap<String,Object>();
+ int total = 0;
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (customers.size() > 0) {
+ for (AAICustomer customer : customers) {
+ Map<String, Object> customerMap = new HashMap<String, Object>();
int customerNum = 0;
- List<AAIServiceSubscription> serviceSubscriptions = customerService.listServiceSubscriptions(customer.getGlobalCustomerId());
- if(serviceSubscriptions.size()>0){
- for(AAIServiceSubscription serviceSubscription:serviceSubscriptions){
- List<String> serviceInstances =this.listServiceInstances(customer.getGlobalCustomerId(), serviceSubscription.getServiceType());
- total+=serviceInstances.size();
- customerNum+=serviceInstances.size();
+ List<AAIServiceSubscription> serviceSubscriptions = customerService
+ .listServiceSubscriptions(customer.getGlobalCustomerId());
+ if (serviceSubscriptions.size() > 0) {
+ for (AAIServiceSubscription serviceSubscription : serviceSubscriptions) {
+ List<String> serviceInstances = this.listServiceInstances(customer.getGlobalCustomerId(),
+ serviceSubscription.getServiceType());
+ total += serviceInstances.size();
+ customerNum += serviceInstances.size();
}
}
- customerMap.put("name",customer.getSubscriberName());
- customerMap.put("value",customerNum);
+ customerMap.put("name", customer.getSubscriberName());
+ customerMap.put("value", customerNum);
list.add(customerMap);
}
}
result.put("customerServiceList", list);
return omAlarm.writeValueAsString(result);
}
-
+
@Override
- public String serviceNumByServiceType(String customerId) throws JsonProcessingException{
+ public String serviceNumByServiceType(String customerId) throws JsonProcessingException {
List<AAIServiceSubscription> serviceTypes = customerService.listServiceSubscriptions(customerId);
- List<Map<String,Object>> list = new ArrayList<>();
+ List<Map<String, Object>> list = new ArrayList<>();
ObjectMapper omAlarm = new ObjectMapper();
-
+
for (AAIServiceSubscription aaiServiceSubscription : serviceTypes) {
- Map<String,Object> serviceTypeMap = new HashMap<String,Object>();
- List<String> serviceInstances =this.listServiceInstances(customerId, aaiServiceSubscription.getServiceType());
+ Map<String, Object> serviceTypeMap = new HashMap<String, Object>();
+ List<String> serviceInstances = this.listServiceInstances(customerId, aaiServiceSubscription.getServiceType());
- //serviceTypeMap.put(aaiServiceSubscription.getServiceType(),serviceInstances.size());
+ // serviceTypeMap.put(aaiServiceSubscription.getServiceType(),serviceInstances.size());
serviceTypeMap.put("name", aaiServiceSubscription.getServiceType());
serviceTypeMap.put("value", serviceInstances.size());
list.add(serviceTypeMap);
}
- Map<String,Object> result = new HashMap();
+ Map<String, Object> result = new HashMap();
result.put("list", list);
return omAlarm.writeValueAsString(result);
}
*/
package org.onap.usecaseui.server.service.lcm.impl;
-import static org.onap.usecaseui.server.util.RestfulServices.create;
import static org.onap.usecaseui.server.util.RestfulServices.extractBody;
import java.io.IOException;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
import org.onap.usecaseui.server.bean.ServiceBean;
import org.onap.usecaseui.server.bean.ServiceInstanceOperations;
import org.onap.usecaseui.server.service.lcm.ServiceLcmService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.RequiredArgsConstructor;
import okhttp3.ResponseBody;
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.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 java.util.ArrayList;
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 AAIService aaiService;
@Override
public String getServiceInstances(String serviceType) {
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+
+import lombok.RequiredArgsConstructor;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.Relationship;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.RelationshipData;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
import retrofit2.Response;
+@RequiredArgsConstructor
@Service("GeneralConvertService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class GeneralConvertImpl {
private static final Logger logger = LoggerFactory.getLogger(GeneralConvertImpl.class);
- private AAISliceService aaiSliceService;
- public GeneralConvertImpl() {
- this(RestfulServices.create(AAISliceService.class));
- }
-
- public GeneralConvertImpl(AAISliceService aaiSliceService) {
- this.aaiSliceService = aaiSliceService;
- }
+ private final AAISliceService aaiSliceService;
public AAIServiceAndInstance queryServiceUtil(JSONObject object) {
if (object.containsKey("relationship-list")) {
*/
package org.onap.usecaseui.server.service.nsmf.impl;
-import static org.onap.usecaseui.server.util.RestfulServices.create;
-
-
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import java.util.ArrayList;
import java.util.List;
import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+
import org.apache.commons.beanutils.BeanUtils;
import org.onap.usecaseui.server.bean.nsmf.common.PagedResult;
import org.onap.usecaseui.server.bean.nsmf.resource.HostedBusinessInfo;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceRsp;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.Relationship;
import org.onap.usecaseui.server.service.slicingdomain.aai.bean.RelationshipData;
-import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.onap.usecaseui.server.util.nsmf.NsmfCommonUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
import retrofit2.Response;
+@RequiredArgsConstructor
@Service("ResourceMgtConvertService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class ResourceMgtServiceConvert {
private static final Logger logger = LoggerFactory.getLogger(ResourceMgtServiceConvert.class);
+ private static final Gson gson = new Gson();
@Resource(name = "GeneralConvertService")
private GeneralConvertImpl generalConvert;
- private SOSliceService soSliceService;
- private AAISliceService aaiSliceService;
- Gson gson = new Gson();
-
- public ResourceMgtServiceConvert() {
- this(RestfulServices.create(SOSliceService.class), RestfulServices.create(AAISliceService.class));
- }
-
- public ResourceMgtServiceConvert(SOSliceService soSliceService, AAISliceService aaiSliceService) {
- this.soSliceService = soSliceService;
- this.aaiSliceService = aaiSliceService;
- }
+ private final AAISliceService aaiSliceService;
void convertSlicingBusinessList(SlicingBusinessList slicingBusinessList, AAIServiceRsp aAIServiceRsp, int pageNo,
int pageSize)
}
} catch (Exception e) {
logger.error("Exception in convertBusinessProfileDetails response",e);
-
+
}
String useInterval = generalConvert.getUseInterval(businessId);
}
} catch (Exception e) {
logger.error("Exception in getIncludedNssiInfoList response",e);
-
+
}
}
}
import retrofit2.Response;
import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.List;
import java.util.stream.Collectors;
+@RequiredArgsConstructor
@Service("ResourceMgtService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class ResourceMgtServiceImpl implements ResourceMgtService {
private static final Logger logger = LoggerFactory.getLogger(ResourceMgtServiceImpl.class);
+ private static final Gson gson = new Gson();
+
+ private final AAISliceService aaiSliceService;
+ private final SOSliceService soSliceService;
+
@Resource(name = "ServiceLcmService")
private ServiceLcmService serviceLcmService;
@Resource(name = "ResourceMgtConvertService")
private ResourceMgtServiceConvert resourceMgtServiceConvert;
- private AAISliceService aaiSliceService;
- private SOSliceService soSliceService;
- Gson gson = new Gson();
-
- public ResourceMgtServiceImpl() {
- this(RestfulServices.create(AAISliceService.class), RestfulServices.create(SOSliceService.class));
- }
-
- public ResourceMgtServiceImpl(AAISliceService aaiSliceService, SOSliceService soSliceService) {
- this.aaiSliceService = aaiSliceService;
- this.soSliceService = soSliceService;
- }
-
@Override
public ServiceResult querySlicingBusiness(int pageNo, int pageSize) {
ServiceResult serviceResult = new ServiceResult();
import java.util.List;
import java.util.Properties;
import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import org.onap.usecaseui.server.bean.nsmf.common.ResultHeader;
import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalTraffic;
import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiUserNumber;
import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiPDUSessionEstSR;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.onap.usecaseui.server.util.nsmf.NsmfCommonUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
import retrofit2.Response;
+@RequiredArgsConstructor
@Service("ResourceMonitorService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class ResourceMonitorServiceImpl implements ResourceMonitorService {
- private final static Logger logger = LoggerFactory.getLogger(ResourceMonitorServiceImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(ResourceMonitorServiceImpl.class);
+ private static final Gson gson = new Gson();
+
+ private final KpiSliceService kpiSliceService;
@Resource(name = "ResourceMonitorConvertService")
private ResourceMonitorServiceConvert resourceMonitorServiceConvert;
- Gson gson = new Gson();
-
- private KpiSliceService kpiSliceService;
private int kpiHours;
- public ResourceMonitorServiceImpl() {
- this(RestfulServices.create(KpiSliceService.class));
- }
-
- public ResourceMonitorServiceImpl(KpiSliceService kpiSliceService) {
- this.kpiSliceService = kpiSliceService;
- }
-
public void initConfig() {
String slicingPath = System.getProperty("user.dir") + File.separator + "config" + File.separator + "slicing.properties";
Properties p = new Properties();
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.util.stream.Collectors;
+
+import lombok.RequiredArgsConstructor;
import lombok.Setter;
import org.apache.commons.beanutils.BeanUtils;
import org.onap.usecaseui.server.bean.nsmf.common.PagedResult;
import java.util.List;
import retrofit2.Response;
-@Service("TaskMgtConvertService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
@Setter
+@RequiredArgsConstructor
+@Service("TaskMgtConvertService")
public class TaskMgtServiceConvert {
private static final Logger logger = LoggerFactory.getLogger(TaskMgtServiceConvert.class);
@Resource(name = "GeneralConvertService")
private GeneralConvertImpl generalConvert;
- private AAISliceService aaiSliceService;
-
- public TaskMgtServiceConvert() {
- this(RestfulServices.create(AAISliceService.class));
- }
-
- public TaskMgtServiceConvert(AAISliceService aaiSliceService) {
- this.aaiSliceService = aaiSliceService;
- }
+ private final AAISliceService aaiSliceService;
void convertSlicingTaskList(SlicingTaskList targetSlicingTaskList, SOTaskRsp sourceSoTaskRsp, int pageNo,
int pageSize)
import retrofit2.Response;
import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+@RequiredArgsConstructor
@Service("TaskMgtService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
public class TaskMgtServiceImpl implements TaskMgtService {
private static final Logger logger = LoggerFactory.getLogger(TaskMgtServiceImpl.class);
+ private final SOSliceService soSliceService;
+ private final AAISliceService aaiSliceService;
+
@Resource(name = "TaskMgtConvertService")
protected TaskMgtServiceConvert taskMgtServiceConvert;
- private SOSliceService soSliceService;
-
- private AAISliceService aaiSliceService;
-
-
- public TaskMgtServiceImpl() {
- this(RestfulServices.create(SOSliceService.class),RestfulServices.create(AAISliceService.class));
-
- }
-
- public TaskMgtServiceImpl(SOSliceService soSliceService,AAISliceService aaiSliceService) {
- this.soSliceService = soSliceService;
- this.aaiSliceService = aaiSliceService;
-
- }
-
@Override
public ServiceResult querySlicingTask(int pageNo, int pageSize) {
import java.util.List;
import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
import org.onap.usecaseui.server.bean.sotn.Pinterface;
import org.onap.usecaseui.server.bean.sotn.PinterfaceRsp;
import org.onap.usecaseui.server.service.lcm.domain.aai.exceptions.AAIException;
import org.onap.usecaseui.server.service.lcm.domain.so.exceptions.SOException;
import org.onap.usecaseui.server.service.sotn.SOTNService;
-import org.onap.usecaseui.server.util.RestfulServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Service;
import okhttp3.RequestBody;
import retrofit2.Response;
@Service("SOTNService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
+@RequiredArgsConstructor
public class SOTNServiceImpl implements SOTNService{
-
- private static final Logger logger = LoggerFactory.getLogger(SOTNServiceImpl.class);
- private AAIService aaiService;
+ private static final Logger logger = LoggerFactory.getLogger(SOTNServiceImpl.class);
- public SOTNServiceImpl() {
- this(RestfulServices.create(AAIService.class));
- }
-
- public SOTNServiceImpl(AAIService aaiService) {
- this.aaiService = aaiService;
- }
+ private final AAIService aaiService;
@Override
public String getNetWorkResources() {
}
return result;
}
-
+
@Override
public String getSpecificLogicalLink(String linkName) {
String result="";
}
return result;
}
-
+
@Override
public String getHostUrl(String aaiId) {
String result="";
}
return result;
}
-
+
@Override
public String getExtAaiId(String aaiId) {
String result="";
}
return result;
}
-
+
@Override
public String createHostUrl(HttpServletRequest request,String aaiId) {
String result = "";
}
return result;
}
-
+
@Override
public String createTopoNetwork(HttpServletRequest request,String networkId) {
String result = "";
}
return result;
}
-
+
@Override
public String createPnf(HttpServletRequest request,String pnfName) {
String result = "";
}
return result;
}
-
+
@Override
public String deleteLink(String linkName,String resourceVersion) {
String result = "";
}
return result;
}
-
+
@Override
public String deleteExtNetwork(String networkId,String resourceVersion) {
String result = "";
@Before
public void before() throws Exception {
aaiSliceService = mock(AAISliceService.class);
- soSliceService = mock(SOSliceService.class);
generalConvert = mock(GeneralConvertImpl.class);
- resourceMgtServiceConvert = new ResourceMgtServiceConvert(soSliceService, aaiSliceService);
+ resourceMgtServiceConvert = new ResourceMgtServiceConvert(aaiSliceService);
MemberModifier.field(ResourceMgtServiceConvert.class, "generalConvert").set(resourceMgtServiceConvert , generalConvert);
}
+++ /dev/null
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * 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.
- */
-package org.onap.usecaseui.server.util;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
-
-public class RestfulServicesTest {
- @Test
- public void testCreateServiceImpl() throws Exception {
- try {
- Object aaiService = createService(AAIService.class);
- Assert.assertTrue(aaiService instanceof AAIService);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private <T> Object createService(Class<T> clazz) {
- return RestfulServices.create(clazz);
- }
-}
\ No newline at end of file
Code Review / usecase-ui / server.git / commitdiff