Merge "Reorder modifiers"

[so.git] / adapters / mso-requests-db-adapter / src / main / java / org / openecomp / mso / adapters / requestsdb / MsoRequestsDbAdapterImpl.java

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index 0bdead4..3dcf69c 100644 (file)
--- a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -61,6 +61,8 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
                                     String vfModuleId,
                                     String volumeGroupId,
                                     String serviceInstanceName,
+                                    String configurationId,
+                                    String configurationName,
                                     String vfModuleName) throws MsoRequestsDbException {
         MsoLogger.setLogContext (requestId, null);
         Session session = requestsDbSessionFactoryManager.getSessionFactory ().openSession ();
@@ -68,53 +70,59 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
         long startTime = System.currentTimeMillis ();
         try {
                session.beginTransaction ();
-            String queryString = "update InfraActiveRequests set ";
+            StringBuilder queryString = new StringBuilder("update InfraActiveRequests set ");
             if (statusMessage != null) {
-                queryString += "statusMessage = :statusMessage, ";
+                queryString.append("statusMessage = :statusMessage, ");
             }
             if (responseBody != null) {
-                queryString += "responseBody = :responseBody, ";
+                queryString.append("responseBody = :responseBody, ");
             }
             if (requestStatus != null) {
-                queryString += "requestStatus = :requestStatus, ";
+                queryString.append("requestStatus = :requestStatus, ");
             }
             if (progress != null) {
-                queryString += "progress = :progress, ";
+                queryString.append("progress = :progress, ");
             }
             if (vnfOutputs != null) {
-                queryString += "vnfOutputs = :vnfOutputs, ";
+                queryString.append("vnfOutputs = :vnfOutputs, ");
             }
             if (serviceInstanceId != null) {
-                queryString += "serviceInstanceId = :serviceInstanceId, ";
+                queryString.append("serviceInstanceId = :serviceInstanceId, ");
             }
             if (networkId != null) {
-                queryString += "networkId = :networkId, ";
+                queryString.append("networkId = :networkId, ");
             }
             if (vnfId != null) {
-                queryString += "vnfId = :vnfId, ";
+                queryString.append("vnfId = :vnfId, ");
             }
             if (vfModuleId != null) {
-                queryString += "vfModuleId = :vfModuleId, ";
+                queryString.append("vfModuleId = :vfModuleId, ");
             }
             if (volumeGroupId != null) {
-                queryString += "volumeGroupId = :volumeGroupId, ";
+                queryString.append("volumeGroupId = :volumeGroupId, ");
             }
             if (serviceInstanceName != null) {
-                queryString += "serviceInstanceName = :serviceInstanceName, ";
+                queryString.append("serviceInstanceName = :serviceInstanceName, ");
             }
             if (vfModuleName != null) {
-                queryString += "vfModuleName = :vfModuleName, ";
+                queryString.append("vfModuleName = :vfModuleName, ");
+            }
+            if (configurationId != null) {
+                queryString.append("configurationId = :configurationId, ");
+            }
+            if (configurationName != null) {
+                queryString.append("configurationName = :configurationName, ");
             }
             if (requestStatus == RequestStatusType.COMPLETE || requestStatus == RequestStatusType.FAILED) {
-                queryString += "endTime = :endTime, ";
+                queryString.append("endTime = :endTime, ");
             } else {
-                queryString += "modifyTime = :modifyTime, ";
+                queryString.append("modifyTime = :modifyTime, ");
             }
-            queryString += "lastModifiedBy = :lastModifiedBy where requestId = :requestId OR clientRequestId = :requestId";
+            queryString.append("lastModifiedBy = :lastModifiedBy where requestId = :requestId OR clientRequestId = :requestId");
 
-            logger.debug("Executing update: " + queryString);
+            logger.debug("Executing update: " + queryString.toString());
 
-            Query query = session.createQuery (queryString);
+            Query query = session.createQuery (queryString.toString());
             query.setParameter ("requestId", requestId);
             if (statusMessage != null) {
                 query.setParameter ("statusMessage", statusMessage);
@@ -165,6 +173,18 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
                 query.setParameter ("vfModuleName", vfModuleName);
                 logger.debug ("vfModuleName in updateInfraRequest is set to: " + vfModuleName);
             }
+            if (configurationId != null) {
+                query.setParameter ("configurationId", configurationId);
+                logger.debug ("configurationId in updateInfraRequest is set to: " + configurationId);
+            }
+            if (configurationName != null) {
+                query.setParameter ("configurationName", configurationName);
+                logger.debug ("configurationName in updateInfraRequest is set to: " + configurationName);
+            }
+            if (vfModuleName != null) {
+                query.setParameter ("vfModuleName", vfModuleName);
+                logger.debug ("vfModuleName in updateInfraRequest is set to: " + vfModuleName);
+            }
             Timestamp nowTimeStamp = new Timestamp (System.currentTimeMillis ());
             if (requestStatus == RequestStatusType.COMPLETE || requestStatus == RequestStatusType.FAILED) {
                 query.setParameter ("endTime", nowTimeStamp);
@@ -282,17 +302,16 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
      * @since   ONAP Amsterdam Release
      */
     @Override
-    public void updateServiceOperationStatus(String serviceId, String operationId, String serviceName,String operationType, String userId,
+    public void updateServiceOperationStatus(String serviceId, String operationId, String operationType, String userId,
             String result, String operationContent, String progress, String reason) throws MsoRequestsDbException {
         OperationStatus operStatus = new OperationStatus();
-        operStatus.setResult(RequestsDbConstant.Status.PROCESSING);
         operStatus.setServiceId(serviceId);
         operStatus.setOperationId(operationId);
-        operStatus.setServiceName(serviceName);
         operStatus.setUserId(userId);
         operStatus.setOperation(operationType);
         operStatus.setReason(reason);
         operStatus.setProgress(progress);
+        operStatus.setResult(result);
         operStatus.setOperationContent(operationContent);
         RequestsDatabase.getInstance().updateOperationStatus(operStatus);
     }
@@ -313,6 +332,9 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
             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);
@@ -330,7 +352,7 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
      * 
      * @param serviceId
      * @param operationId
-     * @param resourceUUID
+     * @param resourceTemplateUUID
      * @return
      * @throws MsoRequestsDbException
      * @since   ONAP Amsterdam Release
@@ -347,7 +369,7 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
      * 
      * @param serviceId
      * @param operationId
-     * @param resourceUUID
+     * @param resourceTemplateUUID
      * @param operationType
      * @param resourceInstanceID
      * @param jobId
@@ -360,13 +382,13 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
      */
     @Override
     public void updateResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID,
-            String operType, String resourceInstanceID, String jobId, String status, String progress,
+            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(operType);
+         resStatus.setOperType(operationType);
          resStatus.setResourceInstanceID(resourceInstanceID);
          resStatus.setJobId(jobId);
          resStatus.setStatus(status);