Enhancing parsing of queued-translation-job results (#55)

My earlier fix for PLAT-5219 was flawed. Part of the fix requires this fix for JSON parsing of results from queued-translation-jobs. This will also be good for other users of api-client-java. [PLAT-5219](https://vertexvis.atlassian.net/browse/PLAT-5219)
Vertexvis · Dec 6, 2024 · ceba23b · ceba23b
1 parent 0eaa0d4
commit ceba23b
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.vertexvis'
-version = '0.8.3'
+version = '0.8.4'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/com/vertexvis/ApiClient.java b/src/main/java/com/vertexvis/ApiClient.java
@@ -22,7 +22,6 @@
 import okio.BufferedSink;
 import okio.Okio;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
-import org.apache.oltu.oauth2.common.message.types.GrantType;
 
 import javax.net.ssl.*;
 import java.io.File;
@@ -41,7 +40,6 @@
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
 import java.text.DateFormat;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -54,7 +52,6 @@
 
 import com.vertexvis.auth.Authentication;
 import com.vertexvis.auth.HttpBasicAuth;
-import com.vertexvis.auth.HttpBearerAuth;
 import com.vertexvis.auth.ApiKeyAuth;
 import com.vertexvis.auth.OAuth;
 import com.vertexvis.auth.RetryingOAuth;

diff --git a/src/main/java/com/vertexvis/JSON.java b/src/main/java/com/vertexvis/JSON.java
@@ -137,6 +137,10 @@ public JSON() {
                     OneOfUpdateItemToDefaultRenditionOperation.class,
                     new OneOfUpdateItemToDefaultRenditionOperationTypeAdapter(() -> gson)
                 )
+                .registerTypeAdapter(
+                    AnyOfGeometrySetDataPartRevisionDataPartRenditionData.class,
+                    new AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTypeAdapter(() -> gson)
+                )
                 .create();
     }
 

diff --git a/...model/serialization/AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTypeAdapter.java b/...model/serialization/AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTypeAdapter.java
@@ -0,0 +1,64 @@
+package com.vertexvis.model.serialization;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.TypeAdapter;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.vertexvis.model.AnyOfGeometrySetDataPartRevisionDataPartRenditionData;
+import com.vertexvis.model.GeometrySetData;
+import com.vertexvis.model.PartRendition;
+import com.vertexvis.model.PartRenditionData;
+import com.vertexvis.model.PartRevisionData;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+public class AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTypeAdapter extends TypeAdapter<AnyOfGeometrySetDataPartRevisionDataPartRenditionData>
+{
+    private final Supplier<Gson> gsonSupplier;
+
+    public AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTypeAdapter(Supplier<Gson> gsonSupplier) {
+        this.gsonSupplier = gsonSupplier;
+    }
+
+    @Override
+    public void write(JsonWriter out, AnyOfGeometrySetDataPartRevisionDataPartRenditionData value)
+        throws IOException {
+        if (value != null && value.getRel() != null) {
+            out.jsonValue(gsonSupplier.get().toJson(value.getRel()));
+        }
+        else {
+            out.jsonValue(null);
+        }
+    }
+
+    @Override
+    public AnyOfGeometrySetDataPartRevisionDataPartRenditionData read(JsonReader in) throws IOException {
+        TypeAdapter<JsonElement> jsonAdapter = gsonSupplier.get().getAdapter(JsonElement.class);
+        TypeAdapter<PartRevisionData> partRevisionDataTypeAdapter =
+            gsonSupplier.get().getAdapter(TypeToken.get(PartRevisionData.class));
+        TypeAdapter<GeometrySetData> geometrySetDataTypeAdapter =
+            gsonSupplier.get().getAdapter(TypeToken.get(GeometrySetData.class));
+        TypeAdapter<PartRenditionData> partRenditionDataTypeAdapter =
+            gsonSupplier.get().getAdapter(TypeToken.get(PartRenditionData.class));
+
+        JsonObject json = jsonAdapter.read(in).getAsJsonObject();
+        String type = json.get("type").getAsString();
+
+        return switch (type) {
+            case "part-revision" -> new AnyOfGeometrySetDataPartRevisionDataPartRenditionData(
+                partRevisionDataTypeAdapter.fromJsonTree(json)
+            );
+            case "geometry-set" -> new AnyOfGeometrySetDataPartRevisionDataPartRenditionData(
+                geometrySetDataTypeAdapter.fromJsonTree(json)
+            );
+            case "part-rendition" -> new AnyOfGeometrySetDataPartRevisionDataPartRenditionData(
+                partRenditionDataTypeAdapter.fromJsonTree(json)
+            );
+            default -> throw new IOException("JSON deserializer not implemented for type " + type);
+        };
+    }
+}
diff --git a/...t/java/com/vertexvis/model/AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTest.java b/...t/java/com/vertexvis/model/AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTest.java
@@ -0,0 +1,66 @@
+package com.vertexvis.model;
+
+import com.google.gson.reflect.TypeToken;
+import com.vertexvis.JSON;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+
+public class AnyOfGeometrySetDataPartRevisionDataPartRenditionDataTest
+{
+    @Test
+    public void deserializesIncludedPartRevision() {
+        var s = "{\"data\":{\"type\":\"queued-translation-job\",\"id\":\"fcd6ab7e-a0d2-4803-bd60-ba0950ca42a3\",\"attributes\":{\"status\":\"complete\",\"created\":\"2024-12-05T14:36:42.079684Z\",\"completed\":\"2024-12-05T14:36:44.814141Z\"},\"relationships\":{\"partRevision\":{\"data\":{\"type\":\"part-revision\",\"id\":\"ca3b2213-a0ac-43fe-bd9b-9ac74f0c847f\"}}}},\"included\":[{\"type\":\"part-revision\",\"id\":\"ca3b2213-a0ac-43fe-bd9b-9ac74f0c847f\",\"attributes\":{\"created\":\"2024-12-05T14:36:44.794028Z\",\"suppliedId\":\"33000058/A-test28\",\"name\":\"33000058/A;1-spool\"},\"relationships\":{\"geometrySet\":{\"type\":\"geometry-set\",\"id\":\"2b4f26fa-ef4b-4c81-a688-b513be54f4bf\"},\"part\":{\"type\":\"part\",\"id\":\"bb7537e9-57d9-49db-aa43-feb974f5ec46\"},\"defaultPartRendition\":{\"data\":{\"type\":\"part-rendition\",\"id\":\"1580b1f2-8bca-472c-95c5-964938a45048\"}}}}]}";
+        var j = new JSON();
+        var d = (QueuedTranslationJob)j.deserialize(s, new TypeToken<QueuedTranslationJob>(){}.getType());
+
+        assertEquals(1, d.getIncluded().size());
+        var i = d.getIncluded().get(0);
+        assertFalse(i.isPartRenditionData());
+        assertTrue(i.isPartRevisionData());
+        assertFalse(i.isGeometrySetData());
+        var r = i.getPartRevisionData().getRelationships();
+        assertNotNull(r.getGeometrySet());
+        assertNotNull(r.getPart());
+        assertNotNull(r.getDefaultPartRendition());
+        assertEquals(UUID.fromString("bb7537e9-57d9-49db-aa43-feb974f5ec46"), r.getPart().getId());
+    }
+
+    @Test
+    public void deserializesIncludedPartRendition() {
+        var s = "{\"data\":{\"type\":\"queued-translation-job\",\"id\":\"17c24737-c4f7-4476-afe2-4b6aa99210d6\",\"attributes\":{\"status\":\"complete\",\"created\":\"2024-12-05T21:07:12.925485Z\",\"completed\":\"2024-12-05T21:07:15.707787Z\"},\"relationships\":{\"partRendition\":{\"data\":{\"type\":\"part-rendition\",\"id\":\"0977d14d-e9b5-4463-ba4b-5018b7ca0478\"}}}},\"included\":[{\"type\":\"part-rendition\",\"id\":\"0977d14d-e9b5-4463-ba4b-5018b7ca0478\",\"attributes\":{\"created\":\"2024-12-05T21:07:15.669542Z\",\"suppliedId\":\"block_re_1\",\"name\":\"block_re\"},\"relationships\":{\"geometrySet\":{\"type\":\"geometry-set\",\"id\":\"fe7657bf-0c27-4aef-a0a1-0ce749ea1c56\"},\"partRevision\":{\"data\":{\"type\":\"part-revision\",\"id\":\"8671279d-a28e-4ac1-b0cf-5a73d53ca646\"}}}}]}";
+        var j = new JSON();
+        var d = (QueuedTranslationJob)j.deserialize(s, new TypeToken<QueuedTranslationJob>(){}.getType());
+
+        assertEquals(1, d.getIncluded().size());
+        var i = d.getIncluded().get(0);
+        assertTrue(i.isPartRenditionData());
+        assertFalse(i.isPartRevisionData());
+        assertFalse(i.isGeometrySetData());
+        var r = i.getPartRenditionData().getRelationships();
+        assertNotNull(r.getGeometrySet());
+        assertNotNull(r.getPartRevision());
+        assertEquals(UUID.fromString("8671279d-a28e-4ac1-b0cf-5a73d53ca646"), r.getPartRevision().getData().getId());
+    }
+
+    @Test
+    public void deserializedIncludedGeometrySet() {
+        var s = "{\"data\":{\"type\":\"queued-translation-job\",\"id\":\"a60bd7eb-b0be-4d2b-b16a-9e15fc71cb4c\",\"attributes\":{\"status\":\"complete\",\"created\":\"2024-12-05T21:14:17.790431Z\",\"completed\":\"2024-12-05T21:14:20.863382Z\"},\"relationships\":{\"geometrySet\":{\"data\":{\"type\":\"geometry-set\",\"id\":\"df9a193c-d518-46b7-8a20-f4e204c51b3b\"}}}},\"included\":[{\"type\":\"geometry-set\",\"id\":\"df9a193c-d518-46b7-8a20-f4e204c51b3b\",\"attributes\":{\"created\":\"2024-12-05T21:14:20.573297Z\"}}]}";
+        var j = new JSON();
+        var d = (QueuedTranslationJob)j.deserialize(s, new TypeToken<QueuedTranslationJob>(){}.getType());
+
+        assertEquals(1, d.getIncluded().size());
+        var i = d.getIncluded().get(0);
+        assertFalse(i.isPartRenditionData());
+        assertFalse(i.isPartRevisionData());
+        assertTrue(i.isGeometrySetData());
+        var r = i.getGeometrySetData();
+        assertEquals(UUID.fromString("df9a193c-d518-46b7-8a20-f4e204c51b3b"), r.getId());
+    }
+}