Fix String concatenation optimzation

Replaced queryString from String to StringBuffer for memory and GC optimization

Change-Id: I0e4656d1fdf8ff773704e788a3b59b3f910ae3ba
Issue-ID: SO-500
Signed-off-by: byungwoojun<byung-woo.jun@ericsson.com>

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 358fe53..925086a 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
@@ -70,59 +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 += "configurationId = :configurationId, ";
+                queryString.append("configurationId = :configurationId, ");
             }
             if (configurationName != null) {
-                queryString += "configurationName = :configurationName, ";
+                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);

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java
index 109da17..2443169 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java
@@ -51,7 +51,7 @@ public class MsoRequestsDbAdapterClient implements MsoRequestsDbAdapter {
                        MsoLogger.setLogContext(request.getRequestId(), null);\r
                        try {\r
                                session.beginTransaction();\r
-                               String queryString = "update InfraActiveRequests set ";\r
+                               StringBuilder queryString = new StringBuilder("update InfraActiveRequests set ");\r
                                String statusMessage = null;\r
                                String responseBody = null;\r
                                RequestStatusType requestStatus = null;\r
@@ -67,72 +67,72 @@ public class MsoRequestsDbAdapterClient implements MsoRequestsDbAdapter {
                                String configurationId = null;\r
                                String configurationName = null;\r
                                if (request.getStatusMessage() != null) {\r
-                                       queryString += "statusMessage = :statusMessage, ";\r
+                                       queryString.append("statusMessage = :statusMessage, ");\r
                                        statusMessage = request.getStatusMessage();\r
                                }\r
                                if (request.getResponseBody() != null) {\r
-                                       queryString += "responseBody = :responseBody, ";\r
+                                       queryString.append("responseBody = :responseBody, ");\r
                                        responseBody = request.getResponseBody();\r
                                }\r
                                if (request.getRequestStatus() != null) {\r
-                                       queryString += "requestStatus = :requestStatus, ";\r
+                                       queryString.append("requestStatus = :requestStatus, ");\r
                                        requestStatus = request.getRequestStatus();\r
                                }\r
                                if (request.getProgress() != null) {\r
-                                       queryString += "progress = :progress, ";\r
+                                       queryString.append("progress = :progress, ");\r
                                        progress = request.getProgress();\r
                                }\r
                                if (request.getVnfOutputs() != null) {\r
-                                       queryString += "vnfOutputs = :vnfOutputs, ";\r
+                                       queryString.append("vnfOutputs = :vnfOutputs, ");\r
                                        vnfOutputs = request.getVnfOutputs();\r
                                }\r
                                if (request.getServiceInstanceId() != null) {\r
-                                       queryString += "serviceInstanceId = :serviceInstanceId, ";\r
+                                       queryString.append("serviceInstanceId = :serviceInstanceId, ");\r
                                        serviceInstanceId = request.getServiceInstanceId();\r
                                }\r
                                if (request.getNetworkId() != null) {\r
-                                       queryString += "networkId = :networkId, ";\r
+                                       queryString.append("networkId = :networkId, ");\r
                                        networkId = request.getNetworkId();\r
                                }\r
                                if (request.getVnfId() != null) {\r
-                                       queryString += "vnfId = :vnfId, ";\r
+                                       queryString.append("vnfId = :vnfId, ");\r
                                        vnfId = request.getVnfId();\r
                                }\r
                                if (request.getVfModuleId() != null) {\r
-                                       queryString += "vfModuleId = :vfModuleId, ";\r
+                                       queryString.append("vfModuleId = :vfModuleId, ");\r
                                        vfModuleId = request.getVfModuleId();\r
                                }\r
                                if (request.getVolumeGroupId() != null) {\r
-                                       queryString += "volumeGroupId = :volumeGroupId, ";\r
+                                       queryString.append("volumeGroupId = :volumeGroupId, ");\r
                                        volumeGroupId = request.getVolumeGroupId();\r
                                }\r
                                if (request.getServiceInstanceName() != null) {\r
-                                       queryString += "serviceInstanceName = :serviceInstanceName, ";\r
+                                       queryString.append("serviceInstanceName = :serviceInstanceName, ");\r
                                        serviceInstanceName = request.getServiceInstanceName();\r
                                }\r
                                if (request.getVfModuleName() != null) {\r
-                                       queryString += "vfModuleName = :vfModuleName, ";\r
+                                       queryString.append("vfModuleName = :vfModuleName, ");\r
                                        vfModuleName = request.getVfModuleName();\r
                                }\r
                                if (request.getConfigurationId() != null) {\r
-                                       queryString += "configurationId = :configurationId, ";\r
+                                       queryString.append("configurationId = :configurationId, ");\r
                                        configurationId = request.getConfigurationId();\r
                                }\r
                                if (request.getConfigurationName() != null) {\r
-                                       queryString += "configurationName = :configurationName, ";\r
+                                       queryString.append("configurationName = :configurationName, ");\r
                                        configurationName = request.getConfigurationName();\r
                                }\r
                                if (request.getRequestStatus() == RequestStatusType.COMPLETE\r
                                                || request.getRequestStatus() == RequestStatusType.FAILED) {\r
-                                       queryString += "endTime = :endTime, ";\r
+                                       queryString.append("endTime = :endTime, ");\r
                                } else {\r
-                                       queryString += "modifyTime = :modifyTime, ";\r
+                                       queryString.append("modifyTime = :modifyTime, ");\r
                                }\r
-                               queryString += "lastModifiedBy = :lastModifiedBy where requestId = :requestId OR clientRequestId = :requestId";\r
+                               queryString.append("lastModifiedBy = :lastModifiedBy where requestId = :requestId OR clientRequestId = :requestId");\r
 \r
-                               LOGGER.debug("Executing update: " + queryString);\r
+                               LOGGER.debug("Executing update: " + queryString.toString());\r
 \r
-                               Query query = session.createQuery(queryString);\r
+                               Query query = session.createQuery(queryString.toString());\r
                                query.setParameter("requestId", request.getRequestId());\r
                                if (statusMessage != null) {\r
                                        query.setParameter("statusMessage", statusMessage);\r