Merge pull request #12 from filip26/fix/11-an-i18n-datatype-with-no-language-but-a-direction-produced-an-empty-language-tag-instead-of-null

Fix/11 an i18n datatype with no language but a direction produced an empty language tag instead of null

Author: filip26

README.md

@@ -40,14 +40,14 @@ var encodedLiteral = NQuadsWriter.literal(...);
 <dependency>
     <groupId>com.apicatalog</groupId>
     <artifactId>titanium-rdf-n-quads</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```gradle
-implementation("com.apicatalog:titanium-rdf-n-quads:1.0.1")
+implementation("com.apicatalog:titanium-rdf-n-quads:1.0.2")
 ```
 
 ## Contributing

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.apicatalog</groupId>
     <artifactId>titanium-rdf-n-quads</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
     <url>https://github.com/filip26/titanium-rdf-n-quads</url>
     <scm>

src/main/java/com/apicatalog/rdf/nquads/NQuadsReader.java

@@ -279,10 +279,10 @@ protected void object() throws NQuadsReaderException {
                 datatype(datatype, (a, b) -> {
                     this.ltDatatype = a;
                     if (b != null) {
-                        if (b.length > 1) {
+                        if (b.length > 1 && b[1] != null && !b[1].trim().isEmpty()) {
                             this.ltDirection = b[1];
                         }
-                        if (b.length > 0) {
+                        if (b.length > 0 && b[0] != null && !b[0].trim().isEmpty()) {
                             this.ltLangTag = b[0];
                         }
                     }

src/main/java/com/apicatalog/rdf/nquads/NQuadsWriter.java

@@ -247,10 +247,11 @@ protected static final void literal(Writer writer, String object, String datatyp
         writer.append('"').append(NQuadsAlphabet.escape(object)).append('"');
 
         if (direction != null) {
-            writer.append(NQuadsAlphabet.I18N_BASE)
-                    .append(langTag)
-                    .append("_")
-                    .append(direction);
+            writer.append(NQuadsAlphabet.I18N_BASE);
+            if (langTag != null) {
+                writer.append(langTag);
+            }
+            writer.append("_").append(direction);
 
         } else if (langTag != null) {
 

src/test/java/com/apicatalog/rdf/nquads/NQuadsReaderTest.java

@@ -0,0 +1,104 @@
+package com.apicatalog.rdf.nquads;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.StringReader;
+
+import org.junit.jupiter.api.Test;
+
+import com.apicatalog.rdf.api.RdfConsumerException;
+
+class NQuadsReaderTest {
+
+    @Test
+    void testI18NLang() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#de> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertEquals("de", language);
+                    assertNull(direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+
+    @Test
+    void testI18NDirection() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#_rtl> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertNull(language);
+                    assertEquals("rtl", direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+
+    @Test
+    void testI18NEmptyDirection() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#cz_> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertEquals("cz", language);
+                    assertNull(direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+
+    @Test
+    void testI18NEmptyLang() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#_ltr> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertNull(language);
+                    assertEquals("ltr", direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+
+    @Test
+    void testI18() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertNull(language);
+                    assertNull(direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+
+    @Test
+    void testI18NEmpty() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#_> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertNull(language);
+                    assertNull(direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+
+    @Test
+    void testI18NDirLangTag() throws NQuadsReaderException, RdfConsumerException {
+        new NQuadsReader(new StringReader("<test:a> <test:b> \"c\"^^<https://www.w3.org/ns/i18n#cz_ltr> ."))
+                .provide((subject, predicate, object, datatype, language, direction, graph) -> {
+                    assertEquals("c", object);
+                    assertEquals("https://www.w3.org/ns/i18n#", datatype);
+                    assertEquals("cz", language);
+                    assertEquals("ltr", direction);
+                    assertNull(graph);
+                    return null;
+                });
+    }
+}

src/test/java/com/apicatalog/rdf/nquads/NQuadsTest.java

@@ -67,10 +67,10 @@ void testReadWrite(NQuadsTestCase testCase) throws IOException, URISyntaxExcepti
 
             try (final InputStream out = NQuadsTest.class.getResourceAsStream(TEST_CASE_BASE_PATH + testCase.getName() + ".out.nq")) {
                 if (out != null) {
-                    expected = isToString(out);  
+                    expected = isToString(out);
                 }
             }
-            
+
             final boolean match = expected.equals(result);
 
             if (!match) {