Fix order; rename variable; remove empty line (metafacture-core#415)

Author: dr0i

README.md

@@ -190,6 +190,7 @@ The separator (`sep_char`) will vary depending on the source file, e.g.:
 | CSV  | `,` or `;` |
 | TSV  | `\t`       |
 
+<<<<<<< HEAD
 Options:
 
 - `allow_empty_values`: Sets whether to allow empty values in the filemap or to ignore these entries. (Default: `false`)
@@ -223,6 +224,17 @@ put_map("<mapName>",
 )
 ```
 
+##### `put_rdfmap`
+
+Defines an external RDF map for lookup from a file or an HTTP(S) resource.
+As the RDF map is reducing RDF triples to a key/value map it is mandatory to set the target.
+The targeted RDF property can optionally be bound by an RDF language tag.
+
+```perl
+put_rdfmap("<rdfResource>", "<rdfMapName>", target: "<rdfProperty>")
+put_rdfmap("<rdfResource>", "<rdfMapName>", target: "<rdfProperty>, target_language: "<rdfLanguageTag>")
+```
+
 ##### `put_var`
 
 Defines a single global variable that can be referenced with `$[<variableName>]`.
@@ -620,7 +632,7 @@ lookup("path.to.field", "map-name", print_unknown: "true", destination: "unknown
 ##### `lookup_rdf`
 
 Looks up matching values in an RDF resource and replaces the field value with a match defined by a targeted RDF property. External files or HTTP(S) resources as well as internal RDF maps can be used.
-The targeted RDF property can optional be bound by an RDF language tag.
+The targeted RDF property can optionalyl be bound by an RDF language tag.
 
 ```perl
 lookup_rdf("<sourceField>", "<rdfFile>", target: "<rdfProperty>")

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

@@ -674,5 +674,4 @@ public void apply(final Metafix metafix, final Record record, final List<String>
 
     private static final Random RANDOM = new Random();
 
-
 }

metafix/src/main/java/org/metafacture/metafix/api/FixFunction.java

@@ -111,24 +111,24 @@ default Stream<Value> flatten(final Stream<Value> stream) {
         ));
     }
 
-    default void lookup(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options, final FixFunction kindOfMap) {
-        final Map<String, String> map = getMap(metafix, record, params, options, kindOfMap);
+    default void lookup(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options, final FixFunction mapFunction) {
+        final Map<String, String> map = getMap(metafix, record, params, options, mapFunction);
         record.transform(params.get(0), oldValue -> {
             final String newValue = map.getOrDefault(oldValue, map.get(Maps.DEFAULT_MAP_KEY));
             return newValue != null ? newValue : getBoolean(options, "delete") ? null : oldValue;
         });
     }
 
-    static Map<String, String> getMap(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options, final FixFunction kindOfMap) {
+    static Map<String, String> getMap(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options, final FixFunction mapFunction) {
         final Map<String, String> map;
         if (params.size() <= 1) {
             map = options;
         }
         else {
-            final String mapName = kindOfMap.toString().equals("put_rdfmap") ? (params.size() > 1 ? params.get(1) : params.get(0)) + options.get(RdfMap.TARGET) + options.getOrDefault(RdfMap.TARGET_LANGUAGE, "") : params.get(1);
+            final String mapName = mapFunction.toString().equals("put_rdfmap") ? (params.size() > 1 ? params.get(1) : params.get(0)) + options.get(RdfMap.TARGET) + options.getOrDefault(RdfMap.TARGET_LANGUAGE, "") : params.get(1);
             if (!metafix.getMapNames().contains(mapName)) {
                 if (mapName.contains(".") || mapName.contains(File.separator)) {
-                    kindOfMap.apply(metafix, record, Arrays.asList(mapName), options);
+                    mapFunction.apply(metafix, record, Arrays.asList(mapName), options);
                 }
                 else {
                     // Probably an unknown internal map? Log a warning?