Skip to content

Commit c3418a4

Browse files
committed
Remove static defaultValue (metafacture-core#415)
This was overriding every defaultValue, but maps should have the possibility to have different default values.
1 parent 234ab5a commit c3418a4

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

metafix/src/main/java/org/metafacture/metafix/FixMethod.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
536536
public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
537537
final Map<String, String> map = getMap(metafix, record, params, options, KIND_OF_RDFMAP);
538538
record.transform(params.get(0), oldValue -> {
539-
final String newValue = map.getOrDefault(oldValue, defaultValue);
539+
final String newValue = map.getOrDefault(oldValue, map.get(Maps.DEFAULT_MAP_KEY));
540540
return newValue != null ? newValue : getBoolean(options, "delete") ? null : oldValue;
541541
});
542542
}
@@ -673,7 +673,6 @@ public void apply(final Metafix metafix, final Record record, final List<String>
673673
private static final String ERROR_STRING_OPTION = "error_string";
674674

675675
private static final Random RANDOM = new Random();
676-
private static String defaultValue;
677676

678677
private static Map<String, String> getMap(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options, final String kindOfMap) {
679678
final Map<String, String> map;
@@ -703,7 +702,6 @@ private static Map<String, String> getMap(final Metafix metafix, final Record re
703702
}
704703
map = metafix.getMap(mapName);
705704
}
706-
defaultValue = map.get(Maps.DEFAULT_MAP_KEY); // TODO: Catmandu uses 'default'
707705
return map;
708706
}
709707

0 commit comments

Comments
 (0)