Fix sonar issues

folio-org · Oct 9, 2024 · c811e65 · c811e65
1 parent 167b7bb
commit c811e65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 deletions.
diff --git a/src/main/java/org/folio/inventory/dataimport/util/AdditionalFieldsUtil.java b/src/main/java/org/folio/inventory/dataimport/util/AdditionalFieldsUtil.java
@@ -28,7 +28,6 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
 import java.util.regex.Matcher;
@@ -353,14 +352,16 @@ private static void recalculateLeaderAndParsedRecord(Record recordForUpdate) {
       MarcJsonWriter jsonWriter = new MarcJsonWriter(os);
       org.marc4j.marc.Record marcRecord = computeMarcRecord(recordForUpdate);
 
-      // use stream writer to recalculate leader
-      streamWriter.write(marcRecord);
-      jsonWriter.write(marcRecord);
-
-      String parsedContentString = new JsonObject(os.toString()).encode();
-      // save parsed content string to cache then set it on the record
-      parsedRecordContentCache.put(parsedContentString, marcRecord);
-      recordForUpdate.setParsedRecord(recordForUpdate.getParsedRecord().withContent(parsedContentString));
+      if (marcRecord != null) {
+        // use stream writer to recalculate leader
+        streamWriter.write(marcRecord);
+        jsonWriter.write(marcRecord);
+
+        String parsedContentString = new JsonObject(os.toString()).encode();
+        // save parsed content string to cache then set it on the record
+        parsedRecordContentCache.put(parsedContentString, marcRecord);
+        recordForUpdate.setParsedRecord(recordForUpdate.getParsedRecord().withContent(parsedContentString));
+      }
     } catch (Exception e) {
       LOGGER.warn("recalculateLeaderAndParsedRecord:: Failed to recalculate leader and parsed record for record: {}", recordForUpdate.getId(), e);
     }
@@ -590,21 +591,6 @@ private static boolean removeFirstFoundFieldByName(org.marc4j.marc.Record marcRe
     return isFieldFound;
   }
 
-  private static void replaceOclc035FieldWithNormalizedData(org.marc4j.marc.Record marcRecord,
-                                              DataField dataField) {
-    var variableFields = marcRecord.getVariableFields(TAG_035);
-    int[] index = {0};
-    if (!variableFields.isEmpty()) {
-      variableFields.stream()
-        .filter(variableField -> variableField.find(OCLC))
-        .forEach(variableField -> {
-          index[0] = (marcRecord.getDataFields().indexOf(variableField));
-          marcRecord.removeVariableField(variableField);
-        });
-      marcRecord.getDataFields().add(index[0], dataField);
-    }
-  }
-
   /**
    * Checks if the field contains a certain value in the selected subfield
    *

diff --git a/src/test/java/org/folio/inventory/dataimport/util/AdditionalFieldsUtilTest.java b/src/test/java/org/folio/inventory/dataimport/util/AdditionalFieldsUtilTest.java
@@ -3,7 +3,6 @@
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.TAG_001;
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.TAG_005;
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.TAG_035;
-import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.TAG_035_SUB;
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.TAG_999;
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.addControlledFieldToMarcRecord;
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.addDataFieldToMarcRecord;