@@ -483,7 +483,6 @@ public void apply(final Metafix metafix, final Record record, final List<String>
483
483
484
484
@ Override
485
485
public void apply (final Metafix metafix , final Record record , final List <String > params , final Map <String , String > options ) {
486
- <<<<<<< HEAD
487
486
final Map <String , String > map ;
488
487
489
488
if (params .size () <= 1 ) {
@@ -534,7 +533,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
534
533
lookup_rdf {
535
534
@ Override
536
535
public void apply (final Metafix metafix , final Record record , final List <String > params , final Map <String , String > options ) {
537
- final Map <String , String > map = extracted (metafix , record , params , options , KIND_OF_RDFMAP );
536
+ final Map <String , String > map = getMap (metafix , record , params , options , KIND_OF_RDFMAP );
538
537
record .transform (params .get (0 ), oldValue -> {
539
538
final String newValue = map .get (oldValue );
540
539
return newValue != null ? newValue : getBoolean (options , "delete" ) ? null : oldValue ;
@@ -675,7 +674,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
675
674
private static final Random RANDOM = new Random ();
676
675
private static String defaultValue ;
677
676
678
- private static Map <String , String > extracted (final Metafix metafix , final Record record , final List <String > params , final Map <String , String > options , final String kindOfMap ) {
677
+ private static Map <String , String > getMap (final Metafix metafix , final Record record , final List <String > params , final Map <String , String > options , final String kindOfMap ) {
679
678
final Map <String , String > map ;
680
679
if (params .size () <= 1 ) {
681
680
map = options ;
0 commit comments