[Enhancement #37] Start migration to Jakarta JSON API.

This API is used by Titanium JSON-LD.

Author: ledsoft

pom.xml

@@ -33,6 +33,11 @@
             <artifactId>jopa-api</artifactId>
             <version>${cz.cvut.kbss.jopa.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <version>2.0.1</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
@@ -72,12 +77,19 @@
             <scope>test</scope>
         </dependency>
         <!-- JSON-LD Java implementation -->
+        <!-- TODO To remove -->
         <dependency>
             <groupId>com.github.jsonld-java</groupId>
             <artifactId>jsonld-java</artifactId>
             <version>${com.github.jsonld-java.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.apicatalog</groupId>
+            <artifactId>titanium-json-ld</artifactId>
+            <version>1.3.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

src/main/java/cz/cvut/kbss/jsonld/deserialization/JsonLdDeserializer.java

@@ -24,6 +24,7 @@
 import cz.cvut.kbss.jsonld.deserialization.util.TargetClassResolver;
 import cz.cvut.kbss.jsonld.deserialization.util.TargetClassResolverConfig;
 import cz.cvut.kbss.jsonld.deserialization.util.TypeMap;
+import jakarta.json.JsonValue;
 
 import java.util.Objects;
 
@@ -92,7 +93,7 @@ public <T> void registerDeserializer(Class<T> type, ValueDeserializer<T> deseria
      * @param resultClass Type of the result instance
      * @return Deserialized Java instance
      */
-    public abstract <T> T deserialize(Object jsonLd, Class<T> resultClass);
+    public abstract <T> T deserialize(JsonValue jsonLd, Class<T> resultClass);
 
     /**
      * Creates deserializer for expanded JSON-LD, initialized with the specified configuration.

src/main/java/cz/cvut/kbss/jsonld/deserialization/ValueDeserializer.java

@@ -2,8 +2,7 @@
 
 import cz.cvut.kbss.jsonld.Configuration;
 import cz.cvut.kbss.jsonld.common.Configurable;
-
-import java.util.Map;
+import jakarta.json.JsonValue;
 
 /**
  * Deserializes JSON-LD nodes to Java objects.
@@ -19,7 +18,7 @@ public interface ValueDeserializer<T> extends Configurable {
      * @param ctx      Deserialization context
      * @return Deserialized object
      */
-    T deserialize(Map<?, ?> jsonNode, DeserializationContext<T> ctx);
+    T deserialize(JsonValue jsonNode, DeserializationContext<T> ctx);
 
     /**
      * Applies the specified configuration to this deserializer.

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/DateDeserializer.java

@@ -3,10 +3,10 @@
 import cz.cvut.kbss.jsonld.Configuration;
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
+import jakarta.json.JsonValue;
 
 import java.time.OffsetDateTime;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * Deserializes values to {@link Date}.
@@ -20,7 +20,7 @@ public DateDeserializer(OffsetDateTimeDeserializer innerDeserializer) {
     }
 
     @Override
-    public Date deserialize(Map<?, ?> jsonNode, DeserializationContext<Date> ctx) {
+    public Date deserialize(JsonValue jsonNode, DeserializationContext<Date> ctx) {
         return Date.from(innerDeserializer.deserialize(jsonNode,
                 new DeserializationContext<>(OffsetDateTime.class, ctx.getClassResolver())).toInstant());
     }

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/DurationDeserializer.java

@@ -3,9 +3,10 @@
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 import java.time.Duration;
-import java.util.Map;
 
 import static cz.cvut.kbss.jsonld.deserialization.datetime.OffsetDateTimeDeserializer.getLiteralValue;
 
@@ -17,7 +18,7 @@
 public class DurationDeserializer implements ValueDeserializer<Duration> {
 
     @Override
-    public Duration deserialize(Map<?, ?> jsonNode, DeserializationContext<Duration> ctx) {
+    public Duration deserialize(JsonValue jsonNode, DeserializationContext<Duration> ctx) {
         final Object value = getLiteralValue(jsonNode);
         try {
             return Duration.parse(value.toString());

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/EpochBasedDateTimeResolver.java

@@ -2,6 +2,7 @@
 
 import cz.cvut.kbss.jopa.datatype.DateTimeUtil;
 import cz.cvut.kbss.jsonld.common.Configurable;
+import jakarta.json.JsonNumber;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -11,8 +12,8 @@
  */
 class EpochBasedDateTimeResolver implements Configurable {
 
-    OffsetDateTime resolve(Long value) {
+    OffsetDateTime resolve(JsonNumber value) {
         assert value != null;
-        return DateTimeUtil.toDateTime(Instant.ofEpochMilli(value));
+        return DateTimeUtil.toDateTime(Instant.ofEpochMilli(value.longValue()));
     }
 }

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/InstantDeserializer.java

@@ -3,10 +3,10 @@
 import cz.cvut.kbss.jsonld.Configuration;
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
+import jakarta.json.JsonValue;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
-import java.util.Map;
 
 /**
  * Deserializes values to {@link Instant}.
@@ -20,7 +20,7 @@ public InstantDeserializer(OffsetDateTimeDeserializer innerDeserializer) {
     }
 
     @Override
-    public Instant deserialize(Map<?, ?> jsonNode, DeserializationContext<Instant> ctx) {
+    public Instant deserialize(JsonValue jsonNode, DeserializationContext<Instant> ctx) {
         return innerDeserializer.deserialize(jsonNode,
                                              new DeserializationContext<>(OffsetDateTime.class, ctx.getClassResolver()))
                                 .toInstant();

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/LocalDateDeserializer.java

@@ -4,9 +4,9 @@
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
+import jakarta.json.JsonValue;
 
 import java.time.LocalDate;
-import java.util.Map;
 
 import static cz.cvut.kbss.jsonld.deserialization.datetime.OffsetDateTimeDeserializer.getLiteralValue;
 
@@ -18,7 +18,7 @@
 public class LocalDateDeserializer implements ValueDeserializer<LocalDate> {
 
     @Override
-    public LocalDate deserialize(Map<?, ?> jsonNode, DeserializationContext<LocalDate> ctx) {
+    public LocalDate deserialize(JsonValue jsonNode, DeserializationContext<LocalDate> ctx) {
         final Object value = getLiteralValue(jsonNode);
         try {
             return XsdDateMapper.map(value.toString());

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/LocalDateTimeDeserializer.java

@@ -3,10 +3,10 @@
 import cz.cvut.kbss.jsonld.Configuration;
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
+import jakarta.json.JsonValue;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-import java.util.Map;
 
 /**
  * Deserializes values to {@link LocalDateTime}.
@@ -20,7 +20,7 @@ public LocalDateTimeDeserializer(OffsetDateTimeDeserializer innerDeserializer) {
     }
 
     @Override
-    public LocalDateTime deserialize(Map<?, ?> jsonNode, DeserializationContext<LocalDateTime> ctx) {
+    public LocalDateTime deserialize(JsonValue jsonNode, DeserializationContext<LocalDateTime> ctx) {
         return innerDeserializer.deserialize(jsonNode, new DeserializationContext<>(OffsetDateTime.class, ctx.getClassResolver())).
                 toLocalDateTime();
     }

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/LocalTimeDeserializer.java

@@ -2,10 +2,10 @@
 
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
+import jakarta.json.JsonValue;
 
 import java.time.LocalTime;
 import java.time.OffsetTime;
-import java.util.Map;
 
 /**
  * Deserializes values to {@link LocalTime}.
@@ -21,7 +21,7 @@ public LocalTimeDeserializer(OffsetTimeDeserializer innerDeserializer) {
     }
 
     @Override
-    public LocalTime deserialize(Map<?, ?> jsonNode, DeserializationContext<LocalTime> ctx) {
+    public LocalTime deserialize(JsonValue jsonNode, DeserializationContext<LocalTime> ctx) {
         return innerDeserializer.deserialize(jsonNode,
                 new DeserializationContext<>(OffsetTime.class, ctx.getClassResolver())).toLocalTime();
     }

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/OffsetDateTimeDeserializer.java

@@ -5,9 +5,10 @@
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonValue;
 
 import java.time.OffsetDateTime;
-import java.util.Map;
 
 /**
  * Deserializes values to {@link OffsetDateTime}.
@@ -25,23 +26,22 @@ public class OffsetDateTimeDeserializer implements ValueDeserializer<OffsetDateT
     private final EpochBasedDateTimeResolver epochResolver = new EpochBasedDateTimeResolver();
 
     @Override
-    public OffsetDateTime deserialize(Map<?, ?> jsonNode, DeserializationContext<OffsetDateTime> ctx) {
-        final Object value = getLiteralValue(jsonNode);
+    public OffsetDateTime deserialize(JsonValue jsonNode, DeserializationContext<OffsetDateTime> ctx) {
+        final JsonValue value = getLiteralValue(jsonNode);
         try {
-            return value instanceof Long ? epochResolver.resolve((Long) value) :
+            return value.getValueType() == JsonValue.ValueType.NUMBER ? epochResolver.resolve((JsonNumber) value) :
                    stringResolver.resolve(value.toString());
         } catch (RuntimeException e) {
             throw new JsonLdDeserializationException("Unable to deserialize datetime value.", e);
         }
     }
 
-    static Object getLiteralValue(Map<?, ?> jsonNode) {
-        final Object value = jsonNode.get(JsonLd.VALUE);
-        if (value == null) {
+    static JsonValue getLiteralValue(JsonValue jsonNode) {
+        if (jsonNode.getValueType() != JsonValue.ValueType.OBJECT || !jsonNode.asJsonObject().containsKey(JsonLd.VALUE)) {
             throw new JsonLdDeserializationException("Cannot deserialize node " + jsonNode + "as literal. " +
                                                              "It is missing attribute '" + JsonLd.VALUE + "'.");
         }
-        return value;
+        return jsonNode.asJsonObject().get(JsonLd.VALUE);
     }
 
     @Override

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/OffsetTimeDeserializer.java

@@ -4,9 +4,9 @@
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
+import jakarta.json.JsonValue;
 
 import java.time.OffsetTime;
-import java.util.Map;
 
 import static cz.cvut.kbss.jsonld.deserialization.datetime.OffsetDateTimeDeserializer.getLiteralValue;
 
@@ -18,8 +18,8 @@
 public class OffsetTimeDeserializer implements ValueDeserializer<OffsetTime> {
 
     @Override
-    public OffsetTime deserialize(Map<?, ?> jsonNode, DeserializationContext<OffsetTime> ctx) {
-        final Object value = getLiteralValue(jsonNode);
+    public OffsetTime deserialize(JsonValue jsonNode, DeserializationContext<OffsetTime> ctx) {
+        final JsonValue value = getLiteralValue(jsonNode);
         try {
             return XsdTimeMapper.map(value.toString());
         } catch (RuntimeException e) {

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/PeriodDeserializer.java

@@ -3,9 +3,9 @@
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
+import jakarta.json.JsonValue;
 
 import java.time.Period;
-import java.util.Map;
 
 import static cz.cvut.kbss.jsonld.deserialization.datetime.OffsetDateTimeDeserializer.getLiteralValue;
 
@@ -17,8 +17,8 @@
 public class PeriodDeserializer implements ValueDeserializer<Period> {
 
     @Override
-    public Period deserialize(Map<?, ?> jsonNode, DeserializationContext<Period> ctx) {
-        final Object value = getLiteralValue(jsonNode);
+    public Period deserialize(JsonValue jsonNode, DeserializationContext<Period> ctx) {
+        final JsonValue value = getLiteralValue(jsonNode);
         try {
             return Period.parse(value.toString());
         } catch (RuntimeException e) {

src/main/java/cz/cvut/kbss/jsonld/deserialization/datetime/ZonedDateTimeDeserializer.java

@@ -3,10 +3,10 @@
 import cz.cvut.kbss.jsonld.Configuration;
 import cz.cvut.kbss.jsonld.deserialization.DeserializationContext;
 import cz.cvut.kbss.jsonld.deserialization.ValueDeserializer;
+import jakarta.json.JsonValue;
 
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
-import java.util.Map;
 
 /**
  * Deserializes values to {@link ZonedDateTime}.
@@ -20,7 +20,7 @@ public ZonedDateTimeDeserializer(OffsetDateTimeDeserializer innerDeserializer) {
     }
 
     @Override
-    public ZonedDateTime deserialize(Map<?, ?> jsonNode, DeserializationContext<ZonedDateTime> ctx) {
+    public ZonedDateTime deserialize(JsonValue jsonNode, DeserializationContext<ZonedDateTime> ctx) {
         return innerDeserializer.deserialize(jsonNode, new DeserializationContext<>(OffsetDateTime.class, ctx.getClassResolver()))
                 .toZonedDateTime();
     }

src/main/java/cz/cvut/kbss/jsonld/deserialization/expanded/ExpandedJsonLdDeserializer.java

@@ -21,9 +21,9 @@
 import cz.cvut.kbss.jsonld.deserialization.JsonLdDeserializer;
 import cz.cvut.kbss.jsonld.deserialization.reference.PendingReferenceRegistry;
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
-
-import java.util.List;
-import java.util.Map;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 public class ExpandedJsonLdDeserializer extends JsonLdDeserializer {
 
@@ -35,18 +35,18 @@ public ExpandedJsonLdDeserializer(Configuration configuration) {
     }
 
     @Override
-    public <T> T deserialize(Object jsonLd, Class<T> resultClass) {
-        if (!(jsonLd instanceof List)) {
+    public <T> T deserialize(JsonValue jsonLd, Class<T> resultClass) {
+        if (jsonLd.getValueType() != JsonValue.ValueType.ARRAY) {
             throw new JsonLdDeserializationException(
                     "Expanded JSON-LD deserializer requires a JSON-LD array as input.");
         }
-        final List<?> input = (List<?>) jsonLd;
+        final JsonArray input = jsonLd.asJsonArray();
         if (input.size() != 1) {
             throw new JsonLdDeserializationException(
                     "Input is not expanded JSON-LD. The input does not contain exactly one root element.");
         }
         deserializers.configure(configuration());
-        final Map<?, ?> root = (Map<?, ?>) input.get(0);
+        final JsonObject root = input.getJsonObject(0);
         final PendingReferenceRegistry referenceRegistry = new PendingReferenceRegistry();
         if (deserializers.hasCustomDeserializer(resultClass)) {
             final DeserializationContext<T> ctx = new DeserializationContext<>(resultClass, classResolver);

src/test/java/cz/cvut/kbss/jsonld/deserialization/expanded/ExpandedJsonLdDeserializerTest.java

@@ -12,6 +12,9 @@
  */
 package cz.cvut.kbss.jsonld.deserialization.expanded;
 
+import com.apicatalog.jsonld.api.ExpansionApi;
+import com.apicatalog.jsonld.document.Document;
+import com.apicatalog.jsonld.document.JsonDocument;
 import com.github.jsonldjava.core.JsonLdProcessor;
 import com.github.jsonldjava.utils.JsonUtils;
 import cz.cvut.kbss.jopa.model.annotations.Properties;
@@ -26,9 +29,11 @@
 import cz.cvut.kbss.jsonld.environment.Vocabulary;
 import cz.cvut.kbss.jsonld.environment.model.*;
 import cz.cvut.kbss.jsonld.exception.*;
+import jakarta.json.JsonArray;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.io.InputStream;
 import java.net.URI;
 import java.util.*;
 
@@ -802,4 +807,14 @@ void deserializeSupportsMappingIndividualToEnumConstant() throws Exception {
         assertThat(result.getPluralPropertyType(),
                    hasItems(OwlPropertyType.ANNOTATION_PROPERTY, OwlPropertyType.OBJECT_PROPERTY));
     }
+
+    @Test
+    void testReadingJsonLdWithTitanium() throws Exception {
+        final InputStream is = TestUtil.class.getClassLoader().getResourceAsStream("objectWithDataProperties.json");
+        assert is != null;
+        final Document doc = JsonDocument.of(is);
+        com.apicatalog.jsonld.JsonLd.compact(doc, null).get();
+        final JsonArray expanded = com.apicatalog.jsonld.JsonLd.expand(doc).get();
+
+    }
 }