Change default handling in lookup() Fix function. (#356)

According to last discussion: * `default` from options. * `__default` from map.
metafacture · Sep 24, 2024 · 27634d1 · 27634d1
1 parent a505fc5
commit 27634d1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/metafix/src/main/java/org/metafacture/metafix/FixMethod.java b/metafix/src/main/java/org/metafacture/metafix/FixMethod.java
@@ -517,8 +517,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
                 map = metafix.getMap(mapName);
             }
 
-            final String defaultOption = options.get("default");
-            final String defaultValue = options.getOrDefault(Maps.DEFAULT_MAP_KEY, map.get(Maps.DEFAULT_MAP_KEY));
+            final String defaultValue = options.getOrDefault("default", map.get(Maps.DEFAULT_MAP_KEY));
             final boolean delete = getBoolean(options, "delete");
             final boolean printUnknown = getBoolean(options, "print_unknown");
 
@@ -531,7 +530,8 @@ public void apply(final Metafix metafix, final Record record, final List<String>
                     if (c != null) {
                         c.accept(oldValue);
                     }
-                    return defaultOption != null ? defaultOption : defaultValue != null ? defaultValue : delete ? null : oldValue;
+
+                    return defaultValue != null ? defaultValue : delete ? null : oldValue;
                 }
             });