Replaced all tabs with spaces in java and pom.xml

Added in maven plugins to enforce coding style rules
Added in eclipse java formatting xml

Change-Id: I3727bbf4ce8dc66abfd8ad21b6cfd0890c5d3ff0
Issue-ID: SO-1765
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

13 files changed, 630 insertions, 649 deletions

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java
index 09e8cf1d32..02b44efe1c 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsScheduler.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-
 import org.onap.so.db.request.beans.ArchivedInfraRequests;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.data.repository.ArchivedInfraRequestsRepository;
@@ -41,122 +40,120 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
 import net.javacrumbs.shedlock.core.SchedulerLock;
 
 @Component
 public class ArchiveInfraRequestsScheduler {
-	
-	private static Logger logger = LoggerFactory.getLogger(ArchiveInfraRequestsScheduler.class);
-	
-	@Autowired
-	private InfraActiveRequestsRepository infraActiveRepo;
-	@Autowired 
-	private ArchivedInfraRequestsRepository archivedInfraRepo;
-	
-	@Value("${mso.infra-requests.archived.period}")
-	private int archivedPeriod;
-	
-	/**
-	 * Runs the scheduler nightly
-	 * [Seconds] [Minutes] [Hours] [Day of month] [Month] [Day of week] [Year]
-	 */
-	@Scheduled(cron="0 0 1 * * ?")
-	@SchedulerLock(name = "archiveInfraRequestsScheduler")
-	public void infraRequestsScheduledTask() {
-		logger.debug("Start of archiveInfraRequestsScheduler");
-		
-		Date currentDate= new Date();
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(currentDate);
-		calendar.add(Calendar.DATE, -archivedPeriod);
-		Date archivingDate = calendar.getTime();
-		
-		logger.debug("Date before 6 months: "+ (calendar.get(Calendar.MONTH) + 1) + "-"
-		        		+ calendar.get(Calendar.DATE) + "-" + calendar.get(Calendar.YEAR));
-		
-		List<InfraActiveRequests> requestsByEndTime = new ArrayList<>();
-		PageRequest pageRequest = new PageRequest(0, 100);
-		do {
-			requestsByEndTime = infraActiveRepo.findByEndTimeLessThan(archivingDate, pageRequest);
-			logger.debug("{} requests to be archived based on End Time", requestsByEndTime.size());
-			archiveInfraRequests(requestsByEndTime);
-		} while(!requestsByEndTime.isEmpty());
-		
-		List<InfraActiveRequests> requestsByStartTime = new ArrayList<>();
-		do {
-			requestsByStartTime = infraActiveRepo.findByStartTimeLessThanAndEndTime(archivingDate, null, pageRequest);
-			logger.debug("{} requests to be archived based on Start Time", requestsByEndTime.size());
-			archiveInfraRequests(requestsByStartTime);
-		} while(!requestsByStartTime.isEmpty());
-		
-		logger.debug("End of archiveInfraRequestsScheduler");
-	}
-	
-	protected void archiveInfraRequests(List<InfraActiveRequests> requests) {
-		List<ArchivedInfraRequests> newArchivedReqs = new ArrayList<>();
-		List<InfraActiveRequests> oldInfraReqs = new ArrayList<>();
-		
-		for(InfraActiveRequests iar: requests) {
-			ArchivedInfraRequests archivedInfra = new ArchivedInfraRequests();
-			try {
-				archivedInfra.setAaiServiceId(iar.getAaiServiceId());
-				archivedInfra.setAction(iar.getAction());
-				archivedInfra.setAicCloudRegion(iar.getAicCloudRegion());
-				archivedInfra.setAicNodeClli(iar.getAicNodeClli());
-				archivedInfra.setCallBackUrl(iar.getCallBackUrl());
-				archivedInfra.setClientRequestId(iar.getClientRequestId());
-				archivedInfra.setConfigurationId(iar.getConfigurationId());
-				archivedInfra.setConfigurationName(iar.getConfigurationName());
-				archivedInfra.setCorrelator(iar.getCorrelator());
-				archivedInfra.setEndTime(iar.getEndTime());
-				archivedInfra.setLastModifiedBy(iar.getLastModifiedBy());
-				archivedInfra.setNetworkId(iar.getNetworkId());
-				archivedInfra.setNetworkName(iar.getNetworkName());
-				archivedInfra.setNetworkType(iar.getNetworkType());
-				archivedInfra.setOperationalEnvId(iar.getOperationalEnvId());
-				archivedInfra.setOperationalEnvName(iar.getOperationalEnvName());
-				archivedInfra.setRequestUrl(iar.getRequestUrl());				
-				archivedInfra.setProgress(iar.getProgress());
-				archivedInfra.setProvStatus(iar.getProvStatus());
-				archivedInfra.setRequestAction(iar.getRequestAction());
-				archivedInfra.setRequestBody(iar.getRequestBody());
-				archivedInfra.setRequestId(iar.getRequestId());
-				archivedInfra.setRequestorId(iar.getRequestorId());
-				archivedInfra.setRequestScope(iar.getRequestScope());
-				archivedInfra.setRequestStatus(iar.getRequestStatus());
-				archivedInfra.setRequestType(iar.getRequestType());
-				archivedInfra.setResponseBody(iar.getResponseBody());
-				archivedInfra.setServiceInstanceId(iar.getServiceInstanceId());
-				archivedInfra.setServiceInstanceName(iar.getServiceInstanceName());
-				archivedInfra.setServiceType(iar.getServiceType());
-				archivedInfra.setSource(iar.getSource());
-				archivedInfra.setStartTime(iar.getStartTime());
-				archivedInfra.setStatusMessage(iar.getStatusMessage());
-				archivedInfra.setTenantId(iar.getTenantId());
-				archivedInfra.setVfModuleId(iar.getVfModuleId());
-				archivedInfra.setVfModuleModelName(iar.getVfModuleModelName());
-				archivedInfra.setVfModuleName(iar.getVfModuleName());
-				archivedInfra.setVnfId(iar.getVnfId());
-				archivedInfra.setVnfName(iar.getVnfName());
-				archivedInfra.setVnfOutputs(iar.getVnfOutputs());
-				archivedInfra.setVnfParams(iar.getVnfParams());
-				archivedInfra.setVnfType(iar.getVnfType());
-				archivedInfra.setVolumeGroupId(iar.getVolumeGroupId());
-				archivedInfra.setVolumeGroupName(iar.getVolumeGroupName());
-				
-				newArchivedReqs.add(archivedInfra);
-				oldInfraReqs.add(iar);
-			} catch(Exception e) {
-				logger.error("{} {}", MessageEnum.RA_GENERAL_EXCEPTION.toString(), ErrorCode
-					.UnknownError.getValue(), e);
-			}
-		}
-		
-		logger.info("Creating archivedInfraRequest records: {}", newArchivedReqs.size());
-		archivedInfraRepo.saveAll(newArchivedReqs);
-		
-		logger.info("Deleting InfraActiveRequest records: {}", oldInfraReqs.size());
-		infraActiveRepo.deleteAll(oldInfraReqs);
-	}
+
+    private static Logger logger = LoggerFactory.getLogger(ArchiveInfraRequestsScheduler.class);
+
+    @Autowired
+    private InfraActiveRequestsRepository infraActiveRepo;
+    @Autowired
+    private ArchivedInfraRequestsRepository archivedInfraRepo;
+
+    @Value("${mso.infra-requests.archived.period}")
+    private int archivedPeriod;
+
+    /**
+     * Runs the scheduler nightly [Seconds] [Minutes] [Hours] [Day of month] [Month] [Day of week] [Year]
+     */
+    @Scheduled(cron = "0 0 1 * * ?")
+    @SchedulerLock(name = "archiveInfraRequestsScheduler")
+    public void infraRequestsScheduledTask() {
+        logger.debug("Start of archiveInfraRequestsScheduler");
+
+        Date currentDate = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(currentDate);
+        calendar.add(Calendar.DATE, -archivedPeriod);
+        Date archivingDate = calendar.getTime();
+
+        logger.debug("Date before 6 months: " + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DATE)
+                + "-" + calendar.get(Calendar.YEAR));
+
+        List<InfraActiveRequests> requestsByEndTime = new ArrayList<>();
+        PageRequest pageRequest = new PageRequest(0, 100);
+        do {
+            requestsByEndTime = infraActiveRepo.findByEndTimeLessThan(archivingDate, pageRequest);
+            logger.debug("{} requests to be archived based on End Time", requestsByEndTime.size());
+            archiveInfraRequests(requestsByEndTime);
+        } while (!requestsByEndTime.isEmpty());
+
+        List<InfraActiveRequests> requestsByStartTime = new ArrayList<>();
+        do {
+            requestsByStartTime = infraActiveRepo.findByStartTimeLessThanAndEndTime(archivingDate, null, pageRequest);
+            logger.debug("{} requests to be archived based on Start Time", requestsByEndTime.size());
+            archiveInfraRequests(requestsByStartTime);
+        } while (!requestsByStartTime.isEmpty());
+
+        logger.debug("End of archiveInfraRequestsScheduler");
+    }
+
+    protected void archiveInfraRequests(List<InfraActiveRequests> requests) {
+        List<ArchivedInfraRequests> newArchivedReqs = new ArrayList<>();
+        List<InfraActiveRequests> oldInfraReqs = new ArrayList<>();
+
+        for (InfraActiveRequests iar : requests) {
+            ArchivedInfraRequests archivedInfra = new ArchivedInfraRequests();
+            try {
+                archivedInfra.setAaiServiceId(iar.getAaiServiceId());
+                archivedInfra.setAction(iar.getAction());
+                archivedInfra.setAicCloudRegion(iar.getAicCloudRegion());
+                archivedInfra.setAicNodeClli(iar.getAicNodeClli());
+                archivedInfra.setCallBackUrl(iar.getCallBackUrl());
+                archivedInfra.setClientRequestId(iar.getClientRequestId());
+                archivedInfra.setConfigurationId(iar.getConfigurationId());
+                archivedInfra.setConfigurationName(iar.getConfigurationName());
+                archivedInfra.setCorrelator(iar.getCorrelator());
+                archivedInfra.setEndTime(iar.getEndTime());
+                archivedInfra.setLastModifiedBy(iar.getLastModifiedBy());
+                archivedInfra.setNetworkId(iar.getNetworkId());
+                archivedInfra.setNetworkName(iar.getNetworkName());
+                archivedInfra.setNetworkType(iar.getNetworkType());
+                archivedInfra.setOperationalEnvId(iar.getOperationalEnvId());
+                archivedInfra.setOperationalEnvName(iar.getOperationalEnvName());
+                archivedInfra.setRequestUrl(iar.getRequestUrl());
+                archivedInfra.setProgress(iar.getProgress());
+                archivedInfra.setProvStatus(iar.getProvStatus());
+                archivedInfra.setRequestAction(iar.getRequestAction());
+                archivedInfra.setRequestBody(iar.getRequestBody());
+                archivedInfra.setRequestId(iar.getRequestId());
+                archivedInfra.setRequestorId(iar.getRequestorId());
+                archivedInfra.setRequestScope(iar.getRequestScope());
+                archivedInfra.setRequestStatus(iar.getRequestStatus());
+                archivedInfra.setRequestType(iar.getRequestType());
+                archivedInfra.setResponseBody(iar.getResponseBody());
+                archivedInfra.setServiceInstanceId(iar.getServiceInstanceId());
+                archivedInfra.setServiceInstanceName(iar.getServiceInstanceName());
+                archivedInfra.setServiceType(iar.getServiceType());
+                archivedInfra.setSource(iar.getSource());
+                archivedInfra.setStartTime(iar.getStartTime());
+                archivedInfra.setStatusMessage(iar.getStatusMessage());
+                archivedInfra.setTenantId(iar.getTenantId());
+                archivedInfra.setVfModuleId(iar.getVfModuleId());
+                archivedInfra.setVfModuleModelName(iar.getVfModuleModelName());
+                archivedInfra.setVfModuleName(iar.getVfModuleName());
+                archivedInfra.setVnfId(iar.getVnfId());
+                archivedInfra.setVnfName(iar.getVnfName());
+                archivedInfra.setVnfOutputs(iar.getVnfOutputs());
+                archivedInfra.setVnfParams(iar.getVnfParams());
+                archivedInfra.setVnfType(iar.getVnfType());
+                archivedInfra.setVolumeGroupId(iar.getVolumeGroupId());
+                archivedInfra.setVolumeGroupName(iar.getVolumeGroupName());
+
+                newArchivedReqs.add(archivedInfra);
+                oldInfraReqs.add(iar);
+            } catch (Exception e) {
+                logger.error("{} {}", MessageEnum.RA_GENERAL_EXCEPTION.toString(), ErrorCode.UnknownError.getValue(),
+                        e);
+            }
+        }
+
+        logger.info("Creating archivedInfraRequest records: {}", newArchivedReqs.size());
+        archivedInfraRepo.saveAll(newArchivedReqs);
+
+        logger.info("Deleting InfraActiveRequest records: {}", oldInfraReqs.size());
+        infraActiveRepo.deleteAll(oldInfraReqs);
+    }
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java
index a476f890cc..f6a0aec86f 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java
@@ -22,7 +22,6 @@ package org.onap.so.adapters.requestsdb;
 
 import java.util.List;
 import java.util.Map;
-
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.data.controller.InstanceNameDuplicateCheckRequest;
 import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
@@ -40,26 +39,35 @@ public class InfraActiveRequestsRepositoryCustomController {
     @Autowired
     InfraActiveRequestsRepository infraActiveRequestsRepository;
 
-    @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/getCloudOrchestrationFiltersFromInfraActive")
-    public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(@RequestBody Map<String, String> orchestrationMap) {
+    @RequestMapping(method = RequestMethod.POST,
+            value = "/infraActiveRequests/getCloudOrchestrationFiltersFromInfraActive")
+    public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(
+            @RequestBody Map<String, String> orchestrationMap) {
         return infraActiveRequestsRepository.getCloudOrchestrationFiltersFromInfraActive(orchestrationMap);
     }
 
     @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/getOrchestrationFiltersFromInfraActive")
-    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(@RequestBody Map<String, List<String>> orchestrationMap) {
+    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(
+            @RequestBody Map<String, List<String>> orchestrationMap) {
         return infraActiveRequestsRepository.getOrchestrationFiltersFromInfraActive(orchestrationMap);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = "/infraActiveRequests/checkVnfIdStatus/{operationalEnvironmentId}")
-    public InfraActiveRequests checkVnfIdStatus(@PathVariable("operationalEnvironmentId") String operationalEnvironmentId) {
+    @RequestMapping(method = RequestMethod.GET,
+            value = "/infraActiveRequests/checkVnfIdStatus/{operationalEnvironmentId}")
+    public InfraActiveRequests checkVnfIdStatus(
+            @PathVariable("operationalEnvironmentId") String operationalEnvironmentId) {
         return infraActiveRequestsRepository.checkVnfIdStatus(operationalEnvironmentId);
     }
 
     @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/checkInstanceNameDuplicate")
-    public InfraActiveRequests checkInstanceNameDuplicate(@RequestBody InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest) {
-        return infraActiveRequestsRepository.checkInstanceNameDuplicate(instanceNameDuplicateCheckRequest.getInstanceIdMap(), instanceNameDuplicateCheckRequest.getInstanceName(), instanceNameDuplicateCheckRequest.getRequestScope());
+    public InfraActiveRequests checkInstanceNameDuplicate(
+            @RequestBody InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest) {
+        return infraActiveRequestsRepository.checkInstanceNameDuplicate(
+                instanceNameDuplicateCheckRequest.getInstanceIdMap(),
+                instanceNameDuplicateCheckRequest.getInstanceName(),
+                instanceNameDuplicateCheckRequest.getRequestScope());
     }
-    
+
     @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/v1/getInfraActiveRequests")
     public List<InfraActiveRequests> getInfraActiveRequests(@RequestBody Map<String, String[]> filters,
             @RequestParam("from") long startTime, @RequestParam("to") long endTime,
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java
index 0c2a49ae53..f4a9f711fd 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapter.java
@@ -24,7 +24,6 @@ import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 import javax.xml.bind.annotation.XmlElement;
-
 import org.onap.so.adapters.requestsdb.exceptions.MsoRequestsDbException;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.beans.ResourceOperationStatus;
@@ -35,79 +34,78 @@ import org.onap.so.db.request.beans.ResourceOperationStatus;
 @WebService(name = "RequestsDbAdapter", targetNamespace = "http://org.onap.so/requestsdb")
 public interface MsoRequestsDbAdapter {
 
-	@WebMethod
-	public void updateInfraRequest(@WebParam(name = "requestId") @XmlElement(required = true) String requestId,
-			@WebParam(name = "lastModifiedBy") @XmlElement(required = true) String lastModifiedBy,
-			@WebParam(name = "statusMessage") @XmlElement(required = false) String statusMessage,
-			@WebParam(name = "responseBody") @XmlElement(required = false) String responseBody,
-			@WebParam(name = "requestStatus") @XmlElement(required = false) RequestStatusType requestStatus,
-			@WebParam(name = "progress") @XmlElement(required = false) String progress,
-			@WebParam(name = "vnfOutputs") @XmlElement(required = false) String vnfOutputs,
-			@WebParam(name = "serviceInstanceId") @XmlElement(required = false) String serviceInstanceId,
-			@WebParam(name = "networkId") @XmlElement(required = false) String networkId,
-			@WebParam(name = "vnfId") @XmlElement(required = false) String vnfId,
-			@WebParam(name = "vfModuleId") @XmlElement(required = false) String vfModuleId,
-			@WebParam(name = "volumeGroupId") @XmlElement(required = false) String volumeGroupId,
-			@WebParam(name = "serviceInstanceName") @XmlElement(required = false) String serviceInstanceName,
-			@WebParam(name = "configurationId") @XmlElement(required = false) String configurationId,
-			@WebParam(name = "configurationName") @XmlElement(required = false) String configurationName,
-			@WebParam(name = "vfModuleName") @XmlElement(required = false) String vfModuleName)
-			throws MsoRequestsDbException;
+    @WebMethod
+    public void updateInfraRequest(@WebParam(name = "requestId") @XmlElement(required = true) String requestId,
+            @WebParam(name = "lastModifiedBy") @XmlElement(required = true) String lastModifiedBy,
+            @WebParam(name = "statusMessage") @XmlElement(required = false) String statusMessage,
+            @WebParam(name = "responseBody") @XmlElement(required = false) String responseBody,
+            @WebParam(name = "requestStatus") @XmlElement(required = false) RequestStatusType requestStatus,
+            @WebParam(name = "progress") @XmlElement(required = false) String progress,
+            @WebParam(name = "vnfOutputs") @XmlElement(required = false) String vnfOutputs,
+            @WebParam(name = "serviceInstanceId") @XmlElement(required = false) String serviceInstanceId,
+            @WebParam(name = "networkId") @XmlElement(required = false) String networkId,
+            @WebParam(name = "vnfId") @XmlElement(required = false) String vnfId,
+            @WebParam(name = "vfModuleId") @XmlElement(required = false) String vfModuleId,
+            @WebParam(name = "volumeGroupId") @XmlElement(required = false) String volumeGroupId,
+            @WebParam(name = "serviceInstanceName") @XmlElement(required = false) String serviceInstanceName,
+            @WebParam(name = "configurationId") @XmlElement(required = false) String configurationId,
+            @WebParam(name = "configurationName") @XmlElement(required = false) String configurationName,
+            @WebParam(name = "vfModuleName") @XmlElement(required = false) String vfModuleName)
+            throws MsoRequestsDbException;
 
-	@WebMethod
-	public InfraActiveRequests getInfraRequest(
-			@WebParam(name = "requestId") @XmlElement(required = true) String requestId) throws MsoRequestsDbException;
+    @WebMethod
+    public InfraActiveRequests getInfraRequest(
+            @WebParam(name = "requestId") @XmlElement(required = true) String requestId) throws MsoRequestsDbException;
 
-	@WebMethod
-	public boolean getSiteStatus(@WebParam(name = "siteName") @XmlElement(required = true) String siteName);
+    @WebMethod
+    public boolean getSiteStatus(@WebParam(name = "siteName") @XmlElement(required = true) String siteName);
 
-	@WebMethod
-	public void updateServiceOperationStatus(
-			@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
-			@WebParam(name = "operationId") @XmlElement(required = false) String operationId,
-			@WebParam(name = "operationType") @XmlElement(required = false) String operationType,
-			@WebParam(name = "userId") @XmlElement(required = false) String userId,
-			@WebParam(name = "result") @XmlElement(required = false) String result,
-			@WebParam(name = "operationContent") @XmlElement(required = false) String operationContent,
-			@WebParam(name = "progress") @XmlElement(required = false) String progress,
-			@WebParam(name = "reason") @XmlElement(required = false) String reason) throws MsoRequestsDbException;
+    @WebMethod
+    public void updateServiceOperationStatus(
+            @WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
+            @WebParam(name = "operationId") @XmlElement(required = false) String operationId,
+            @WebParam(name = "operationType") @XmlElement(required = false) String operationType,
+            @WebParam(name = "userId") @XmlElement(required = false) String userId,
+            @WebParam(name = "result") @XmlElement(required = false) String result,
+            @WebParam(name = "operationContent") @XmlElement(required = false) String operationContent,
+            @WebParam(name = "progress") @XmlElement(required = false) String progress,
+            @WebParam(name = "reason") @XmlElement(required = false) String reason) throws MsoRequestsDbException;
 
-	@WebMethod
-	public void initServiceOperationStatus(
-			@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
-			@WebParam(name = "operationId") @XmlElement(required = false) String operationId,
-			@WebParam(name = "operationType") @XmlElement(required = false) String operationType,
-			@WebParam(name = "userId") @XmlElement(required = false) String userId,
-			@WebParam(name = "result") @XmlElement(required = false) String result,
-			@WebParam(name = "operationContent") @XmlElement(required = false) String operationContent,
-			@WebParam(name = "progress") @XmlElement(required = false) String progress,
-			@WebParam(name = "reason") @XmlElement(required = false) String reason) throws MsoRequestsDbException;
+    @WebMethod
+    public void initServiceOperationStatus(@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
+            @WebParam(name = "operationId") @XmlElement(required = false) String operationId,
+            @WebParam(name = "operationType") @XmlElement(required = false) String operationType,
+            @WebParam(name = "userId") @XmlElement(required = false) String userId,
+            @WebParam(name = "result") @XmlElement(required = false) String result,
+            @WebParam(name = "operationContent") @XmlElement(required = false) String operationContent,
+            @WebParam(name = "progress") @XmlElement(required = false) String progress,
+            @WebParam(name = "reason") @XmlElement(required = false) String reason) throws MsoRequestsDbException;
 
-	@WebMethod
-	public void initResourceOperationStatus(@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
-			@WebParam(name = "operationId") @XmlElement(required = true) String operationId,
-			@WebParam(name = "operationType") @XmlElement(required = true) String operationType,
-			@WebParam(name = "resourceTemplateUUIDs") @XmlElement(required = true) String resourceTemplateUUIDs)
-			throws MsoRequestsDbException;
+    @WebMethod
+    public void initResourceOperationStatus(@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
+            @WebParam(name = "operationId") @XmlElement(required = true) String operationId,
+            @WebParam(name = "operationType") @XmlElement(required = true) String operationType,
+            @WebParam(name = "resourceTemplateUUIDs") @XmlElement(required = true) String resourceTemplateUUIDs)
+            throws MsoRequestsDbException;
 
-	@WebMethod
-	public ResourceOperationStatus getResourceOperationStatus(
-			@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
-			@WebParam(name = "operationId") @XmlElement(required = true) String operationId,
-			@WebParam(name = "resourceTemplateUUID") @XmlElement(required = true) String resourceTemplateUUID)
-			throws MsoRequestsDbException;
+    @WebMethod
+    public ResourceOperationStatus getResourceOperationStatus(
+            @WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
+            @WebParam(name = "operationId") @XmlElement(required = true) String operationId,
+            @WebParam(name = "resourceTemplateUUID") @XmlElement(required = true) String resourceTemplateUUID)
+            throws MsoRequestsDbException;
 
-	@WebMethod
-	public void updateResourceOperationStatus(
-			@WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
-			@WebParam(name = "operationId") @XmlElement(required = true) String operationId,
-			@WebParam(name = "resourceTemplateUUID") @XmlElement(required = true) String resourceTemplateUUID,
-			@WebParam(name = "operType") @XmlElement(required = false) String operType,
-			@WebParam(name = "resourceInstanceID") @XmlElement(required = false) String resourceInstanceID,
-			@WebParam(name = "jobId") @XmlElement(required = false) String jobId,
-			@WebParam(name = "status") @XmlElement(required = false) String status,
-			@WebParam(name = "progress") @XmlElement(required = false) String progress,
-			@WebParam(name = "errorCode") @XmlElement(required = false) String errorCode,
-			@WebParam(name = "statusDescription") @XmlElement(required = false) String statusDescription)
-			throws MsoRequestsDbException;
-}
\ No newline at end of file
+    @WebMethod
+    public void updateResourceOperationStatus(
+            @WebParam(name = "serviceId") @XmlElement(required = true) String serviceId,
+            @WebParam(name = "operationId") @XmlElement(required = true) String operationId,
+            @WebParam(name = "resourceTemplateUUID") @XmlElement(required = true) String resourceTemplateUUID,
+            @WebParam(name = "operType") @XmlElement(required = false) String operType,
+            @WebParam(name = "resourceInstanceID") @XmlElement(required = false) String resourceInstanceID,
+            @WebParam(name = "jobId") @XmlElement(required = false) String jobId,
+            @WebParam(name = "status") @XmlElement(required = false) String status,
+            @WebParam(name = "progress") @XmlElement(required = false) String progress,
+            @WebParam(name = "errorCode") @XmlElement(required = false) String errorCode,
+            @WebParam(name = "statusDescription") @XmlElement(required = false) String statusDescription)
+            throws MsoRequestsDbException;
+}
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index e3867d1b93..9d6a8b0529 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -25,7 +25,6 @@ package org.onap.so.adapters.requestsdb;
 
 import java.sql.Timestamp;
 import java.util.List;
-
 import javax.jws.WebService;
 import javax.transaction.Transactional;
 import org.onap.so.adapters.requestsdb.exceptions.MsoRequestsDbException;
@@ -46,324 +45,321 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
-@WebService(serviceName = "RequestsDbAdapter", endpointInterface = "org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter", targetNamespace = "http://org.onap.so/requestsdb")
+@WebService(serviceName = "RequestsDbAdapter",
+        endpointInterface = "org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter",
+        targetNamespace = "http://org.onap.so/requestsdb")
 @Component
 @Primary
-public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {	
+public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
 
-	private static Logger logger = LoggerFactory.getLogger(MsoRequestsDbAdapterImpl.class);
-	
-	@Autowired
-	private InfraActiveRequestsRepository infraActive;
+    private static Logger logger = LoggerFactory.getLogger(MsoRequestsDbAdapterImpl.class);
 
-	@Autowired
-	private SiteStatusRepository siteRepo;
+    @Autowired
+    private InfraActiveRequestsRepository infraActive;
 
-	@Autowired
-	private OperationStatusRepository operationStatusRepository;
+    @Autowired
+    private SiteStatusRepository siteRepo;
 
-	@Autowired
-	private ResourceOperationStatusRepository resourceOperationStatusRepository;
+    @Autowired
+    private OperationStatusRepository operationStatusRepository;
 
-	@Transactional
-	@Override
-	public void updateInfraRequest(String requestId, String lastModifiedBy, String statusMessage, String responseBody,
-			RequestStatusType requestStatus, String progress, String vnfOutputs, String serviceInstanceId,
-			String networkId, String vnfId, String vfModuleId, String volumeGroupId, String serviceInstanceName,
-			String configurationId, String configurationName, String vfModuleName) throws MsoRequestsDbException {
-		try {
-			InfraActiveRequests request = infraActive.findOneByRequestIdOrClientRequestId(requestId, requestId);
-			if (request == null) {
-				String error = "Entity not found. Unable to retrieve MSO Infra Requests DB for Request ID " + requestId;
-				throw new MsoRequestsDbException(error);
-			}
-			if (statusMessage != null) {
-				request.setStatusMessage(statusMessage);
-			}
-			if (responseBody != null) {
-				request.setResponseBody(responseBody);
-			}
-			if (requestStatus != null) {
-				request.setRequestStatus(requestStatus.toString());
-			}
-			if (progress != null) {
-				setProgress(progress, request);
-			}
-			if (vnfOutputs != null) {
-				request.setVnfOutputs(vnfOutputs);
-			}
-			if (serviceInstanceId != null) {
-				request.setServiceInstanceId(serviceInstanceId);
-			}
-			if (networkId != null) {
-				request.setNetworkId(networkId);
-			}
-			if (vnfId != null) {
-				request.setVnfId(vnfId);
-			}
-			if (vfModuleId != null) {
-				request.setVfModuleId(vfModuleId);
-			}
-			if (volumeGroupId != null) {
-				request.setVolumeGroupId(volumeGroupId);
-			}
-			if (serviceInstanceName != null) {
-				request.setServiceInstanceName(serviceInstanceName);
-			}
-			if (vfModuleName != null) {
-				request.setVfModuleName(vfModuleName);
-			}
-			if (configurationId != null) {
-				request.setConfigurationId(configurationId);
-			}
-			if (configurationName != null) {
-				request.setConfigurationName(configurationName);
-			}
-			if (requestStatus == RequestStatusType.COMPLETE || requestStatus == RequestStatusType.FAILED) {
-				Timestamp nowTimeStamp = new Timestamp(System.currentTimeMillis());
-				request.setEndTime(nowTimeStamp);
-			}
-			request.setLastModifiedBy(lastModifiedBy);
-			infraActive.save(request);
-		} catch (Exception e) {
-			String error = "Error retrieving MSO Infra Requests DB for Request ID " + requestId;
-			logger.error(error, e);
-			throw new MsoRequestsDbException(error, ErrorCode.BusinessProcesssError, e);
-		}
-	}
+    @Autowired
+    private ResourceOperationStatusRepository resourceOperationStatusRepository;
 
-	private void setProgress(String progress, InfraActiveRequests request) {
-		try {
-			request.setProgress(Long.parseLong(progress));
-		} catch (NumberFormatException e) {
-			logger.warn("UpdateInfraRequest", "Invalid value sent for progress");
-		}
-	}
+    @Transactional
+    @Override
+    public void updateInfraRequest(String requestId, String lastModifiedBy, String statusMessage, String responseBody,
+            RequestStatusType requestStatus, String progress, String vnfOutputs, String serviceInstanceId,
+            String networkId, String vnfId, String vfModuleId, String volumeGroupId, String serviceInstanceName,
+            String configurationId, String configurationName, String vfModuleName) throws MsoRequestsDbException {
+        try {
+            InfraActiveRequests request = infraActive.findOneByRequestIdOrClientRequestId(requestId, requestId);
+            if (request == null) {
+                String error = "Entity not found. Unable to retrieve MSO Infra Requests DB for Request ID " + requestId;
+                throw new MsoRequestsDbException(error);
+            }
+            if (statusMessage != null) {
+                request.setStatusMessage(statusMessage);
+            }
+            if (responseBody != null) {
+                request.setResponseBody(responseBody);
+            }
+            if (requestStatus != null) {
+                request.setRequestStatus(requestStatus.toString());
+            }
+            if (progress != null) {
+                setProgress(progress, request);
+            }
+            if (vnfOutputs != null) {
+                request.setVnfOutputs(vnfOutputs);
+            }
+            if (serviceInstanceId != null) {
+                request.setServiceInstanceId(serviceInstanceId);
+            }
+            if (networkId != null) {
+                request.setNetworkId(networkId);
+            }
+            if (vnfId != null) {
+                request.setVnfId(vnfId);
+            }
+            if (vfModuleId != null) {
+                request.setVfModuleId(vfModuleId);
+            }
+            if (volumeGroupId != null) {
+                request.setVolumeGroupId(volumeGroupId);
+            }
+            if (serviceInstanceName != null) {
+                request.setServiceInstanceName(serviceInstanceName);
+            }
+            if (vfModuleName != null) {
+                request.setVfModuleName(vfModuleName);
+            }
+            if (configurationId != null) {
+                request.setConfigurationId(configurationId);
+            }
+            if (configurationName != null) {
+                request.setConfigurationName(configurationName);
+            }
+            if (requestStatus == RequestStatusType.COMPLETE || requestStatus == RequestStatusType.FAILED) {
+                Timestamp nowTimeStamp = new Timestamp(System.currentTimeMillis());
+                request.setEndTime(nowTimeStamp);
+            }
+            request.setLastModifiedBy(lastModifiedBy);
+            infraActive.save(request);
+        } catch (Exception e) {
+            String error = "Error retrieving MSO Infra Requests DB for Request ID " + requestId;
+            logger.error(error, e);
+            throw new MsoRequestsDbException(error, ErrorCode.BusinessProcesssError, e);
+        }
+    }
 
-	@Override
-	@Transactional
-	public InfraActiveRequests getInfraRequest(String requestId) throws MsoRequestsDbException {		
-		logger.debug("Call to MSO Infra RequestsDb adapter get method with request Id: {}", requestId);
-		InfraActiveRequests request = null;
-		try {
-			request = infraActive.findOneByRequestIdOrClientRequestId(requestId, requestId);
-			if (request == null) {
-				String error = "Entity not found. Unable to retrieve MSO Infra Requests DB for Request ID " + requestId;
-				throw new MsoRequestsDbException(error);
-			}
-		} catch (Exception e) {
-			String error = "Error retrieving MSO Infra Requests DB for Request ID " + requestId;
-			logger.error(error,e);
-			throw new MsoRequestsDbException(error, ErrorCode.BusinessProcesssError , e);
-		}
-		return request;
-	}
+    private void setProgress(String progress, InfraActiveRequests request) {
+        try {
+            request.setProgress(Long.parseLong(progress));
+        } catch (NumberFormatException e) {
+            logger.warn("UpdateInfraRequest", "Invalid value sent for progress");
+        }
+    }
 
-	/**
-	 * Get SiteStatus by SiteName.
-	 *
-	 * @param siteName
-	 *            The unique name of the site
-	 * @return Status of that site
-	 */
-	@Override
-	@Transactional
-	public boolean getSiteStatus(String siteName) {
-		SiteStatus siteStatus;
-		logger.debug("Request database - get Site Status with Site name: {}", siteName);
-		siteStatus = siteRepo.findOneBySiteName(siteName);
-		if (siteStatus == null) {
-			// if not exist in DB, it means the site is not disabled, thus
-			// return true
-			return true;
-		} else {			
-			return siteStatus.getStatus();
-		}
-	}
+    @Override
+    @Transactional
+    public InfraActiveRequests getInfraRequest(String requestId) throws MsoRequestsDbException {
+        logger.debug("Call to MSO Infra RequestsDb adapter get method with request Id: {}", requestId);
+        InfraActiveRequests request = null;
+        try {
+            request = infraActive.findOneByRequestIdOrClientRequestId(requestId, requestId);
+            if (request == null) {
+                String error = "Entity not found. Unable to retrieve MSO Infra Requests DB for Request ID " + requestId;
+                throw new MsoRequestsDbException(error);
+            }
+        } catch (Exception e) {
+            String error = "Error retrieving MSO Infra Requests DB for Request ID " + requestId;
+            logger.error(error, e);
+            throw new MsoRequestsDbException(error, ErrorCode.BusinessProcesssError, e);
+        }
+        return request;
+    }
 
-	/**
-	 * update operation status <br>
-	 * 
-	 * @param serviceId
-	 * @param operationId
-	 * @param operationType
-	 * @param userId
-	 * @param result
-	 * @param operationContent
-	 * @param progress
-	 * @param reason
-	 * @throws MsoRequestsDbException
-	 * @since ONAP Amsterdam Release
-	 */
-	@Override
-	@Transactional
-	public void updateServiceOperationStatus(String serviceId, String operationId, String operationType, String userId,
-			String result, String operationContent, String progress, String reason) throws MsoRequestsDbException {
-		OperationStatus operStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId);
-		if (operStatus == null) {
-			String error = "Entity not found. Unable to retrieve OperationStatus Object ServiceId: " + serviceId + " operationId: "
-					+ operationId;
-			logger.error(error);
-			operStatus = new OperationStatus();
-			operStatus.setOperationId(operationId);
-			operStatus.setServiceId(serviceId);
-		}
+    /**
+     * Get SiteStatus by SiteName.
+     *
+     * @param siteName The unique name of the site
+     * @return Status of that site
+     */
+    @Override
+    @Transactional
+    public boolean getSiteStatus(String siteName) {
+        SiteStatus siteStatus;
+        logger.debug("Request database - get Site Status with Site name: {}", siteName);
+        siteStatus = siteRepo.findOneBySiteName(siteName);
+        if (siteStatus == null) {
+            // if not exist in DB, it means the site is not disabled, thus
+            // return true
+            return true;
+        } else {
+            return siteStatus.getStatus();
+        }
+    }
 
-		operStatus.setUserId(userId);
-		operStatus.setOperation(operationType);
-		operStatus.setReason(reason);
-		operStatus.setProgress(progress);
-		operStatus.setResult(result);
-		operStatus.setOperationContent(operationContent);
-		operStatus.setResult(result);
-		operationStatusRepository.save(operStatus);
-	}
+    /**
+     * update operation status <br>
+     * 
+     * @param serviceId
+     * @param operationId
+     * @param operationType
+     * @param userId
+     * @param result
+     * @param operationContent
+     * @param progress
+     * @param reason
+     * @throws MsoRequestsDbException
+     * @since ONAP Amsterdam Release
+     */
+    @Override
+    @Transactional
+    public void updateServiceOperationStatus(String serviceId, String operationId, String operationType, String userId,
+            String result, String operationContent, String progress, String reason) throws MsoRequestsDbException {
+        OperationStatus operStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId);
+        if (operStatus == null) {
+            String error = "Entity not found. Unable to retrieve OperationStatus Object ServiceId: " + serviceId
+                    + " operationId: " + operationId;
+            logger.error(error);
+            operStatus = new OperationStatus();
+            operStatus.setOperationId(operationId);
+            operStatus.setServiceId(serviceId);
+        }
 
-	/**
-	 * Init operation status <br>
-	 *
-	 * @param serviceId
-	 * @param operationId
-	 * @param operationType
-	 * @param userId
-	 * @param result
-	 * @param operationContent
-	 * @param progress
-	 * @param reason
-	 * @throws MsoRequestsDbException
-	 * @since ONAP Casablanca Release
-	 */
-	@Override
-	@Transactional
-	public void initServiceOperationStatus(String serviceId, String operationId, String operationType, String userId,
-											 String result, String operationContent, String progress, String reason) throws MsoRequestsDbException {
-		OperationStatus operStatus = new OperationStatus();
+        operStatus.setUserId(userId);
+        operStatus.setOperation(operationType);
+        operStatus.setReason(reason);
+        operStatus.setProgress(progress);
+        operStatus.setResult(result);
+        operStatus.setOperationContent(operationContent);
+        operStatus.setResult(result);
+        operationStatusRepository.save(operStatus);
+    }
+
+    /**
+     * Init operation status <br>
+     *
+     * @param serviceId
+     * @param operationId
+     * @param operationType
+     * @param userId
+     * @param result
+     * @param operationContent
+     * @param progress
+     * @param reason
+     * @throws MsoRequestsDbException
+     * @since ONAP Casablanca Release
+     */
+    @Override
+    @Transactional
+    public void initServiceOperationStatus(String serviceId, String operationId, String operationType, String userId,
+            String result, String operationContent, String progress, String reason) throws MsoRequestsDbException {
+        OperationStatus operStatus = new OperationStatus();
+
+        operStatus.setOperationId(operationId);
+        operStatus.setServiceId(serviceId);
+        operStatus.setUserId(userId);
+        operStatus.setOperation(operationType);
+        operStatus.setReason(reason);
+        operStatus.setProgress(progress);
+        operStatus.setResult(result);
+        operStatus.setOperationContent(operationContent);
+        operStatus.setResult(result);
+        operationStatusRepository.save(operStatus);
+    }
+
+    /**
+     * init the operation status of all the resources <br>
+     * 
+     * @param serviceId the service Id
+     * @param operationId the operation Id
+     * @param operationType the operationType
+     * @param resourceTemplateUUIDs the resources, the UUID is split by ":"
+     * @throws MsoRequestsDbException
+     * @since ONAP Amsterdam Release
+     */
+    @Override
+    @Transactional
+    public void initResourceOperationStatus(String serviceId, String operationId, String operationType,
+            String resourceTemplateUUIDs) throws MsoRequestsDbException {
+        String[] resourceLst = resourceTemplateUUIDs.split(":");
+        for (String resource : resourceLst) {
+            if ("".equals(resource)) {
+                continue;
+            }
+            ResourceOperationStatus resourceStatus = new ResourceOperationStatus();
+            resourceStatus.setOperationId(operationId);
+            resourceStatus.setServiceId(serviceId);
+            resourceStatus.setResourceTemplateUUID(resource);
+            resourceStatus.setOperType(operationType);
+            resourceStatus.setStatus(RequestsDbConstant.Status.PROCESSING);
+            resourceStatus.setStatusDescription("Waiting for start");
+            resourceOperationStatusRepository.save(resourceStatus);
 
-		operStatus.setOperationId(operationId);
-		operStatus.setServiceId(serviceId);
-		operStatus.setUserId(userId);
-		operStatus.setOperation(operationType);
-		operStatus.setReason(reason);
-		operStatus.setProgress(progress);
-		operStatus.setResult(result);
-		operStatus.setOperationContent(operationContent);
-		operStatus.setResult(result);
-		operationStatusRepository.save(operStatus);
-	}
+        }
+    }
+
+    /**
+     * get resource operation status <br>
+     * 
+     * @param serviceId
+     * @param operationId
+     * @param resourceTemplateUUID
+     * @return
+     * @throws MsoRequestsDbException
+     * @since ONAP Amsterdam Release
+     */
+    @Override
+    public ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId,
+            String resourceTemplateUUID) throws MsoRequestsDbException {
 
-	/**
-	 * init the operation status of all the resources <br>
-	 * 
-	 * @param serviceId
-	 *            the service Id
-	 * @param operationId
-	 *            the operation Id
-	 * @param operationType
-	 *            the operationType
-	 * @param resourceTemplateUUIDs
-	 *            the resources, the UUID is split by ":"
-	 * @throws MsoRequestsDbException
-	 * @since ONAP Amsterdam Release
-	 */
-	@Override
-	@Transactional
-	public void initResourceOperationStatus(String serviceId, String operationId, String operationType,
-			String resourceTemplateUUIDs) throws MsoRequestsDbException {
-		String[] resourceLst = resourceTemplateUUIDs.split(":");
-		for (String resource : resourceLst) {
-			if ("".equals(resource)) {
-				continue;
-			}
-			ResourceOperationStatus resourceStatus = new ResourceOperationStatus();
-			resourceStatus.setOperationId(operationId);
-			resourceStatus.setServiceId(serviceId);
-			resourceStatus.setResourceTemplateUUID(resource);
-			resourceStatus.setOperType(operationType);
-			resourceStatus.setStatus(RequestsDbConstant.Status.PROCESSING);
-			resourceStatus.setStatusDescription("Waiting for start");
-			resourceOperationStatusRepository.save(resourceStatus);
+        return resourceOperationStatusRepository
+                .findById(new ResourceOperationStatusId(serviceId, operationId, resourceTemplateUUID))
+                .orElseThrow(() -> new MsoRequestsDbException("Operation not found:" + operationId));
 
-		}
-	}
+    }
 
-	/**
-	 * get resource operation status <br>
-	 * 
-	 * @param serviceId
-	 * @param operationId
-	 * @param resourceTemplateUUID
-	 * @return
-	 * @throws MsoRequestsDbException
-	 * @since ONAP Amsterdam Release
-	 */
-	@Override
-	public ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId,
-			String resourceTemplateUUID) throws MsoRequestsDbException {
+    /**
+     * update resource operation status <br>
+     * 
+     * @param serviceId
+     * @param operationId
+     * @param resourceTemplateUUID
+     * @param operationType
+     * @param resourceInstanceID
+     * @param jobId
+     * @param status
+     * @param progress
+     * @param errorCode
+     * @param statusDescription
+     * @throws MsoRequestsDbException
+     * @since ONAP Amsterdam Release
+     */
+    @Override
+    public void updateResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID,
+            String operationType, String resourceInstanceID, String jobId, String status, String progress,
+            String errorCode, String statusDescription) throws MsoRequestsDbException {
+        ResourceOperationStatus resStatus = new ResourceOperationStatus();
+        resStatus.setServiceId(serviceId);
+        resStatus.setOperationId(operationId);
+        resStatus.setResourceTemplateUUID(resourceTemplateUUID);
+        resStatus.setOperType(operationType);
+        resStatus.setResourceInstanceID(resourceInstanceID);
+        resStatus.setJobId(jobId);
+        resStatus.setStatus(status);
+        resStatus.setProgress(progress);
+        resStatus.setErrorCode(errorCode);
+        resStatus.setStatusDescription(statusDescription);
+        resourceOperationStatusRepository.save(resStatus);
 
-		return resourceOperationStatusRepository
-				.findById(new ResourceOperationStatusId(serviceId, operationId, resourceTemplateUUID)).
-				orElseThrow( () -> new MsoRequestsDbException("Operation not found:" + operationId));
-				
-	}
+        updateOperationStatusBasedOnResourceStatus(resStatus);
+    }
 
-	/**
-	 * update resource operation status <br>
-	 * 
-	 * @param serviceId
-	 * @param operationId
-	 * @param resourceTemplateUUID
-	 * @param operationType
-	 * @param resourceInstanceID
-	 * @param jobId
-	 * @param status
-	 * @param progress
-	 * @param errorCode
-	 * @param statusDescription
-	 * @throws MsoRequestsDbException
-	 * @since ONAP Amsterdam Release
-	 */
-	@Override
-	public void updateResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID,
-			String operationType, String resourceInstanceID, String jobId, String status, String progress,
-			String errorCode, String statusDescription) throws MsoRequestsDbException {
-		ResourceOperationStatus resStatus = new ResourceOperationStatus();
-		resStatus.setServiceId(serviceId);
-		resStatus.setOperationId(operationId);
-		resStatus.setResourceTemplateUUID(resourceTemplateUUID);
-		resStatus.setOperType(operationType);
-		resStatus.setResourceInstanceID(resourceInstanceID);
-		resStatus.setJobId(jobId);
-		resStatus.setStatus(status);
-		resStatus.setProgress(progress);
-		resStatus.setErrorCode(errorCode);
-		resStatus.setStatusDescription(statusDescription);
-		resourceOperationStatusRepository.save(resStatus);
-		
-		updateOperationStatusBasedOnResourceStatus(resStatus);
-	}
-	
     /**
-     * update service operation status when a operation resource status updated
-     * <br>
+     * update service operation status when a operation resource status updated <br>
      * 
      * @param operStatus the resource operation status
      * @since ONAP Amsterdam Release
      */
     private void updateOperationStatusBasedOnResourceStatus(ResourceOperationStatus operStatus) {
-    	String serviceId = operStatus.getServiceId();
+        String serviceId = operStatus.getServiceId();
         String operationId = operStatus.getOperationId();
 
         logger.debug("Request database - update Operation Status Based On Resource Operation Status with service Id: "
-					+ "{}, operationId: {}", serviceId, operationId);
-        
-        List<ResourceOperationStatus> lstResourceStatus = resourceOperationStatusRepository.findByServiceIdAndOperationId(serviceId, operationId);
-		if (lstResourceStatus == null) {
-			logger.error("Unable to retrieve resourceOperStatus Object by ServiceId: {} operationId: {}", serviceId,
-				operationId);
-			return;
-		}
-		
-		// count the total progress
+                + "{}, operationId: {}", serviceId, operationId);
+
+        List<ResourceOperationStatus> lstResourceStatus =
+                resourceOperationStatusRepository.findByServiceIdAndOperationId(serviceId, operationId);
+        if (lstResourceStatus == null) {
+            logger.error("Unable to retrieve resourceOperStatus Object by ServiceId: {} operationId: {}", serviceId,
+                    operationId);
+            return;
+        }
+
+        // count the total progress
         int resourceCount = lstResourceStatus.size();
         int progress = 0;
         boolean isFinished = true;
@@ -373,26 +369,27 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
                 isFinished = false;
             }
         }
-        
-        OperationStatus serviceOperStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId);
-		if (serviceOperStatus == null) {
-			String error = "Entity not found. Unable to retrieve OperationStatus Object ServiceId: " + serviceId + " operationId: "
-					+ operationId;
-			logger.error(error);
-			
-			serviceOperStatus = new OperationStatus();
-			serviceOperStatus.setOperationId(operationId);
-			serviceOperStatus.setServiceId(serviceId);
-		}
-        
+
+        OperationStatus serviceOperStatus =
+                operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId);
+        if (serviceOperStatus == null) {
+            String error = "Entity not found. Unable to retrieve OperationStatus Object ServiceId: " + serviceId
+                    + " operationId: " + operationId;
+            logger.error(error);
+
+            serviceOperStatus = new OperationStatus();
+            serviceOperStatus.setOperationId(operationId);
+            serviceOperStatus.setServiceId(serviceId);
+        }
+
         progress = progress > 100 ? 100 : progress;
         serviceOperStatus.setProgress(String.valueOf(progress));
         serviceOperStatus.setOperationContent(operStatus.getStatusDescription());
         // if current resource failed. service failed.
-        if(RequestsDbConstant.Status.ERROR.equals(operStatus.getStatus())) {
+        if (RequestsDbConstant.Status.ERROR.equals(operStatus.getStatus())) {
             serviceOperStatus.setResult(RequestsDbConstant.Status.ERROR);
             serviceOperStatus.setReason(operStatus.getStatusDescription());
-        } else if(isFinished) {
+        } else if (isFinished) {
             // if finished
             serviceOperStatus.setResult(RequestsDbConstant.Status.FINISHED);
             serviceOperStatus.setProgress(RequestsDbConstant.Progress.ONE_HUNDRED);
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/RequestStatusType.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/RequestStatusType.java
index 1d5b892ade..9c6bcf20e7 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/RequestStatusType.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/RequestStatusType.java
@@ -19,10 +19,10 @@
  */
 
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.07.24 at 11:49:17 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2015.07.24 at 11:49:17 AM EDT
 //
 
 
@@ -35,10 +35,13 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for request-status-type.
+ * <p>
+ * Java class for request-status-type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="request-status-type">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -54,10 +57,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum RequestStatusType {
 
-    COMPLETE,
-    FAILED,
-    IN_PROGRESS,
-    PENDING_MANUAL_TASK;
+    COMPLETE, FAILED, IN_PROGRESS, PENDING_MANUAL_TASK;
 
     public String value() {
         return name();
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ResponseStatus.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ResponseStatus.java
index 5ee7119f35..5ce2a729ec 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ResponseStatus.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/ResponseStatus.java
@@ -22,7 +22,7 @@ package org.onap.so.adapters.requestsdb;
 
 /*
  * Enum for Status values returned by API Handler to Tail-F
-*/
+ */
 public enum ResponseStatus {
-	SENDING_FINAL_NOTIFY, SUCCESS, FAILED, TIMEOUT
-}
\ No newline at end of file
+    SENDING_FINAL_NOTIFY, SUCCESS, FAILED, TIMEOUT
+}
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/WebSecurityConfigImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/WebSecurityConfigImpl.java
index 9f52160c8e..a2c1f135c2 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/WebSecurityConfigImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/WebSecurityConfigImpl.java
@@ -30,22 +30,19 @@ import org.springframework.util.StringUtils;
 
 @EnableWebSecurity
 public class WebSecurityConfigImpl extends WebSecurityConfig {
-	
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
-		http.csrf().disable()
-		.authorizeRequests()
-		.antMatchers("/manage/health","/manage/info").permitAll()
-		.antMatchers("/**").hasAnyRole(StringUtils.collectionToDelimitedString(getRoles(),",").toString())
-		.and()
-		.httpBasic();
-	}
-	
-	@Override
-	public void configure(WebSecurity web) throws Exception {
-		super.configure(web);
-		StrictHttpFirewall firewall = new MSOSpringFirewall();
-		web.httpFirewall(firewall);
-	}
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable().authorizeRequests().antMatchers("/manage/health", "/manage/info").permitAll()
+                .antMatchers("/**").hasAnyRole(StringUtils.collectionToDelimitedString(getRoles(), ",").toString())
+                .and().httpBasic();
+    }
+
+    @Override
+    public void configure(WebSecurity web) throws Exception {
+        super.configure(web);
+        StrictHttpFirewall firewall = new MSOSpringFirewall();
+        web.httpFirewall(firewall);
+    }
 
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java
index 23a769bc21..06d75befd9 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/CXFConfiguration.java
@@ -21,7 +21,6 @@
 package org.onap.so.adapters.requestsdb.application;
 
 import javax.xml.ws.Endpoint;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
@@ -39,43 +38,43 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class CXFConfiguration {
 
-	@Autowired
-	private Bus bus;
+    @Autowired
+    private Bus bus;
+
+    @Autowired
+    private MsoRequestsDbAdapter requestDbAdapterImpl;
+
+    @Bean
+    public ServletRegistrationBean cxfServlet() {
 
-	@Autowired
-	private MsoRequestsDbAdapter requestDbAdapterImpl;
-	
-	@Bean
-	public ServletRegistrationBean cxfServlet() {
-	
-		return new ServletRegistrationBean(new CXFServlet(), "/services/*");
-	}
+        return new ServletRegistrationBean(new CXFServlet(), "/services/*");
+    }
 
-	@Bean
-	public Endpoint requestEndpointk() {
-		EndpointImpl endpoint = new EndpointImpl(bus, requestDbAdapterImpl);
-		endpoint.publish("/RequestsDbAdapter");
-		LoggingFeature logFeature = new LoggingFeature();
-		logFeature.setPrettyLogging(true);
-		logFeature.initialize(bus);
-		endpoint.getFeatures().add(logFeature);
-		endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor());
-		endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor());
-		endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor());
-		return endpoint;
-	}
+    @Bean
+    public Endpoint requestEndpointk() {
+        EndpointImpl endpoint = new EndpointImpl(bus, requestDbAdapterImpl);
+        endpoint.publish("/RequestsDbAdapter");
+        LoggingFeature logFeature = new LoggingFeature();
+        logFeature.setPrettyLogging(true);
+        logFeature.initialize(bus);
+        endpoint.getFeatures().add(logFeature);
+        endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor());
+        endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor());
+        endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor());
+        return endpoint;
+    }
 
-	@Bean
-	public Swagger2Feature createSwaggerFeature() {
-		Swagger2Feature swagger2Feature = new Swagger2Feature();
-		swagger2Feature.setPrettyPrint(true);
-		swagger2Feature.setTitle("SO Request Adapter");
-		swagger2Feature.setContact("The ONAP SO team");
-		swagger2Feature.setDescription("This project is the SO Orchestration Engine");
-		swagger2Feature.setVersion("1.0.0");
-		swagger2Feature.setResourcePackage("org.onap.so.adapters.requestdb");
-		swagger2Feature.setScan(true);
-		return swagger2Feature;
-	}
+    @Bean
+    public Swagger2Feature createSwaggerFeature() {
+        Swagger2Feature swagger2Feature = new Swagger2Feature();
+        swagger2Feature.setPrettyPrint(true);
+        swagger2Feature.setTitle("SO Request Adapter");
+        swagger2Feature.setContact("The ONAP SO team");
+        swagger2Feature.setDescription("This project is the SO Orchestration Engine");
+        swagger2Feature.setVersion("1.0.0");
+        swagger2Feature.setResourcePackage("org.onap.so.adapters.requestdb");
+        swagger2Feature.setScan(true);
+        return swagger2Feature;
+    }
 
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
index 700a371375..6dab6c188c 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
@@ -23,13 +23,10 @@
 package org.onap.so.adapters.requestsdb.application;
 
 import java.time.Duration;
-
 import javax.sql.DataSource;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-
 import net.javacrumbs.shedlock.core.LockProvider;
 import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
 import net.javacrumbs.shedlock.spring.ScheduledLockConfiguration;
@@ -40,35 +37,32 @@ import net.javacrumbs.shedlock.spring.ScheduledLockConfigurationBuilder;
  *
  */
 
-@SpringBootApplication(scanBasePackages = { "org.onap.so"})
+@SpringBootApplication(scanBasePackages = {"org.onap.so"})
 public class MSORequestDBApplication {
 
-	private static final String LOGS_DIR = "logs_dir";
+    private static final String LOGS_DIR = "logs_dir";
+
+    private static void setLogsDir() {
+        if (System.getProperty(LOGS_DIR) == null) {
+            System.getProperties().setProperty(LOGS_DIR, "./logs/reqdb/");
+        }
+    }
 
-	private static void setLogsDir() {
-		if (System.getProperty(LOGS_DIR) == null) {
-			System.getProperties().setProperty(LOGS_DIR, "./logs/reqdb/");
-		}
-	}
+    public static void main(String... args) {
+        SpringApplication.run(MSORequestDBApplication.class, args);
+        setLogsDir();
+    }
 
-	public static void main(String... args) {
-		SpringApplication.run(MSORequestDBApplication.class, args);
-		setLogsDir();
-	}
+    @Bean
+    public LockProvider lockProvider(DataSource dataSource) {
+        return new JdbcTemplateLockProvider(dataSource);
+    }
 
-	@Bean
-	public LockProvider lockProvider(DataSource dataSource) {
-	    return new JdbcTemplateLockProvider(dataSource);
-	}
-	
-	@Bean
-	public ScheduledLockConfiguration taskScheduler(LockProvider lockProvider) {
-	    return ScheduledLockConfigurationBuilder
-	        .withLockProvider(lockProvider)
-	        .withPoolSize(10)
-	        .withDefaultLockAtMostFor(Duration.ofMinutes(10))
-	        .build();
-	}
+    @Bean
+    public ScheduledLockConfiguration taskScheduler(LockProvider lockProvider) {
+        return ScheduledLockConfigurationBuilder.withLockProvider(lockProvider).withPoolSize(10)
+                .withDefaultLockAtMostFor(Duration.ofMinutes(10)).build();
+    }
 
 
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/RequestDBConfig.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/RequestDBConfig.java
index 99fa770974..651cce8543 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/RequestDBConfig.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/RequestDBConfig.java
@@ -23,7 +23,6 @@ package org.onap.so.adapters.requestsdb.application;
 
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
-
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -41,40 +40,30 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @Profile({"!test"})
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(
-		entityManagerFactoryRef = "requestEntityManagerFactory",transactionManagerRef = "requestTransactionManager",
-		basePackages = { "org.onap.so.db.request.data.repository" }
-		)
+@EnableJpaRepositories(entityManagerFactoryRef = "requestEntityManagerFactory",
+        transactionManagerRef = "requestTransactionManager", basePackages = {"org.onap.so.db.request.data.repository"})
 public class RequestDBConfig {
 
-	@Primary
-	@Bean(name = "requestDataSource")
-	@ConfigurationProperties(prefix = "spring.datasource")
-	public DataSource dataSource() {
-		return DataSourceBuilder.create().build();
-	}
+    @Primary
+    @Bean(name = "requestDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().build();
+    }
 
-	@Primary
-	@Bean(name = "requestEntityManagerFactory")
-	public LocalContainerEntityManagerFactoryBean 
-	entityManagerFactory(
-			EntityManagerFactoryBuilder builder,
-			@Qualifier("requestDataSource") DataSource dataSource
-			) {
-		return builder
-				.dataSource(dataSource)
-				.packages("org.onap.so.db.request.beans")
-				.persistenceUnit("requestDB")
-				.build();
-	}
+    @Primary
+    @Bean(name = "requestEntityManagerFactory")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder,
+            @Qualifier("requestDataSource") DataSource dataSource) {
+        return builder.dataSource(dataSource).packages("org.onap.so.db.request.beans").persistenceUnit("requestDB")
+                .build();
+    }
 
-	@Primary
-	@Bean(name = "requestTransactionManager")
-	public PlatformTransactionManager transactionManager(
-			@Qualifier("requestEntityManagerFactory") EntityManagerFactory 
-			entityManagerFactory
-			) {
-		return new JpaTransactionManager(entityManagerFactory);
-	}
+    @Primary
+    @Bean(name = "requestTransactionManager")
+    public PlatformTransactionManager transactionManager(
+            @Qualifier("requestEntityManagerFactory") EntityManagerFactory entityManagerFactory) {
+        return new JpaTransactionManager(entityManagerFactory);
+    }
 
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java
index e932bb2cca..579afe9243 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/WebMvcConfig.java
@@ -36,7 +36,7 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 
     @Bean
     public MappedInterceptor mappedLoggingInterceptor() {
-        return new MappedInterceptor(new String[]{"/**"}, loggingInterceptor);
+        return new MappedInterceptor(new String[] {"/**"}, loggingInterceptor);
     }
 
 }
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbException.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbException.java
index 16a3a7d427..27580977b8 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbException.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbException.java
@@ -27,12 +27,14 @@ import org.onap.so.exceptions.MSOException;
 import org.onap.so.logger.ErrorCode;
 
 /**
- * This class simply extends Exception (without addition additional functionality)
- * to provide an identifier for RequestsDB related exceptions on create, delete, query.
+ * This class simply extends Exception (without addition additional functionality) to provide an identifier for
+ * RequestsDB related exceptions on create, delete, query.
  * 
  *
  */
-@WebFault (name="MsoRequestsDbException", faultBean="org.onap.so.adapters.requestsdb.exceptions.MsoRequestsDbExceptionBean", targetNamespace="http://org.onap.so/requestsdb")
+@WebFault(name = "MsoRequestsDbException",
+        faultBean = "org.onap.so.adapters.requestsdb.exceptions.MsoRequestsDbExceptionBean",
+        targetNamespace = "http://org.onap.so/requestsdb")
 public class MsoRequestsDbException extends MSOException {
 
     private static final long serialVersionUID = 1L;
@@ -40,27 +42,27 @@ public class MsoRequestsDbException extends MSOException {
     private MsoRequestsDbExceptionBean faultInfo;
 
 
-    public MsoRequestsDbException (String msg) {
+    public MsoRequestsDbException(String msg) {
         super(msg);
-        faultInfo = new MsoRequestsDbExceptionBean (msg);
+        faultInfo = new MsoRequestsDbExceptionBean(msg);
     }
 
-    public MsoRequestsDbException (Throwable e) {
+    public MsoRequestsDbException(Throwable e) {
         super(e);
-        faultInfo = new MsoRequestsDbExceptionBean (e.getMessage());
+        faultInfo = new MsoRequestsDbExceptionBean(e.getMessage());
     }
 
-    public MsoRequestsDbException (String msg, Throwable e) {
-        super (msg, e);
-        faultInfo = new MsoRequestsDbExceptionBean (msg);
+    public MsoRequestsDbException(String msg, Throwable e) {
+        super(msg, e);
+        faultInfo = new MsoRequestsDbExceptionBean(msg);
     }
 
     public MsoRequestsDbException(String msg, ErrorCode errorCode) {
-        super(msg,errorCode.getValue());
+        super(msg, errorCode.getValue());
     }
 
     public MsoRequestsDbException(String msg, ErrorCode errorCode, Throwable t) {
-        super(msg,errorCode.getValue(), t);
+        super(msg, errorCode.getValue(), t);
     }
 
     public MsoRequestsDbExceptionBean getFaultInfo() {
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbExceptionBean.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbExceptionBean.java
index c836a6b374..9844662b51 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbExceptionBean.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/exceptions/MsoRequestsDbExceptionBean.java
@@ -32,19 +32,19 @@ public class MsoRequestsDbExceptionBean implements Serializable {
 
     private String message;
 
-	public MsoRequestsDbExceptionBean () {
-		/* Empty constructor */
-	}
+    public MsoRequestsDbExceptionBean() {
+        /* Empty constructor */
+    }
 
-	public MsoRequestsDbExceptionBean (String message) {
-		this.message = message;
-	}
+    public MsoRequestsDbExceptionBean(String message) {
+        this.message = message;
+    }
 
-	public String getMessage() {
-		return message;
-	}
+    public String getMessage() {
+        return message;
+    }
 
-	public void setMessage(String message) {
-		this.message = message;
-	}
+    public void setMessage(String message) {
+        this.message = message;
+    }
 }