svn commit: r1099760 - in /incubator/stanbol/trunk/enhancer/generic/jsonld/src: main/java/org/apache/stanbol/jsonld/JsonLd.java test/java/org/apache/stanbol/jsonld/JsonLdTest.java

[fchrist]

Author: fchrist
Date: Thu May  5 11:38:46 2011
New Revision: 1099760

URL: http://svn.apache.org/viewvc?rev=1099760&view=rev
Log:
STANBOL-190 fixes after failing tests

Modified:
    
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
    
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java

Modified: 
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java?rev=1099760&r1=1099759&r2=1099760&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
 Thu May  5 11:38:46 2011
@@ -85,7 +85,7 @@ public class JsonLd {
                 JsonLdResource resource = resourceMap.get(subject);
 
                 // put the namespaces
-                if ((this.applyNamespaces && 
!this.namespacePrefixMap.isEmpty()) || this.useTypeCoercion) {
+                if (!this.namespacePrefixMap.isEmpty() || 
this.useTypeCoercion) {
                     Map<String,Object> nsObject = new 
TreeMap<String,Object>(new JsonComparator());
                     for (String ns : this.namespacePrefixMap.keySet()) {
                         nsObject.put(this.namespacePrefixMap.get(ns), ns);
@@ -160,8 +160,7 @@ public class JsonLd {
         }
 
         // put the namespaces
-        if ((this.applyNamespaces && !this.namespacePrefixMap.isEmpty())
-            || (this.useTypeCoercion && !coercionMap.isEmpty())) {
+        if (!this.namespacePrefixMap.isEmpty() || (this.useTypeCoercion && 
!coercionMap.isEmpty())) {
 
             Map<String,Object> nsObject = new TreeMap<String,Object>(new 
JsonComparator());
             for (String ns : namespacePrefixMap.keySet()) {
@@ -231,7 +230,7 @@ public class JsonLd {
                 String[] stringArray = (String[]) value;
                 List<String> valueList = new ArrayList<String>();
                 for (String uri : stringArray) {
-                    valueList.add(uri);
+                    valueList.add(applyNamespace(uri));
                 }
                 List<Object> jsonArray = new ArrayList<Object>(valueList);
                 jsonObject.put(applyNamespace(property), jsonArray);
@@ -249,6 +248,9 @@ public class JsonLd {
                         String strValue = formatWithType(value.toString(), 
type);
                         jsonObject.put(applyNamespace(property), 
applyNamespace(strValue));
                     }
+                    else {
+                        jsonObject.put(applyNamespace(property), value);
+                    }
                 } else {
                     jsonObject.put(applyNamespace(property), value);
                 }

Modified: 
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java?rev=1099760&r1=1099759&r2=1099760&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
 Thu May  5 11:38:46 2011
@@ -37,7 +37,7 @@ public class JsonLdTest {
         String actual = jsonLd.toString();
         String expected = 
"{\"#\":{\"myvocab\":\"http:\\/\\/example.org\\/myvocab#\"},\"a\":\"foaf:Person\",\"foaf:homepage\":\"<http:\\/\\/manu.sporny.org\\/>\",\"foaf:name\":\"Manu
 
Sporny\",\"myvocab:credits\":500,\"sioc:avatar\":\"<http:\\/\\/twitter.com\\/account\\/profile_image\\/manusporny>\"}";
         assertEquals(expected, actual);
-
+        
         String actualIndent = jsonLd.toString(4);
         String expectedIndent = "{\n    \"#\": {\n        \"myvocab\": 
\"http:\\/\\/example.org\\/myvocab#\"\n    },\n    \"a\": \"foaf:Person\",\n    
\"foaf:homepage\": \"<http:\\/\\/manu.sporny.org\\/>\",\n    \"foaf:name\": 
\"Manu Sporny\",\n    \"myvocab:credits\": 500,    \"sioc:avatar\": 
\"<http:\\/\\/twitter.com\\/account\\/profile_image\\/manusporny>\"\n}";
         assertEquals(expectedIndent, actualIndent);
@@ -262,6 +262,10 @@ public class JsonLdTest {
 
         String actual = jsonLd.toString();
         String expected = 
"{\"#\":{\"foaf\":\"http:\\/\\/xmlns.com\\/foaf\\/0.1\\/\",\"xsd\":\"http:\\/\\/www.w3.org\\/2001\\/XMLSchema#\"},\"@\":\"<http:\\/\\/example.org\\/people#joebob>\",\"http:\\/\\/xmlns.com\\/foaf\\/0.1\\/nick\":[\"\\\"stu\\\"^^http:\\/\\/www.w3.org\\/2001\\/XMLSchema#string\",\"\\\"groknar\\\"^^http:\\/\\/www.w3.org\\/2001\\/XMLSchema#string\",\"\\\"radface\\\"^^http:\\/\\/www.w3.org\\/2001\\/XMLSchema#string\"]}";
+        
+        toConsole(actual);
+        toConsole(expected);
+        
         assertEquals(expected, actual);
 
         String actualIndent = jsonLd.toString(4);