From 5b17ffb73bdbf1fdd6e41b287013af7d1e4a7e62 Mon Sep 17 00:00:00 2001 From: Munir Ahmad Date: Sat, 24 Feb 2018 13:38:07 -0500 Subject: Replace StringBuilder with String & inline return Resolved merge conflicts Change-Id: I1a8c8b6fd801c1eb7719ea3d17f029972e2ba84f Issue-ID: SO-437 Signed-off-by: Munir Ahmad --- .../openecomp/mso/bpmn/core/WorkflowException.java | 22 +++++++--------------- .../mso/bpmn/core/domain/ServiceDecomposition.java | 11 ++++------- 2 files changed, 11 insertions(+), 22 deletions(-) (limited to 'bpmn/MSOCoreBPMN/src/main') diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/WorkflowException.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/WorkflowException.java index 21653e26c3..b555563936 100644 --- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/WorkflowException.java +++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/WorkflowException.java @@ -31,7 +31,7 @@ public class WorkflowException implements Serializable { private final String processKey; private final int errorCode; private final String errorMessage; - + /** * Constructor * @param processKey the process key for the process that generated the exception @@ -44,42 +44,34 @@ public class WorkflowException implements Serializable { this.errorCode = errorCode; this.errorMessage = errorMessage; } - + /** * Returns the process key. */ public String getProcessKey() { return processKey; } - + /** * Returns the error code. */ public int getErrorCode() { return errorCode; } - + /** * Returns the error message. */ public String getErrorMessage() { return errorMessage; } - + /** * Returns a string representation of this object. */ @Override public String toString() { - StringBuilder out = new StringBuilder(); - out.append(getClass().getSimpleName()); - out.append("[processKey="); - out.append(getProcessKey()); - out.append(",errorCode="); - out.append(getErrorCode()); - out.append(",errorMessage="); - out.append(getErrorMessage()); - out.append("]"); - return out.toString(); + return getClass().getSimpleName() + "[processKey=" + getProcessKey() + ",errorCode=" + getErrorCode() + + ",errorMessage=" + getErrorMessage() + "]"; } } diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java index c81e96dccb..58377fcc8f 100644 --- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java +++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java @@ -146,15 +146,12 @@ public class ServiceDecomposition extends JsonWrapper implements Serializable { /** * This method returns String representation of one combined list of Resources of All Types - * @return */ @JsonIgnore - public String getServiceResourcesJsonString(){ - StringBuilder serviceResourcesJsonStringBuffer = new StringBuilder(); - serviceResourcesJsonStringBuffer.append(listToJson((this.getServiceNetworks()))); - serviceResourcesJsonStringBuffer.append(listToJson((this.getServiceVnfs()))); - serviceResourcesJsonStringBuffer.append(listToJson((this.getServiceAllottedResources()))); - return serviceResourcesJsonStringBuffer.toString(); + public String getServiceResourcesJsonString() { + return listToJson((this.getServiceNetworks())) + + listToJson((this.getServiceVnfs())) + + listToJson((this.getServiceAllottedResources())); } /** -- cgit 1.2.3-korg