Fix usage without namespace (metafacture-core#415)

Author: dr0i

metafix/src/main/java/org/metafacture/metafix/maps/RdfMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, 2014, 2021 Deutsche Nationalbibliothek et al
+ * Copyright 2022 hbz
  *
  * Licensed under the Apache License, Version 2.0 the "License";
  * you may not use this file except in compliance with the License.
@@ -33,19 +33,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -82,9 +74,9 @@ private void init() {
         if (!map.containsKey(Maps.DEFAULT_MAP_KEY)) {
             setDefault(Maps.DEFAULT_MAP_KEY);
         }
-        final String[] nsPrefixAndProperty = target.split(":");
-        if (nsPrefixAndProperty.length == 2) {
-            target = model.getNsPrefixURI(nsPrefixAndProperty[0]) + nsPrefixAndProperty[1];
+        if (!target.toLowerCase().startsWith("http")) {
+            final String[] nsPrefixAndProperty = target.split(":");
+            target = nsPrefixAndProperty.length == 2 ? model.getNsPrefixURI(nsPrefixAndProperty[0]) + nsPrefixAndProperty[1] : nsPrefixAndProperty[0];
         }
         isUninitialized = false;
     }
@@ -125,39 +117,6 @@ private void loadFile(final String file) {
         }
     }
 
-    private InputStream openStream(final String file) {
-        return openAsFile(file).orElseGet(() -> openAsResource(file).orElseGet(() -> openAsUrl(file).orElseThrow(() -> new FixExecutionException("File not found: " + file))));
-    }
-
-    private Optional<InputStream> openAsFile(final String file) {
-        try {
-            return Optional.of(new FileInputStream(file));
-        }
-        catch (final FileNotFoundException e) {
-            return Optional.empty();
-        }
-    }
-
-    private Optional<InputStream> openAsResource(final String file) {
-        return Optional.ofNullable(Thread.currentThread().getContextClassLoader().getResourceAsStream(file));
-    }
-
-    private Optional<InputStream> openAsUrl(final String file) {
-        final URL url;
-        try {
-            url = new URL(file);
-        }
-        catch (final MalformedURLException e) {
-            return Optional.empty();
-        }
-        try {
-            return Optional.of(url.openStream());
-        }
-        catch (final IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
     /**
      * Builds a Map dynamically by querying an RDF model based on a key and a targeted Property
      * (to be set in {@link RdfMap#setTarget(String)}) and an optional language tag (to be set in

metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java

@@ -1033,21 +1033,30 @@ public void shouldLookupInExternalRdfMapGetSubjectWithTargetedPredicateOfSpecifi
     }
 
     @Test       //Scenario 3:
-    public void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage() {
+    public void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguageUsingNamespace() {
+        shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage("skos:prefLabel");
+    }
+
+    @Test       //Scenario 3 without namespace :
+    public void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguageWithoutNamespace() {
+        shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage("http://www.w3.org/2004/02/skos/core#prefLabel");
+    }
+
+    private void shouldLookupInExternalRdfMapGetObjectWithTargetedPredicateOfSpecificLanguage(final String target) {
         MetafixTestHelpers.assertFix(streamReceiver,
-            Arrays.asList("set_array('prefLabel', 'Mathematics, Natural Sciences')",
-                "lookup_rdf('prefLabel.*'," + " '" + RDF_MAP + "',  target:\"skos:prefLabel\", " +
-                    "target_language:\"de\" )"
-            ),
-            i -> {
-                i.startRecord("1");
-                i.endRecord();
-            },
-            o -> {
-                o.get().startRecord("1");
-                o.get().literal("prefLabel", "Mathematik, Naturwissenschaften");
-                o.get().endRecord();
-            }
+                Arrays.asList("set_array('prefLabel', 'Mathematics, Natural Sciences')",
+                        "lookup_rdf('prefLabel.*'," + " '" + RDF_MAP + "',  target:\"" + target + "\", " +
+                                "target_language:\"de\" )"
+                ),
+                i -> {
+                    i.startRecord("1");
+                    i.endRecord();
+                },
+                o -> {
+                    o.get().startRecord("1");
+                    o.get().literal("prefLabel", "Mathematik, Naturwissenschaften");
+                    o.get().endRecord();
+                }
         );
     }