Minor improvements

filip26 · Aug 25, 2024 · efb5f7a · efb5f7a
1 parent b602f4d
commit efb5f7a
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 30 deletions.
diff --git a/doc/ltdm-0.0.1.png b/doc/ltdm-0.0.1.png
diff --git a/src/main/java/com/apicatalog/linkedtree/LinkedLiteral.java b/src/main/java/com/apicatalog/linkedtree/LinkedLiteral.java
@@ -17,7 +17,7 @@ default LinkedLiteral asLiteral() {
      *
      * @return lexical value, never <code>null</code>
      */
-    String value();
+    String lexicalValue();
 
     /**
      * An absolute IRI denoting the datatype IRI of the literal.

diff --git a/src/main/java/com/apicatalog/linkedtree/json/JsonDecimal.java b/src/main/java/com/apicatalog/linkedtree/json/JsonDecimal.java
@@ -38,7 +38,7 @@ public static JsonDecimal of(jakarta.json.JsonNumber jsonNumber, String datatype
     }
 
     @Override
-    public String value() {
+    public String lexicalValue() {
         return xsdNumberFormat.format(json.bigDecimalValue());
     }
 

diff --git a/src/main/java/com/apicatalog/linkedtree/json/JsonInteger.java b/src/main/java/com/apicatalog/linkedtree/json/JsonInteger.java
@@ -28,7 +28,7 @@ public static JsonInteger of(jakarta.json.JsonNumber jsonNumber, String datatype
     }
 
     @Override
-    public String value() {
+    public String lexicalValue() {
         return json.bigIntegerValue().toString();
     }
 

diff --git a/src/main/java/com/apicatalog/linkedtree/json/JsonLiteral.java b/src/main/java/com/apicatalog/linkedtree/json/JsonLiteral.java
@@ -25,7 +25,7 @@ public static JsonLiteral of(JsonValue value, ProcessingInstruction pi) {
     }
 
     @Override
-    public String value() {
+    public String lexicalValue() {
         if (value == null) {
             value = JsonCanonicalizer.canonicalize(json);
         }

diff --git a/src/main/java/com/apicatalog/linkedtree/json/JsonScalar.java b/src/main/java/com/apicatalog/linkedtree/json/JsonScalar.java
@@ -12,7 +12,7 @@ public record JsonScalar(
         ) implements LinkedLiteral {
 
     @Override
-    public String value() {
+    public String lexicalValue() {
         return jsonValue.toString();
     }
 

diff --git a/src/main/java/com/apicatalog/linkedtree/jsonld/io/JsonLdTreeReader.java b/src/main/java/com/apicatalog/linkedtree/jsonld/io/JsonLdTreeReader.java
@@ -30,10 +30,10 @@
 import com.apicatalog.linkedtree.lang.ImmutableLangString;
 import com.apicatalog.linkedtree.link.Link;
 import com.apicatalog.linkedtree.link.MutableLink;
+import com.apicatalog.linkedtree.literal.ImmutableLinkedLiteral;
 import com.apicatalog.linkedtree.pi.ProcessingInstruction;
 import com.apicatalog.linkedtree.primitive.GenericLinkedContainer;
 import com.apicatalog.linkedtree.primitive.GenericLinkedFragment;
-import com.apicatalog.linkedtree.primitive.GenericLinkedLiteral;
 import com.apicatalog.linkedtree.primitive.GenericLinkedTree;
 import com.apicatalog.linkedtree.xsd.XsdConstants;
 
@@ -79,7 +79,7 @@ public LinkedTree readExpanded(JsonArray jsonNodes) {
         final LinkedTree tree = GenericLinkedTree.of(readNodes(jsonNodes, links), links);
 
         for (final Link link : links.values()) {
-            ((MutableLink) link).target(adapt(((MutableLink) link), mergeTypes(link.fragments()), merge(link.fragments()), null));
+            ((MutableLink) link).target(adapt(((MutableLink) link), mergeTypes(link.refs()), merge(link.refs()), null));
         }
 
         return tree;
@@ -248,7 +248,7 @@ protected LinkedTree readGraph(JsonObject jsonObject) {
         }
 
         for (final Link link : links.values()) {
-            ((MutableLink) link).target(adapt(((MutableLink) link), mergeTypes(link.fragments()), merge(link.fragments()), null));
+            ((MutableLink) link).target(adapt(((MutableLink) link), mergeTypes(link.refs()), merge(link.refs()), null));
         }
 
         if (id != null) {
@@ -427,7 +427,7 @@ protected LinkedLiteral readLiteral(final JsonObject valueJsonObject) {
                     getPi(valueJsonObject, JsonLdKeyword.VALUE, JsonLdKeyword.TYPE, JsonLdKeyword.LANGUAGE));
         }
 
-        return new GenericLinkedLiteral(
+        return new ImmutableLinkedLiteral(
                 valueString,
                 datatype,
                 getPi(valueJsonObject, JsonLdKeyword.VALUE, JsonLdKeyword.TYPE));

diff --git a/src/main/java/com/apicatalog/linkedtree/jsonld/io/JsonLdTreeWriter.java b/src/main/java/com/apicatalog/linkedtree/jsonld/io/JsonLdTreeWriter.java
@@ -122,18 +122,18 @@ JsonValue writeLiteral(LinkedLiteral literal) {
 
             // 2.4.1.
             if (XsdConstants.STRING.equals(literal.datatype())) {
-                convertedValue = Json.createValue(literal.value());
+                convertedValue = Json.createValue(literal.lexicalValue());
 
             } else if (literal instanceof JsonScalar jsonScalar) {
                 convertedValue = jsonScalar.jsonValue();
 
             } else if (XsdConstants.BOOLEAN.equals(literal.datatype())) {
 
-                if ("true".equalsIgnoreCase(literal.value())) {
+                if ("true".equalsIgnoreCase(literal.lexicalValue())) {
 
                     convertedValue = JsonValue.TRUE;
 
-                } else if ("false".equalsIgnoreCase(literal.value())) {
+                } else if ("false".equalsIgnoreCase(literal.lexicalValue())) {
 
                     convertedValue = JsonValue.FALSE;
 
@@ -148,15 +148,15 @@ JsonValue writeLiteral(LinkedLiteral literal) {
 
             } else if (XsdConstants.INTEGER.equals(literal.datatype()) || XsdConstants.INT.equals(literal.datatype()) || XsdConstants.LONG.equals(literal.datatype())) {
 
-                convertedValue = Json.createValue(Long.parseLong(literal.value()));
+                convertedValue = Json.createValue(Long.parseLong(literal.lexicalValue()));
 
             } else if (literal instanceof JsonDecimal jsonDecimal) {
 
                 convertedValue = Json.createValue(jsonDecimal.doubleValue());
 
             } else if (XsdConstants.DOUBLE.equals(literal.datatype()) || XsdConstants.FLOAT.equals(literal.datatype())) {
 
-                convertedValue = Json.createValue(Double.parseDouble(literal.value()));
+                convertedValue = Json.createValue(Double.parseDouble(literal.lexicalValue()));
 
             } else if (literal instanceof NumericValue numericValue) {
 
@@ -168,7 +168,7 @@ JsonValue writeLiteral(LinkedLiteral literal) {
                 type = JsonLdKeyword.JSON;
 
             } else if (RdfConstants.JSON.equals(literal.datatype())) {
-                try (JsonParser parser = Json.createParser(new StringReader(literal.value()))) {
+                try (JsonParser parser = Json.createParser(new StringReader(literal.lexicalValue()))) {
 
                     parser.next();
 
@@ -227,7 +227,7 @@ JsonValue writeLiteral(LinkedLiteral literal) {
 
         result.add(JsonLdKeyword.VALUE, (convertedValue != null)
                 ? convertedValue
-                : Json.createValue(literal.value()));
+                : Json.createValue(literal.lexicalValue()));
 
         if (type != null) {
             result.add(JsonLdKeyword.TYPE, Json.createValue(type));

diff --git a/src/main/java/com/apicatalog/linkedtree/lang/ImmutableLangString.java b/src/main/java/com/apicatalog/linkedtree/lang/ImmutableLangString.java
@@ -3,7 +3,7 @@
 import com.apicatalog.linkedtree.pi.ProcessingInstruction;
 
 public record ImmutableLangString(
-        String value,
+        String lexicalValue,
         String language,
         LanguageDirectionType direction,
         ProcessingInstruction pi) implements LangString {

diff --git a/src/main/java/com/apicatalog/linkedtree/link/Link.java b/src/main/java/com/apicatalog/linkedtree/link/Link.java
@@ -13,7 +13,7 @@ public interface Link {
      * 
      * @return a collection of fragments in a tree
      */
-    Collection<LinkedFragment> fragments();
+    Collection<LinkedFragment> refs();
 
     /**
      * A fragment composed of all fragments - adapted if an adapter is present

diff --git a/src/main/java/com/apicatalog/linkedtree/link/MutableLink.java b/src/main/java/com/apicatalog/linkedtree/link/MutableLink.java
@@ -27,7 +27,7 @@ public String uri() {
     }
 
     @Override
-    public Collection<LinkedFragment> fragments() {
+    public Collection<LinkedFragment> refs() {
         return fragments;
     }
 

diff --git a/src/main/java/com/apicatalog/linkedtree/literal/DateTimeValue.java b/src/main/java/com/apicatalog/linkedtree/literal/DateTimeValue.java
@@ -0,0 +1,11 @@
+package com.apicatalog.linkedtree.literal;
+
+import java.time.Instant;
+
+import com.apicatalog.linkedtree.LinkedLiteral;
+
+public interface DateTimeValue extends LinkedLiteral {
+
+    Instant datetime();
+
+}
diff --git a/...dtree/primitive/GenericLinkedLiteral.java → ...dtree/literal/ImmutableLinkedLiteral.java b/...dtree/primitive/GenericLinkedLiteral.java → ...dtree/literal/ImmutableLinkedLiteral.java
@@ -1,10 +1,10 @@
-package com.apicatalog.linkedtree.primitive;
+package com.apicatalog.linkedtree.literal;
 
 import com.apicatalog.linkedtree.LinkedLiteral;
 import com.apicatalog.linkedtree.pi.ProcessingInstruction;
 
-public record GenericLinkedLiteral(
-        String value,
+public record ImmutableLinkedLiteral(
+        String lexicalValue,
         String datatype,
         ProcessingInstruction pi) implements LinkedLiteral {
 

diff --git a/src/main/java/com/apicatalog/linkedtree/xsd/XsdDateTime.java b/src/main/java/com/apicatalog/linkedtree/xsd/XsdDateTime.java
@@ -3,9 +3,10 @@
 import java.time.Instant;
 
 import com.apicatalog.linkedtree.LinkedLiteral;
+import com.apicatalog.linkedtree.literal.DateTimeValue;
 import com.apicatalog.linkedtree.pi.ProcessingInstruction;
 
-public class XsdDateTime implements LinkedLiteral {
+public class XsdDateTime implements LinkedLiteral, DateTimeValue {
 
     public static final String TYPE = XsdConstants.DATE_TIME;
 
@@ -33,6 +34,7 @@ public static XsdDateTime of(Instant datetime, ProcessingInstruction pi) {
         return new XsdDateTime(datetime, pi);
     }
 
+    @Override
     public Instant datetime() {
         if (datetime == null && value != null) {
             // TODO check
@@ -43,7 +45,7 @@ public Instant datetime() {
     }
 
     @Override
-    public String value() {
+    public String lexicalValue() {
         if (value == null && datetime != null) {
             // TODO
         }

diff --git a/src/test/java/com/apicatalog/linkedtree/jsonld/Base64ByteArray.java b/src/test/java/com/apicatalog/linkedtree/jsonld/Base64ByteArray.java
@@ -24,7 +24,7 @@ public static Base64ByteArray of(String value, ProcessingInstruction pi) {
     }
 
     @Override
-    public String value() {
+    public String lexicalValue() {
         if (value == null && byteArray != null) {
             value = Base64.getEncoder().encodeToString(byteArray);
         }

diff --git a/src/test/java/com/apicatalog/linkedtree/jsonld/JsonLdAdaptersTest.java b/src/test/java/com/apicatalog/linkedtree/jsonld/JsonLdAdaptersTest.java
@@ -66,12 +66,12 @@ void base64ByteArray() throws IOException, URISyntaxException {
                 .cast(ByteArrayValue.class);
 
         assertNotNull(literal);
-        assertEquals("RW5jb2RlIHRvIEJhc2U2NCBmb3JtYXQ=", literal.value());
+        assertEquals("RW5jb2RlIHRvIEJhc2U2NCBmb3JtYXQ=", literal.lexicalValue());
         assertTrue(literal instanceof ByteArrayValue);
         assertArrayEquals("Encode to Base64 format".getBytes(), ((ByteArrayValue) literal).byteArrayValue());
 
         ((Base64ByteArray) literal).byteArrayValue("test X".getBytes());
-        assertEquals("dGVzdCBY", literal.value());
+        assertEquals("dGVzdCBY", literal.lexicalValue());
 
         JsonArray copy = WRITER.writeExpanded(tree);
 
@@ -106,7 +106,7 @@ void verifiableCredential() throws IOException, URISyntaxException {
         })), vc.type());
 
         assertEquals(1, vc.name.size());
-        assertEquals("Alumni Credential", vc.name.single().value());
+        assertEquals("Alumni Credential", vc.name.single().lexicalValue());
         assertNull(vc.name.single().language());
 
         assertEquals(1, vc.name.strings().size());

diff --git a/src/test/java/com/apicatalog/linkedtree/jsonld/JsonLdLinkTest.java b/src/test/java/com/apicatalog/linkedtree/jsonld/JsonLdLinkTest.java
@@ -46,7 +46,7 @@ void singleRootLink() throws IOException, URISyntaxException {
         assertNotNull(tree.links());
         assertEquals(1, tree.links().size());
         assertNotNull(tree.links().iterator().next());
-        assertNotNull(tree.links().iterator().next().fragments());
+        assertNotNull(tree.links().iterator().next().refs());
         assertNotNull(tree.links().iterator().next().target());
         assertTrue(tree.links().iterator().next().target().isFragment());
 
@@ -63,7 +63,7 @@ void signedVcLinks() throws IOException, URISyntaxException {
         assertNotNull(tree.links());
         assertEquals(3, tree.links().size());
         assertNotNull(tree.links().iterator().next());
-        assertNotNull(tree.links().iterator().next().fragments());
+        assertNotNull(tree.links().iterator().next().refs());
         assertNotNull(tree.links().iterator().next().target());
         assertTrue(tree.links().iterator().next().target().isFragment());
     }