Fix sonar issues

folio-org · Jun 24, 2024 · cadcd08 · cadcd08
1 parent a190ced
commit cadcd08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/folio/inventory/resources/MoveApi.java b/src/main/java/org/folio/inventory/resources/MoveApi.java
@@ -168,8 +168,9 @@ private void updateItems(RoutingContext routingContext, WebContext context, List
   }
 
   private List<HoldingsRecord> updateInstanceIdForHoldings(String toInstanceId, List<JsonObject> jsons) {
+    jsons.forEach(MoveApiUtil::removeExtraRedundantFields);
+
     return jsons.stream()
-      .peek(MoveApiUtil::removeExtraRedundantFields)
       .map(json -> json.mapTo(HoldingsRecord.class))
       .map(holding -> holding.withInstanceId(toInstanceId))
       .collect(toList());

diff --git a/src/main/java/org/folio/inventory/validation/UpdateOwnershipValidator.java b/src/main/java/org/folio/inventory/validation/UpdateOwnershipValidator.java
@@ -18,7 +18,7 @@ public static Optional<ValidationError> updateOwnershipHasRequiredFields(String
     List<String> requiredFields = Arrays.stream(updateOwnershipClass.getDeclaredFields()).map(Field::getName).toList();
     for (String field: requiredFields) {
       var value = updateOwnershipRequest.getValue(field);
-      if (value == null || (value instanceof JsonArray && ((JsonArray) value).isEmpty())) {
+      if (value == null || (value instanceof JsonArray jsonArray && jsonArray.isEmpty())) {
         return Optional.of(new ValidationError(field + " is a required field", field, null));
       }
     }