Simplify logic

Author: BartChris

Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java

@@ -681,7 +681,7 @@ public void preserve() throws InvalidMetadataValueException, NoSuchMetadataField
                 String id = row.getMetadataID();
                 if (row instanceof ProcessSimpleMetadata && specialFields.contains(id)
                         && ((ProcessSimpleMetadata) row).getSettings()
-                        .getDomain().orElse(Domain.DESCRIPTION).equals(Domain.METS_DIV) && !untyped) {
+                        .getDomain().orElse(Domain.DESCRIPTION).equals(Domain.METS_DIV)) {
                     updateDivisionFromProcessDetail(id, (ProcessSimpleMetadata) row);
                 } else {
                     if (!untyped) {
@@ -729,17 +729,8 @@ private void resetDivision() {
      * Restricts the visible metadata fields of this element to structural metadata only.
      */
     public void filterToStructuralFields() {
-        treeNode.getChildren().removeIf(child -> {
-            ProcessDetail row = (ProcessDetail) child.getData();
-            String key = row.getMetadataID();
-
-            return !isStructuralKey(key);
-        });
-    }
-
-    private boolean isStructuralKey(String key) {
-        return METADATA_KEY_LABEL.equals(key)
-                || METADATA_KEY_ORDERLABEL.equals(key);
+        treeNode.getChildren().removeIf(child ->
+                !specialFields.contains(((ProcessDetail) child.getData()).getMetadataID()));
     }
 
     private boolean isDivisionUntyped() {

Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/MetadataPanel.java

@@ -164,13 +164,9 @@ void showLogical(Optional<LogicalDivision> optionalStructure) {
     }
 
     private boolean isDivisionUntyped(LogicalDivision division) {
-        if (division instanceof LogicalDivision logicalDivision) {
-            return Objects.isNull(logicalDivision.getType()) || logicalDivision.getType().isBlank();
-        }
-        return false;
+        return Objects.isNull(division.getType()) || division.getType().isBlank();
     }
 
-
     void showPageInLogical(PhysicalDivision physicalDivision) {
         if (Objects.nonNull(physicalDivision)) {
             logicalMetadataTable = createProcessFieldedMetadata(physicalDivision);

Kitodo/src/main/java/org/kitodo/production/helper/ProcessHelper.java

@@ -461,7 +461,7 @@ public static void addAllowedMetadataRecursive(Division<?> division, Collection<
                                                    RulesetManagementInterface rulesetManagement, String acquisitionStage,
                                                    List<Locale.LanguageRange> priorityList) {
         String type = division.getType();
-        if (Objects.nonNull(type) && !type.isEmpty()) {
+        if (Objects.nonNull(type) && !type.isBlank()) {
             StructuralElementViewInterface divisionView = rulesetManagement.getStructuralElementView(type,
                     acquisitionStage, priorityList);
             for (MetadataViewInterface metadataView : divisionView.getAllowedMetadata()) {