From da6394bb5c0e968c136235ac99755d83e5c38bf2 Mon Sep 17 00:00:00 2001 From: Arved Solth Date: Wed, 29 Jan 2025 09:24:20 +0100 Subject: [PATCH] Replace 'Arrays.asList' for single element lists --- .../src/main/java/org/kitodo/docket/ExportXmlLog.java | 3 +-- .../LegacyInnerPhysicalDocStructHelper.java | 6 +++--- .../legacytypeimplementations/LegacyPrefsHelper.java | 2 +- .../production/services/command/KitodoScriptService.java | 2 +- .../org/kitodo/production/services/data/TaskService.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Kitodo-Docket/src/main/java/org/kitodo/docket/ExportXmlLog.java b/Kitodo-Docket/src/main/java/org/kitodo/docket/ExportXmlLog.java index 54cd1fbd75c..619ffec36a4 100644 --- a/Kitodo-Docket/src/main/java/org/kitodo/docket/ExportXmlLog.java +++ b/Kitodo-Docket/src/main/java/org/kitodo/docket/ExportXmlLog.java @@ -17,7 +17,6 @@ import java.io.OutputStream; import java.io.UncheckedIOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -90,7 +89,7 @@ public class ExportXmlLog implements Consumer { * docket data */ ExportXmlLog(DocketData docketData) { - this.docketData = Arrays.asList(docketData); + this.docketData = Collections.singletonList(docketData); } @Override diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyInnerPhysicalDocStructHelper.java b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyInnerPhysicalDocStructHelper.java index 5a6dce1eadd..ece2c9c01d6 100644 --- a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyInnerPhysicalDocStructHelper.java +++ b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyInnerPhysicalDocStructHelper.java @@ -92,12 +92,12 @@ public List getAllMetadata() { public List getAllMetadataByType(LegacyMetadataTypeHelper metadataType) { if (metadataType == LegacyMetadataTypeHelper.SPECIAL_TYPE_ORDER) { return Objects.nonNull(physicalDivision) - ? Arrays.asList( - new LegacyMetadataHelper(this, metadataType, Integer.toString(physicalDivision.getOrder()))) + ? List.of( + new LegacyMetadataHelper(this, metadataType, Integer.toString(physicalDivision.getOrder()))) : Collections.emptyList(); } else if (metadataType == LegacyMetadataTypeHelper.SPECIAL_TYPE_ORDERLABEL) { return Objects.nonNull(physicalDivision) && Objects.nonNull(physicalDivision.getOrderlabel()) - ? Arrays.asList(new LegacyMetadataHelper(this, metadataType, physicalDivision.getOrderlabel())) + ? List.of(new LegacyMetadataHelper(this, metadataType, physicalDivision.getOrderlabel())) : Collections.emptyList(); } else { throw new UnsupportedOperationException("Not yet implemented"); diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java index 14cf27a06f2..4aa2a6350f1 100644 --- a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java +++ b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java @@ -98,7 +98,7 @@ public LegacyMetadataTypeHelper getMetadataTypeByName(String identifier) { StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("", "edit", priorityList); List entryViews = divisionView - .getSortedVisibleMetadata(Collections.emptyList(), Arrays.asList(identifier)); + .getSortedVisibleMetadata(Collections.emptyList(), List.of(identifier)); MetadataViewInterface resultKeyView = entryViews.parallelStream() .map(MetadataViewWithValuesInterface::getMetadata).filter(Optional::isPresent).map(Optional::get) .filter(keyView -> keyView.getId().equals(identifier)).findFirst() diff --git a/Kitodo/src/main/java/org/kitodo/production/services/command/KitodoScriptService.java b/Kitodo/src/main/java/org/kitodo/production/services/command/KitodoScriptService.java index 7382572e74a..9c9e687a0b7 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/command/KitodoScriptService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/command/KitodoScriptService.java @@ -216,7 +216,7 @@ private boolean executeRemainingScript(List processes) switch (this.parameters.get("action")) { case "generateImages": String folders = parameters.get("folders"); - List foldersList = Arrays.asList("all"); + List foldersList = List.of("all"); if (Objects.nonNull(folders)) { foldersList = Arrays.asList(folders.split(",")); } diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java index 14891ef3db0..3991ec3240e 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java @@ -511,7 +511,7 @@ public boolean executeScript(Task task, String script, boolean automatic) throws logger.info("Calling KitodoScript interpreter: {}", script); KitodoScriptService kitodoScriptService = ServiceManager.getKitodoScriptService(); - kitodoScriptService.execute(Arrays.asList(task.getProcess()), script); + kitodoScriptService.execute(Collections.singletonList(task.getProcess()), script); executedSuccessful = true; } else { logger.info("Calling the shell: {}", script);