Adjust delete function as suggested by @blackwinter #333

metafacture · Sep 18, 2024 · a505fc5 · a505fc5
1 parent 5cb5e66
commit a505fc5
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/metafix/src/main/java/org/metafacture/metafix/FixMethod.java b/metafix/src/main/java/org/metafacture/metafix/FixMethod.java
@@ -517,10 +517,10 @@ public void apply(final Metafix metafix, final Record record, final List<String>
                 map = metafix.getMap(mapName);
             }
 
-            final String defaultValue = map.get(Maps.DEFAULT_MAP_KEY); // TODO: Catmandu uses 'default'
+            final String defaultOption = options.get("default");
+            final String defaultValue = options.getOrDefault(Maps.DEFAULT_MAP_KEY, map.get(Maps.DEFAULT_MAP_KEY));
             final boolean delete = getBoolean(options, "delete");
             final boolean printUnknown = getBoolean(options, "print_unknown");
-            final String defaultOption = options.get("default");
 
             final Consumer<Consumer<String>> consumer = c -> record.transform(params.get(0), oldValue -> {
                 final String newValue = map.get(oldValue);
@@ -531,11 +531,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
                     if (c != null) {
                         c.accept(oldValue);
                     }
-                    elsif (defaultOption != null){
-                        return defaultOption;
-                    }
-                    return defaultValue != null ? defaultValue : delete ? null : oldValue;
-
+                    return defaultOption != null ? defaultOption : defaultValue != null ? defaultValue : delete ? null : oldValue;
                 }
             });