Adress remarks from review

kitodo · Oct 25, 2024 · 652e63a · 652e63a
1 parent 533709a
commit 652e63a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 25 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessBooleanMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessBooleanMetadata.java
@@ -16,17 +16,13 @@
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.BiConsumer;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.kitodo.api.Metadata;
 import org.kitodo.api.MetadataEntry;
 import org.kitodo.api.dataeditor.rulesetmanagement.Domain;
 import org.kitodo.api.dataeditor.rulesetmanagement.SimpleMetadataViewInterface;
-import org.kitodo.api.dataformat.Division;
 import org.kitodo.exceptions.InvalidMetadataValueException;
-import org.kitodo.exceptions.NoSuchMetadataFieldException;
 
 /**
  * A row on the metadata panel that contains an on/off switch.
@@ -70,6 +66,11 @@ public String getMetadataID() {
         return settings.getId();
     }
 
+    @Override
+    public String extractSimpleValue() {
+        return settings.convertBoolean(active).orElse(null);
+    }
+
     @Override
     public String getInput() {
         return "toggleSwitch";

diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java
@@ -65,6 +65,8 @@ public class ProcessFieldedMetadata extends ProcessDetail implements Serializabl
      * Fields the user has selected to show in addition, with no data yet.
      */
     private final Collection<String> additionallySelectedFields = new ArrayList<>();
+    private static final Set<String> specialFields = Set.of(METADATA_KEY_LABEL, METADATA_KEY_ORDERLABEL,
+            METADATA_KEY_CONTENTIDS);
 
     private boolean copy;
 
@@ -671,8 +673,6 @@ public void preserve() throws InvalidMetadataValueException, NoSuchMetadataField
                 division.setLabel(null);
             }
             metadata.clear();
-            Set<String> specialFields = new HashSet<>(Set.of(METADATA_KEY_LABEL, METADATA_KEY_ORDERLABEL,
-                    METADATA_KEY_CONTENTIDS));
 
             for (TreeNode child : treeNode.getChildren()) {
                 ProcessDetail row = (ProcessDetail) child.getData();
@@ -714,7 +714,7 @@ public void preserve() throws InvalidMetadataValueException, NoSuchMetadataField
     }
 
     private void updateDivisionFromProcessDetail(String key, ProcessSimpleMetadata processDetail) throws InvalidMetadataValueException {
-        String simpleValue = extractSimpleValue(processDetail);
+        String simpleValue = processDetail.extractSimpleValue();
         if (!processDetail.getSettings().isValid(simpleValue, getListForLeadingMetadataFields())) {
             throw new InvalidMetadataValueException(key, simpleValue);
         };
@@ -724,15 +724,6 @@ private void updateDivisionFromProcessDetail(String key, ProcessSimpleMetadata p
         updateDivision(key, simpleValue);
     }
 
-    private String extractSimpleValue(ProcessDetail value) {
-        if (value instanceof ProcessTextMetadata) {
-            return ((ProcessTextMetadata) value).getValue();
-        } else if (value instanceof ProcessSelectMetadata) {
-            return String.join(" ", ((ProcessSelectMetadata) value).getSelectedItems());
-        }
-        return null;
-    }
-
     private void updateDivision(String key, String value) {
         switch (key) {
             case METADATA_KEY_LABEL:

diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSelectMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSelectMetadata.java
@@ -191,6 +191,11 @@ public List<String> getSelectedItems() {
         return selectedItems;
     }
 
+    @Override
+    public String extractSimpleValue() {
+        return String.join(" ", getSelectedItems());
+    }
+
     @Override
     public boolean isValid() {
         for (String selectedItem : selectedItems) {

diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSimpleMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSimpleMetadata.java
@@ -12,20 +12,16 @@
 package org.kitodo.production.forms.createprocess;
 
 import java.io.Serializable;
-import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.BiConsumer;
 
 import org.kitodo.api.dataeditor.rulesetmanagement.ComplexMetadataViewInterface;
-import org.kitodo.api.dataeditor.rulesetmanagement.MetadataViewInterface;
 import org.kitodo.api.dataeditor.rulesetmanagement.SimpleMetadataViewInterface;
 import org.kitodo.api.dataeditor.rulesetmanagement.StructuralElementViewInterface;
 import org.kitodo.api.dataformat.Division;
 import org.kitodo.api.dataformat.LogicalDivision;
 import org.kitodo.api.dataformat.PhysicalDivision;
-import org.kitodo.exceptions.NoSuchMetadataFieldException;
 
 abstract class ProcessSimpleMetadata extends ProcessDetail implements Serializable {
 
@@ -56,6 +52,8 @@ protected ProcessSimpleMetadata(ProcessFieldedMetadata container, SimpleMetadata
      */
     abstract ProcessSimpleMetadata getClone();
 
+    abstract String extractSimpleValue();
+
     public SimpleMetadataViewInterface getSettings() {
         return settings;
     }

diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessTextMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessTextMetadata.java
@@ -15,17 +15,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
-import java.util.function.BiConsumer;
 
-import org.apache.commons.lang3.tuple.Pair;
 import org.kitodo.api.Metadata;
 import org.kitodo.api.MetadataEntry;
 import org.kitodo.api.dataeditor.rulesetmanagement.Domain;
 import org.kitodo.api.dataeditor.rulesetmanagement.InputType;
 import org.kitodo.api.dataeditor.rulesetmanagement.SimpleMetadataViewInterface;
-import org.kitodo.api.dataformat.Division;
-import org.kitodo.exceptions.InvalidMetadataValueException;
-import org.kitodo.exceptions.NoSuchMetadataFieldException;
 
 public class ProcessTextMetadata extends ProcessSimpleMetadata implements Serializable {
 
@@ -121,6 +116,11 @@ public String getValue() {
         return value;
     }
 
+    @Override
+    public String extractSimpleValue() {
+        return getValue();
+    }
+
     /**
      * Sets the contents of the text input field of this process metadata.
      *