[MODEXPW-529] Fix sonar issues

folio-org · Dec 13, 2024 · ff8bbab · ff8bbab
1 parent eb25f26
commit ff8bbab
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 37 deletions.
diff --git a/src/main/java/org/folio/dew/batch/acquisitions/edifact/mapper/EdifactMapper.java b/src/main/java/org/folio/dew/batch/acquisitions/edifact/mapper/EdifactMapper.java
@@ -32,34 +32,33 @@ public String convertForExport(List<CompositePurchaseOrder> compPOs, List<Piece>
     EDIOutputFactory factory = EDIOutputFactory.newFactory();
     factory.setProperty(EDIOutputFactory.PRETTY_PRINT, true);
 
-    EDIStreamWriter writer = factory.createEDIStreamWriter(stream);
-
-    // Count of messages (one message per purchase order)
-    int messageCount = 0;
-    writer.startInterchange();
-    writeStartFile(writer);
-
-    EdiFileConfig ediFileConfig = new EdiFileConfig();
-    ediFileConfig.setFileId(StringUtils.right(jobName, 14));
-    ediFileConfig.setLibEdiCode(ediExportConfig.getEdiConfig().getLibEdiCode());
-    ediFileConfig.setLibEdiType(ediExportConfig.getEdiConfig().getLibEdiType().getValue().substring(0, 3));
-    ediFileConfig.setVendorEdiCode(ediExportConfig.getEdiConfig().getVendorEdiCode());
-    ediFileConfig.setVendorEdiType(ediExportConfig.getEdiConfig().getVendorEdiType().getValue().substring(0, 3));
-
-    writeInterchangeHeader(writer, ediFileConfig);
-
-    var poLineIdToPieces = pieces.stream().collect(groupingBy(Piece::getPoLineId));
-    // Purchase orders
-    for (CompositePurchaseOrder compPO : compPOs) {
-      compOrderEdiConverter.convertPOtoEdifact(writer, compPO, poLineIdToPieces, ediFileConfig);
-      messageCount++;
+    try (EDIStreamWriter writer = factory.createEDIStreamWriter(stream)) {
+      // Count of messages (one message per purchase order)
+      int messageCount = 0;
+      writer.startInterchange();
+      writeStartFile(writer);
+
+      EdiFileConfig ediFileConfig = new EdiFileConfig();
+      ediFileConfig.setFileId(StringUtils.right(jobName, 14));
+      ediFileConfig.setLibEdiCode(ediExportConfig.getEdiConfig().getLibEdiCode());
+      ediFileConfig.setLibEdiType(ediExportConfig.getEdiConfig().getLibEdiType().getValue().substring(0, 3));
+      ediFileConfig.setVendorEdiCode(ediExportConfig.getEdiConfig().getVendorEdiCode());
+      ediFileConfig.setVendorEdiType(ediExportConfig.getEdiConfig().getVendorEdiType().getValue().substring(0, 3));
+
+      writeInterchangeHeader(writer, ediFileConfig);
+
+      var poLineIdToPieces = pieces.stream().collect(groupingBy(Piece::getPoLineId));
+      // Purchase orders
+      for (CompositePurchaseOrder compPO : compPOs) {
+        compOrderEdiConverter.convertPOtoEdifact(writer, compPO, poLineIdToPieces, ediFileConfig);
+        messageCount++;
+      }
+
+      writeInterchangeFooter(writer, ediFileConfig.getFileId(), messageCount);
+      writer.endInterchange();
+      return stream.toString();
     }
 
-    writeInterchangeFooter(writer, ediFileConfig.getFileId(), messageCount);
-    writer.endInterchange();
-    writer.close();
-
-    return stream.toString();
   }
 
   // Start of file - Can contain multiple order messages

diff --git a/.../java/org/folio/dew/batch/acquisitions/edifact/mapper/converter/AbstractCsvConverter.java b/.../java/org/folio/dew/batch/acquisitions/edifact/mapper/converter/AbstractCsvConverter.java
@@ -13,11 +13,11 @@ public abstract class AbstractCsvConverter<T> {
   private final DelimitedLineAggregator<String> lineAggregator;
   private final String delimiter;
 
-  public AbstractCsvConverter() {
+  protected AbstractCsvConverter() {
     this(COMMA);
   }
 
-  public AbstractCsvConverter(String delimiter) {
+  protected AbstractCsvConverter(String delimiter) {
     this.delimiter = delimiter;
     this.lineAggregator = new DelimitedLineAggregator<>();
     lineAggregator.setDelimiter(delimiter);

diff --git a/src/main/java/org/folio/dew/batch/acquisitions/edifact/mapper/converter/ClaimCsvFields.java b/src/main/java/org/folio/dew/batch/acquisitions/edifact/mapper/converter/ClaimCsvFields.java
@@ -15,14 +15,14 @@
 @AllArgsConstructor
 public enum ClaimCsvFields implements ExtractableField<Pair<CompositePoLine, Piece>, String> {
 
-  POL_NUMBER("POL number", (pair) -> pair.getKey().getPoLineNumber()),
-  ORDER_NUMBER("Vendor order number", (pair) -> getVendorOrderNumber(pair.getKey())),
-  ACCOUNT_NUMBER("Account number", (pair) -> getVendorAccountNumber(pair.getKey())),
-  TITLE("Title from piece", (pair) -> "CHANGEME"), // FIXME: piece.titleId | poLine.titleOrPackage | title from inventory by piece.titleId
-  DISPLAY_SUMMARY("Display summary", (pair) -> pair.getValue().getDisplaySummary()),
-  CHRONOLOGY("Chronology", (pair) -> pair.getValue().getChronology()),
-  ENUMERATION("Enumeration", (pair) -> pair.getValue().getEnumeration()),
-  QUANTITY("Quantity", (pair) -> "CHANGEME"); // FIXME: implement quantity extraction
+  POL_NUMBER("POL number", pair -> pair.getKey().getPoLineNumber()),
+  ORDER_NUMBER("Vendor order number", pair -> getVendorOrderNumber(pair.getKey())),
+  ACCOUNT_NUMBER("Account number", pair -> getVendorAccountNumber(pair.getKey())),
+  TITLE("Title from piece", pair -> "CHANGEME"), // FIXME: piece.titleId | poLine.titleOrPackage | title from inventory by piece.titleId
+  DISPLAY_SUMMARY("Display summary", pair -> pair.getValue().getDisplaySummary()),
+  CHRONOLOGY("Chronology", pair -> pair.getValue().getChronology()),
+  ENUMERATION("Enumeration", pair -> pair.getValue().getEnumeration()),
+  QUANTITY("Quantity", pair -> "CHANGEME"); // FIXME: implement quantity extraction
 
   @Getter
   private final String name;

diff --git a/src/test/java/org/folio/dew/batch/acquisitions/edifact/services/HoldingServiceTest.java b/src/test/java/org/folio/dew/batch/acquisitions/edifact/services/HoldingServiceTest.java
@@ -43,7 +43,7 @@ void getInstanceIdByHoldingShouldReturnCorrectInstanceId() throws JsonProcessing
   }
 
   @Test
-  void getInstanceIdByHoldingShouldReturnCorrectEmptyStringWhenNull() throws JsonProcessingException {
+  void getInstanceIdByHoldingShouldReturnCorrectEmptyStringWhenNull() {
     String actual = holdingService.getInstanceIdByHolding(null);
     assertTrue(actual.isEmpty());
   }