sonar fixes

Author: aktaskaan

src/main/java/uk/gov/hmcts/ccd/domain/service/common/RestrictedFieldProcessor.java

@@ -28,6 +28,7 @@
 public class RestrictedFieldProcessor {
 
     private static final String VALUE = "value";
+    private static final String ID = "id";
 
     private final CaseAccessService caseAccessService;
 
@@ -124,52 +125,87 @@ private JsonNode processCollectionFields(CaseFieldDefinition subFieldDefinition,
                                              JsonNode sanitizedArrayNode,
                                              JsonNode existingArrayNode,
                                              Set<String> accessProfileNames) {
+        ArrayNode sanitizedArray = initializeSanitizedArray(sanitizedArrayNode);
+        ArrayNode existingArray = (ArrayNode) existingArrayNode;
+
+        for (JsonNode existingItem : existingArray) {
+            processExistingItem(subFieldDefinition, sanitizedArray, existingItem, accessProfileNames);
+        }
+
+        return sanitizedArray;
+    }
 
-        ArrayNode sanitizedArray = sanitizedArrayNode != null && sanitizedArrayNode.isArray()
+    private ArrayNode initializeSanitizedArray(JsonNode sanitizedArrayNode) {
+        return sanitizedArrayNode != null && sanitizedArrayNode.isArray()
             ? (ArrayNode) sanitizedArrayNode.deepCopy()
             : JsonNodeFactory.instance.arrayNode();
+    }
 
-        ArrayNode existingArray = (ArrayNode) existingArrayNode;
+    private void processExistingItem(CaseFieldDefinition subFieldDefinition,
+                                     ArrayNode sanitizedArray,
+                                     JsonNode existingItem,
+                                     Set<String> accessProfileNames) {
+        JsonNode existingItemId = existingItem.get(ID);
 
-        for (JsonNode existingItem : existingArray) {
-            JsonNode existingItemId = existingItem.get("id");
+        Optional<JsonNode> matchingNewItem = findMatchingNewItem(sanitizedArray, existingItemId);
+
+        if (matchingNewItem.isEmpty()) {
+            handleMissingItem(subFieldDefinition, sanitizedArray, existingItem, accessProfileNames, existingItemId);
+        } else {
+            processMatchingItem(subFieldDefinition, matchingNewItem.get(), existingItem, accessProfileNames);
+        }
+    }
 
-            Optional<JsonNode> matchingNewItem = StreamSupport.stream(sanitizedArray.spliterator(), false)
-                .filter(newItem -> !isNullId(newItem) && newItem.get("id").equals(existingItemId))
-                .findFirst();
+    private Optional<JsonNode> findMatchingNewItem(ArrayNode sanitizedArray, JsonNode existingItemId) {
+        return StreamSupport.stream(sanitizedArray.spliterator(), false)
+            .filter(newItem -> !isNullId(newItem) && newItem.get(ID).equals(existingItemId))
+            .findFirst();
+    }
 
-            if (matchingNewItem.isEmpty()) {
-                log.debug("Missing collection item with ID '{}' under '{}'.", existingItemId,
-                    subFieldDefinition.getId());
+    private void handleMissingItem(CaseFieldDefinition subFieldDefinition,
+                                   ArrayNode sanitizedArray,
+                                   JsonNode existingItem,
+                                   Set<String> accessProfileNames,
+                                   JsonNode existingItemId) {
+        log.debug("Missing collection item with ID '{}' under '{}'.", existingItemId,
+            subFieldDefinition.getId());
+
+        if (isCreateWithoutReadAllowed(subFieldDefinition.getAccessControlLists(), accessProfileNames)) {
+            log.info("Adding missing collection item with ID '{}' under '{}'.", existingItemId,
+                subFieldDefinition.getId());
+            sanitizedArray.add(existingItem);
+        }
+    }
 
-                if (isCreateWithoutReadAllowed(subFieldDefinition.getAccessControlLists(), accessProfileNames)) {
-                    log.info("Adding missing collection item with ID '{}' under '{}'.", existingItemId,
-                        subFieldDefinition.getId());
-                    sanitizedArray.add(existingItem);
-                }
-            } else {
-                JsonNode newValueField = matchingNewItem.get().get(VALUE);
-                JsonNode existingValueField = existingItem.get(VALUE);
-
-                if (existingValueField != null) {
-                    JsonNode processedValueField;
-
-                    if (existingValueField.isObject()) {
-                        processedValueField = processSubFieldsRecursively(subFieldDefinition,
-                            newValueField,
-                            existingValueField,
-                            accessProfileNames);
-                    } else {
-                        processedValueField = processSimpleValueField(
-                            subFieldDefinition, newValueField, existingValueField, accessProfileNames);
-                    }
-
-                    ((ObjectNode) matchingNewItem.get()).set(VALUE, processedValueField);
-                }
-            }
+    private void processMatchingItem(CaseFieldDefinition subFieldDefinition,
+                                     JsonNode matchingNewItem,
+                                     JsonNode existingItem,
+                                     Set<String> accessProfileNames) {
+        JsonNode newValueField = matchingNewItem.get(VALUE);
+        JsonNode existingValueField = existingItem.get(VALUE);
+
+        if (existingValueField != null) {
+            JsonNode processedValueField = processValueField(subFieldDefinition, newValueField, existingValueField,
+                accessProfileNames);
+            ((ObjectNode) matchingNewItem).set(VALUE, processedValueField);
         }
+    }
 
-        return sanitizedArray;
+    private JsonNode processValueField(CaseFieldDefinition subFieldDefinition,
+                                       JsonNode newValueField,
+                                       JsonNode existingValueField,
+                                       Set<String> accessProfileNames) {
+        if (existingValueField.isObject()) {
+            return processSubFieldsRecursively(subFieldDefinition,
+                newValueField,
+                existingValueField,
+                accessProfileNames);
+        } else {
+            return processSimpleValueField(subFieldDefinition,
+                newValueField,
+                existingValueField,
+                accessProfileNames);
+        }
     }
 
     private JsonNode processSimpleValueField(CaseFieldDefinition subFieldDefinition, JsonNode newValueField,
@@ -188,9 +224,9 @@ private JsonNode processSimpleValueField(CaseFieldDefinition subFieldDefinition,
     }
 
     private boolean isNullId(JsonNode newItem) {
-        return newItem.get("id") == null
-            || newItem.get("id").equals(NullNode.getInstance())
-            || "null".equalsIgnoreCase(newItem.get("id").asText());
+        return newItem.get(ID) == null
+            || newItem.get(ID).equals(NullNode.getInstance())
+            || "null".equalsIgnoreCase(newItem.get(ID).asText());
     }
 
     private boolean isCreateWithoutReadAllowed(List<AccessControlList> fieldAccessControlLists,