OperationResult#computeStatusComposite: fixed message concat in loop

Evolveum · Sep 2, 2020 · f1b45c1 · f1b45c1
1 parent 6066c29
commit f1b45c1
Showing 1 changed file with 18 additions and 30 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
@@ -820,6 +820,7 @@ public void computeStatusComposite() {
         boolean hasHandledError = false;
         boolean hasError = false;
         boolean hasWarning = false;
+        StringJoiner operationMessageJoiner = new StringJoiner(", ");
         for (OperationResult sub : getSubresults()) {
             if (sub.getStatus() != OperationResultStatus.NOT_APPLICABLE) {
                 allNotApplicable = false;
@@ -829,48 +830,31 @@ public void computeStatusComposite() {
             }
             if (sub.getStatus() == OperationResultStatus.FATAL_ERROR) {
                 hasError = true;
-                if (message == null) {
-                    message = sub.getMessage();
-                } else {
-                    message = message + ", " + sub.getMessage();
-                }
+                operationMessageJoiner.add(sub.getMessage());
             }
             if (sub.getStatus() == OperationResultStatus.PARTIAL_ERROR) {
                 hasError = true;
-                if (message == null) {
-                    message = sub.getMessage();
-                } else {
-                    message = message + ", " + sub.getMessage();
-                }
+                operationMessageJoiner.add(sub.getMessage());
             }
             if (sub.getStatus() == OperationResultStatus.HANDLED_ERROR) {
                 hasHandledError = true;
-                if (message == null) {
-                    message = sub.getMessage();
-                } else {
-                    message = message + ", " + sub.getMessage();
-                }
+                operationMessageJoiner.add(sub.getMessage());
             }
             if (sub.getStatus() == OperationResultStatus.IN_PROGRESS) {
                 hasInProgress = true;
-                if (message == null) {
-                    message = sub.getMessage();
-                } else {
-                    message = message + ", " + sub.getMessage();
-                }
+                operationMessageJoiner.add(sub.getMessage());
                 if (asynchronousOperationReference == null) {
                     asynchronousOperationReference = sub.getAsynchronousOperationReference();
                 }
             }
             if (sub.getStatus() == OperationResultStatus.WARNING) {
                 hasWarning = true;
-                if (message == null) {
-                    message = sub.getMessage();
-                } else {
-                    message = message + ", " + sub.getMessage();
-                }
+                operationMessageJoiner.add(sub.getMessage());
             }
         }
+        if (operationMessageJoiner.length() > 0) {
+            message = operationMessageJoiner.toString();
+        }
 
         if (allNotApplicable) {
             status = OperationResultStatus.NOT_APPLICABLE;
@@ -2161,13 +2145,16 @@ private OperationStatusKey(String operation, OperationResultStatus status) {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) { return true; }
-            if (o == null || getClass() != o.getClass()) { return false; }
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
 
             OperationStatusKey that = (OperationStatusKey) o;
-
-            if (operation != null ? !operation.equals(that.operation) : that.operation != null) { return false; }
-            return status == that.status;
+            return Objects.equals(operation, that.operation)
+                    && status == that.status;
         }
 
         @Override
@@ -2184,6 +2171,7 @@ private static class OperationStatusCounter {
         private int hiddenCount;        // how many entries will be hidden (after this wave of stripping)
     }
 
+    @SuppressWarnings("MethodDoesntCallSuperMethod")
     public OperationResult clone() {
         return clone(null, true);
     }