Consistently use @RequiredArgsConstructor

- make services final
- create constructor via @RequiredArgsConstructor

Issue-ID: USECASEUI-868
Change-Id: I50153496b59395240bd70bb99310183a9a12b12a
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

16 files changed, 166 insertions, 313 deletions

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java b/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java
index 6c64d6c7..5605394c 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java
@@ -25,6 +25,8 @@ import jakarta.annotation.Resource;
 
 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;
@@ -51,8 +53,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @RestController
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
+@RequiredArgsConstructor
 @CrossOrigin(origins = "*")
 @RequestMapping("/intent")
 public class IntentController {
@@ -64,20 +65,13 @@ 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();
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java
index c1dbfce5..a94e6bde 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java
@@ -16,6 +16,9 @@
 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;
 
@@ -28,7 +31,6 @@ import org.onap.usecaseui.server.bean.lcm.sotne2eservice.ModelConfig;
 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;
@@ -37,26 +39,16 @@ import org.springframework.core.io.Resource;
 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) {
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java
index 5ddda29f..7fe2e6e7 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultOrchestratorService.java
@@ -23,30 +23,20 @@ import org.onap.usecaseui.server.service.lcm.OrchestratorService;
 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() {
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
index f52640d3..50824423 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
@@ -22,7 +22,6 @@ import static org.onap.usecaseui.server.service.lcm.domain.sdc.consts.SDCConsts.
 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;
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
index 63ffd232..d0e7849e 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
 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;
@@ -31,11 +32,9 @@ import org.onap.usecaseui.server.service.lcm.ServiceLcmService;
 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;
@@ -47,119 +46,115 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 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);
 			}
 		}
@@ -167,25 +162,25 @@ public class DefaultServiceInstanceService implements ServiceInstanceService {
 		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);
 	}
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
index c11b2f4e..ad49bcac 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
@@ -15,7 +15,6 @@
  */
 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;
@@ -33,7 +32,6 @@ import lombok.extern.slf4j.Slf4j;
 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;
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 ebebba6c..42b68123 100644
--- 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
@@ -17,19 +17,18 @@ package org.onap.usecaseui.server.service.lcm.impl;
 
 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;
@@ -39,22 +38,13 @@ import java.io.IOException;
 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) {
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImpl.java
index 2767b339..52377d83 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImpl.java
@@ -17,6 +17,9 @@ package org.onap.usecaseui.server.service.nsmf.impl;
 
 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;
@@ -25,28 +28,18 @@ import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
 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")) {
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java
index 9970ce59..fd295bd9 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java
@@ -15,9 +15,6 @@
  */
 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;
@@ -26,6 +23,8 @@ import java.lang.reflect.InvocationTargetException;
 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;
@@ -54,37 +53,23 @@ import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceProfil
 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)
@@ -258,7 +243,7 @@ public class ResourceMgtServiceConvert {
             }
         } catch (Exception e) {
             logger.error("Exception in convertBusinessProfileDetails response",e);
-            
+
         }
 
         String useInterval = generalConvert.getUseInterval(businessId);
@@ -354,7 +339,7 @@ public class ResourceMgtServiceConvert {
                 }
             } catch (Exception e) {
                 logger.error("Exception in getIncludedNssiInfoList response",e);
-                
+
             }
         }
     }
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java
index ac8b3fdc..064c7a65 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java
@@ -68,17 +68,23 @@ import org.springframework.stereotype.Service;
 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;
 
@@ -88,19 +94,6 @@ public class ResourceMgtServiceImpl implements ResourceMgtService {
     @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();
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java
index a2857168..ddcbf8d5 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 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;
@@ -49,37 +50,26 @@ import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalBandwidt
 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();
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java
index e6d2f37b..469b3c57 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java
@@ -18,6 +18,8 @@ package org.onap.usecaseui.server.service.nsmf.impl;
 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;
@@ -55,10 +57,9 @@ import java.util.ArrayList;
 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);
@@ -66,15 +67,7 @@ public class TaskMgtServiceConvert {
     @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)
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java
index 55694d1f..e8c51eb9 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java
@@ -56,37 +56,25 @@ import org.springframework.util.ObjectUtils;
 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) {
 
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java
index d64e3826..61fbc2a9 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java
@@ -22,6 +22,7 @@ import java.util.Collections;
 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;
@@ -30,10 +31,8 @@ import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
 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;
@@ -41,21 +40,12 @@ import okhttp3.ResponseBody;
 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() {
@@ -115,7 +105,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String getSpecificLogicalLink(String linkName) {
 		String result="";
@@ -135,7 +125,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String getHostUrl(String aaiId) {
 		String result="";
@@ -155,7 +145,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String getExtAaiId(String aaiId) {
 		String result="";
@@ -175,7 +165,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String createHostUrl(HttpServletRequest request,String aaiId) {
 		String result = "";
@@ -196,7 +186,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String createTopoNetwork(HttpServletRequest request,String networkId) {
 		String result = "";
@@ -259,7 +249,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String createPnf(HttpServletRequest request,String pnfName) {
 		String result = "";
@@ -280,7 +270,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String deleteLink(String linkName,String resourceVersion) {
 		String result = "";
@@ -479,7 +469,7 @@ public class SOTNServiceImpl implements SOTNService{
         }
         return result;
 	}
-	
+
 	@Override
 	public String deleteExtNetwork(String networkId,String resourceVersion) {
 		String result = "";
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java
index ffd88fa3..4625ac63 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java
@@ -65,9 +65,8 @@ public class ResourceMgtServiceConvertTest {
     @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);
     }
 
diff --git a/server/src/test/java/org/onap/usecaseui/server/util/RestfulServicesTest.java b/server/src/test/java/org/onap/usecaseui/server/util/RestfulServicesTest.java
deleted file mode 100644
index aa780ade..00000000
--- a/server/src/test/java/org/onap/usecaseui/server/util/RestfulServicesTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 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