Add support for Integer as a typed literal (#147)

inrupt · Jan 22, 2024 · bff10b2 · bff10b2
1 parent 55eb75d
commit bff10b2
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 1 deletion.
diff --git a/commons/src/main/java/com/inrupt/rdf/wrapping/commons/TermMappings.java b/commons/src/main/java/com/inrupt/rdf/wrapping/commons/TermMappings.java
@@ -127,6 +127,24 @@ public static Literal asTypedLiteral(final Boolean value, final Graph graph) {
         return FACTORY.createLiteral(value.toString(), FACTORY.createIRI("http://www.w3.org/2001/XMLSchema#boolean"));
     }
 
+    /**
+     * Maps a integer value to a literal term.
+     *
+     * @param value the value to map
+     * @param graph ignored
+     *
+     * @return an xsd:int typed literal node with the integer value as its lexical value
+     *
+     * @throws NullPointerException if the value is null
+     * @throws NullPointerException if the model is null
+     */
+    public static Literal asTypedLiteral(final Integer value, final Graph graph) {
+        Objects.requireNonNull(value, VALUE_REQUIRED);
+        Objects.requireNonNull(graph, GRAPH_REQUIRED);
+
+        return FACTORY.createLiteral(value.toString(), FACTORY.createIRI("http://www.w3.org/2001/XMLSchema#int"));
+    }
+
     /**
      * Maps a term to itself.
      *

diff --git a/jena/src/main/java/com/inrupt/rdf/wrapping/jena/NodeMappings.java b/jena/src/main/java/com/inrupt/rdf/wrapping/jena/NodeMappings.java
@@ -129,6 +129,24 @@ public static Literal asTypedLiteral(final Boolean value, final Model model) {
         return model.createTypedLiteral(value);
     }
 
+    /**
+     * Maps a integer value to a literal node.
+     *
+     * @param value the value to map
+     * @param model the graph used to create the node
+     *
+     * @return an xsd:int typed literal node with the integer value as its lexical value
+     *
+     * @throws NullPointerException if the value is null
+     * @throws NullPointerException if the model is null
+     */
+    public static Literal asTypedLiteral(final Integer value, final Model model) {
+        Objects.requireNonNull(value, VALUE_REQUIRED);
+        Objects.requireNonNull(model, GRAPH_REQUIRED);
+
+        return model.createTypedLiteral(value);
+    }
+
     /**
      * Maps a term to itself.
      *

diff --git a/jena/src/test/java/com/inrupt/rdf/wrapping/jena/NodeMappingsTest.java b/jena/src/test/java/com/inrupt/rdf/wrapping/jena/NodeMappingsTest.java
@@ -151,6 +151,17 @@ void asTypedLiteralBooleanTest() {
                 hasProperty("datatypeURI", is(XSD.xboolean.getURI()))));
     }
 
+    @Test
+    void asTypedLiteralIntegerTest() {
+        assertThrows(NullPointerException.class, () -> asTypedLiteral((Integer) null, null));
+        assertThrows(NullPointerException.class, () -> asTypedLiteral(1, null));
+
+        assertThat(asTypedLiteral(1, MODEL), both(
+                instanceOf(Literal.class)).and(
+                hasProperty("lexicalForm", is("1"))).and(
+                hasProperty("datatypeURI", is(XSD.xint.getURI()))));
+    }
+
     @Test
     void identityTest() {
         final Resource blank = MODEL.createResource();

diff --git a/rdf4j/src/main/java/com/inrupt/rdf/wrapping/rdf4j/RdfValueMappings.java b/rdf4j/src/main/java/com/inrupt/rdf/wrapping/rdf4j/RdfValueMappings.java
@@ -130,6 +130,24 @@ public static Literal asTypedLiteral(final Boolean value, final Model model) {
         return FACTORY.createLiteral(value.toString(), XSD.BOOLEAN);
     }
 
+    /**
+     * Maps a integer value to a literal term.
+     *
+     * @param value the value to map
+     * @param model ignored
+     *
+     * @return an xsd:int typed literal node with the integer value as its lexical value
+     *
+     * @throws NullPointerException if the value is null
+     * @throws NullPointerException if the model is null
+     */
+    public static Literal asTypedLiteral(final Integer value, final Model model) {
+        Objects.requireNonNull(value, VALUE_REQUIRED);
+        Objects.requireNonNull(model, GRAPH_REQUIRED);
+
+        return FACTORY.createLiteral(value.toString(), XSD.INT);
+    }
+
     /**
      * Maps a term to itself.
      *

diff --git a/rdf4j/src/test/java/com/inrupt/rdf/wrapping/rdf4j/RdfValueMappingsTest.java b/rdf4j/src/test/java/com/inrupt/rdf/wrapping/rdf4j/RdfValueMappingsTest.java
@@ -148,10 +148,21 @@ void asTypedLiteralBooleanTest() {
 
         assertThat(asTypedLiteral(true, MODEL), both(
                 instanceOf(Literal.class)).and(
-                hasProperty("label", is("true".toString()))).and(
+                hasProperty("label", is("true"))).and(
                 hasProperty("datatype", is(XSD.BOOLEAN))));
     }
 
+    @Test
+    void asTypedLiteralIntegerTest() {
+        assertThrows(NullPointerException.class, () -> asTypedLiteral((Integer) null, null));
+        assertThrows(NullPointerException.class, () -> asTypedLiteral(1, null));
+
+        assertThat(asTypedLiteral(1, MODEL), both(
+                instanceOf(Literal.class)).and(
+                hasProperty("label", is("1"))).and(
+                hasProperty("datatype", is(XSD.INT))));
+    }
+
     @Test
     void identityTest() {
         final BNode blank = SimpleValueFactory.getInstance().createBNode();

diff --git a/test/commons/src/main/java/com/inrupt/rdf/wrapping/test/commons/TermMappingsBase.java b/test/commons/src/main/java/com/inrupt/rdf/wrapping/test/commons/TermMappingsBase.java
@@ -103,6 +103,19 @@ void asTypedLiteralBooleanTest() {
                 hasProperty("datatype", is(xsdBoolean))));
     }
 
+    @Test
+    void asTypedLiteralIntegerTest() {
+        final IRI xsdInt = FACTORY.createIRI("http://www.w3.org/2001/XMLSchema#int");
+
+        assertThrows(NullPointerException.class, () -> asTypedLiteral((Integer) null, null));
+        assertThrows(NullPointerException.class, () -> asTypedLiteral(1, null));
+
+        assertThat(asTypedLiteral(1, GRAPH), both(
+                instanceOf(Literal.class)).and(
+                hasProperty("lexicalForm", is("1"))).and(
+                hasProperty("datatype", is(xsdInt))));
+    }
+
     @Test
     void identityTest() {
         final BlankNode blank = FACTORY.createBlankNode();