You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2016/04/21 21:00:21 UTC

[4/5] clerezza git commit: Omitting datapype from lag-string for literals with language so that jena serializes NT corectly

Omitting datapype from lag-string for literals with language so that jena serializes NT corectly

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/153270a2
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/153270a2
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/153270a2

Branch: refs/heads/master
Commit: 153270a2119a782dcadd05b99ca0fe7daa759a0f
Parents: d7c65e5
Author: Reto Gmür <re...@apache.org>
Authored: Thu Apr 21 19:33:04 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Apr 21 19:33:04 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java | 4 ++--
 .../clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/153270a2/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
index 7031e02..5f33757 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
@@ -55,9 +55,9 @@ public class Tria2JenaUtil {
         return com.hp.hpl.jena.graph.NodeFactory.createLiteral(
                             literal.getLexicalForm(),
                             literal.getLanguage() == null ? null : literal.getLanguage().
-                            toString(), TypeMapper.getInstance().
+                            toString(), literal.getLanguage() == null ? TypeMapper.getInstance().
                             getSafeTypeByName(
-                            literal.getDataType().getUnicodeString()));
+                            literal.getDataType().getUnicodeString()) : null);
     }
 
     public Node convert2JenaNode(RDFTerm resource) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/153270a2/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
index 79a00e2..3c762cf 100644
--- a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
+++ b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
@@ -141,7 +141,6 @@ public class TestJenaSerializerProvider {
     /*
      * Serialize ImmutableGraph to rdf+nt format and deserialize.
      */
-    @Ignore("currently broken: serializer adds langauge and datatype")
     @Test
     public void testRdfNtSerializer() {
         initializeGraph();