From cadcd08d5ea7ab0ff602b0c19ac548cd7182deab Mon Sep 17 00:00:00 2001 From: Roman_Chernetskyi Date: Mon, 24 Jun 2024 15:14:40 +0300 Subject: [PATCH] Fix sonar issues --- src/main/java/org/folio/inventory/resources/MoveApi.java | 3 ++- .../folio/inventory/validation/UpdateOwnershipValidator.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/folio/inventory/resources/MoveApi.java b/src/main/java/org/folio/inventory/resources/MoveApi.java index 3c0cc2687..68990f155 100644 --- 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 updateInstanceIdForHoldings(String toInstanceId, List 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 index c51dfd5bc..bd5afdb55 100644 --- 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 updateOwnershipHasRequiredFields(String List 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)); } }