Use Context to parse contexts and find prefixes

stain · stain · commit d3d0027152ed · 2014-03-18T16:59:06.000Z
diff --git a/core/src/main/java/com/github/jsonldjava/core/RDFDataset.java b/core/src/main/java/com/github/jsonldjava/core/RDFDataset.java
@@ -15,6 +15,8 @@
 import static com.github.jsonldjava.core.JsonLdUtils.isString;
 import static com.github.jsonldjava.core.JsonLdUtils.isValue;
 
+import java.io.IOException;
+import java.net.URL;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,6 +27,8 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import com.fasterxml.jackson.core.JsonParseException;
+
 /**
  * Starting to migrate away from using plain java Maps as the internal RDF
  * dataset store. Currently each item just wraps a Map based on the old format
@@ -359,8 +363,8 @@ public void setNamespace(String ns, String prefix) {
         context.put(ns, prefix);
     }
 
-    public void getNamespace(String ns) {
-        context.get(ns);
+    public String getNamespace(String ns) {
+        return context.get(ns);
     }
 
     /**
@@ -394,45 +398,32 @@ public Map<String, Object> getContext() {
      * 
      * @param context
      *            The context to parse
+     * @throws JsonLdError If the context can't be parsed 
      */
-    public void parseContext(Object contextLike) {
-    	Map<String, Object> context;
-    	
-    	if (contextLike instanceof Map) {
-    		context = (Map<String, Object>) contextLike;
-    	} else if (contextLike instanceof List) {
-    		for (Object cntx : (List)contextLike) {
-    			parseContext(cntx);
-    		}
-    		return;
-    	} else if (contextLike instanceof String) {
-    		// FIXME: Ignore external contexts for now
-    		return;
+    public void parseContext(Object contextLike) throws JsonLdError {
+    	Context context;
+    	if (api != null) {
+    		context = new Context(api.opts);
     	} else { 
-    		throw new RuntimeException("Can't handle context of type " + contextLike.getClass());
+    		context = new Context();
     	}
+    	// Context will do our recursive parsing and initial IRI resolution
+    	context = context.parse(contextLike);
+    	// And then leak to us the potential 'prefixes'
+    	Map<String, String> prefixes = context.getPrefixes(false);
     	
-        for (final String key : context.keySet()) {
-            final Object val = context.get(key);
+        for (final String key : prefixes.keySet()) {
+            final String val = prefixes.get(key);
             if ("@vocab".equals(key)) {
                 if (val == null || isString(val)) {
                     setNamespace("", (String) val);
                 } else {
-                    // TODO: the context is actually invalid, should we throw an
-                    // exception?
                 }
-            } else if ("@context".equals(key)) {
-                // go deeper!
-                parseContext(context.get("@context"));
             } else if (!isKeyword(key)) {
+            	setNamespace(key, val);
                 // TODO: should we make sure val is a valid URI prefix (i.e. it
                 // ends with /# or ?)
                 // or is it ok that full URIs for terms are used?
-                if (val instanceof String) {
-                    setNamespace(key, (String) context.get(key));
-                } else if (isObject(val) && ((HashMap<String, Object>) val).containsKey("@id")) {
-                    setNamespace(key, (String) ((HashMap<String, Object>) val).get("@id"));
-                }
             }
         }
     }
