Update support for jobId

Author: peacekeeper

openapi-godiddy-api/openapi.yaml

@@ -2472,7 +2472,10 @@ components:
           description: This input field is used to keep track of an ongoing DID operation
             process. See <a
             href="https://identity.foundation/did-registration/#jobid">https://identity.foundation/did-registration/#jobid</a>.
-          type: string
+          oneOf:
+            - type: null
+            - type: string
+            - type: object
           example: 6d85bcd0-2ea3-4288-ab00-15afadd8a156
         options:
           $ref: "#/components/schemas/RequestOptions"
@@ -2741,7 +2744,10 @@ components:
         - didState
       properties:
         jobId:
-          type: string
+          oneOf:
+            - type: null
+            - type: string
+            - type: object
           example: 6d85bcd0-2ea3-4288-ab00-15afadd8a156
         didState:
           $ref: "#/components/schemas/DidState"
@@ -2759,7 +2765,10 @@ components:
         - didUrlState
       properties:
         jobId:
-          type: string
+          oneOf:
+            - type: null
+            - type: string
+            - type: object
           example: 6d85bcd0-2ea3-4288-ab00-15afadd8a156
         didUrlState:
           $ref: "#/components/schemas/DidUrlState"
@@ -4145,4 +4154,4 @@ components:
         revoked:
           type: boolean
         metadata:
-          type: object
+          type: object

src/main/java/com/godiddy/cli/commands/registrar/CreateCommand.java

@@ -1,9 +1,6 @@
 package com.godiddy.cli.commands.registrar;
 
-import com.godiddy.api.client.openapi.model.CreateRequest;
-import com.godiddy.api.client.openapi.model.DidDocument;
-import com.godiddy.api.client.openapi.model.RequestOptions;
-import com.godiddy.api.client.openapi.model.RequestSecret;
+import com.godiddy.api.client.openapi.model.*;
 import com.godiddy.cli.GodiddyAbstractCommand;
 import com.godiddy.cli.config.Api;
 import com.godiddy.cli.clistorage.clistate.CLIState;
@@ -152,11 +149,13 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         DidDocument didDocument = this.didDocument.isBlank() ? null : Api.fromJson(this.didDocument, DidDocument.class);
 
         String method = this.method;
         CreateRequest request = new CreateRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setOptions(requestOptions);
         request.setSecret(requestSecret);
         request.setDidDocument(didDocument);

src/main/java/com/godiddy/cli/commands/registrar/DeactivateCommand.java

@@ -1,6 +1,7 @@
 package com.godiddy.cli.commands.registrar;
 
 import com.godiddy.api.client.openapi.model.DeactivateRequest;
+import com.godiddy.api.client.openapi.model.RegistrarRequestJobId;
 import com.godiddy.api.client.openapi.model.RequestOptions;
 import com.godiddy.api.client.openapi.model.RequestSecret;
 import com.godiddy.cli.GodiddyAbstractCommand;
@@ -107,8 +108,10 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         DeactivateRequest request = new DeactivateRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setDid(this.did);
         request.setOptions(requestOptions);
         request.setSecret(requestSecret);

src/main/java/com/godiddy/cli/commands/registrar/ExecuteCommand.java

@@ -1,6 +1,7 @@
 package com.godiddy.cli.commands.registrar;
 
 import com.godiddy.api.client.openapi.model.ExecuteRequest;
+import com.godiddy.api.client.openapi.model.RegistrarRequestJobId;
 import com.godiddy.api.client.openapi.model.RequestOptions;
 import com.godiddy.api.client.openapi.model.RequestSecret;
 import com.godiddy.cli.GodiddyAbstractCommand;
@@ -88,12 +89,14 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         List<String> operation = Collections.singletonList(this.operation);
 
         List<Object> operationData = this.operationData == null ? Collections.singletonList(new HashMap<>()) : Collections.singletonList(this.operationData);
 
         ExecuteRequest request = new ExecuteRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setDid(this.did);
         request.setOptions(requestOptions);
         request.setSecret(requestSecret);

src/main/java/com/godiddy/cli/commands/registrar/UpdateCommand.java

@@ -152,6 +152,8 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         List<String> didDocumentOperation = Collections.singletonList(this.didDocumentOperation);
 
         List<DidDocument> didDocument = Collections.singletonList(Api.fromJson(this.didDocument, DidDocument.class));
@@ -162,7 +164,7 @@ public Integer call() throws Exception {
         }
 
         UpdateRequest request = new UpdateRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setDid(this.did);
         request.setOptions(requestOptions);
         request.setSecret(requestSecret);

src/main/java/com/godiddy/cli/commands/resource/CreateResourceCommand.java

@@ -1,6 +1,7 @@
 package com.godiddy.cli.commands.resource;
 
 import com.godiddy.api.client.openapi.model.CreateResourceRequest;
+import com.godiddy.api.client.openapi.model.RegistrarRequestJobId;
 import com.godiddy.api.client.openapi.model.RequestOptions;
 import com.godiddy.api.client.openapi.model.RequestSecret;
 import com.godiddy.cli.GodiddyAbstractCommand;
@@ -94,10 +95,12 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         String content = this.content.isBlank() ? null : this.content;
 
         CreateResourceRequest request = new CreateResourceRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setDid(this.did);
         request.setRelativeDidUrl(this.relativeDidUrl);
         request.setOptions(requestOptions);

src/main/java/com/godiddy/cli/commands/resource/DeactivateResourceCommand.java

@@ -1,6 +1,7 @@
 package com.godiddy.cli.commands.resource;
 
 import com.godiddy.api.client.openapi.model.DeactivateResourceRequest;
+import com.godiddy.api.client.openapi.model.RegistrarRequestJobId;
 import com.godiddy.api.client.openapi.model.RequestOptions;
 import com.godiddy.api.client.openapi.model.RequestSecret;
 import com.godiddy.cli.GodiddyAbstractCommand;
@@ -80,8 +81,10 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         DeactivateResourceRequest request = new DeactivateResourceRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setDid(this.did);
         request.setOptions(requestOptions);
         request.setSecret(requestSecret);

src/main/java/com/godiddy/cli/commands/resource/UpdateResourceCommand.java

@@ -1,5 +1,6 @@
 package com.godiddy.cli.commands.resource;
 
+import com.godiddy.api.client.openapi.model.RegistrarRequestJobId;
 import com.godiddy.api.client.openapi.model.RequestOptions;
 import com.godiddy.api.client.openapi.model.RequestSecret;
 import com.godiddy.api.client.openapi.model.UpdateResourceRequest;
@@ -96,12 +97,14 @@ public Integer call() throws Exception {
         RequestSecret requestSecret = new RequestSecret();
         if (this.secret != null) this.secret.forEach(requestSecret::putAdditionalProperty);
 
+        RegistrarRequestJobId registrarRequestJobId = this.jobId == null ? null : new RegistrarRequestJobId(this.jobId);
+
         List<String> contentOperation = this.contentOperation.isBlank() ? Collections.emptyList() : Collections.singletonList(this.contentOperation);
 
         List<String> content = this.content.isBlank() ? Collections.emptyList() : Collections.singletonList(this.content);
 
         UpdateResourceRequest request = new UpdateResourceRequest();
-        request.setJobId(this.jobId);
+        request.setJobId(registrarRequestJobId);
         request.setDid(this.did);
         request.setRelativeDidUrl(this.relativeDidUrl);
         request.setOptions(requestOptions);

src/main/java/com/godiddy/cli/config/Api.java

@@ -4,15 +4,13 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.godiddy.api.client.ApiClient;
 import com.godiddy.api.client.ApiResponse;
 import com.godiddy.api.client.openapi.api.*;
 import com.godiddy.api.client.openapi.model.*;
-import com.godiddy.cli.clistorage.clistate.CLIState;
 import uniregistrar.openapi.RFC3339DateFormat;
 
 import java.io.*;
@@ -23,7 +21,6 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
@@ -32,7 +29,7 @@
 
 public class Api {
 
-    private static final ObjectMapper objectMapper = JsonMapper.builder()
+    private static final JsonMapper jsonMapper = JsonMapper.builder()
             .serializationInclusion(JsonInclude.Include.NON_NULL)
             .disable(MapperFeature.ALLOW_COERCION_OF_SCALARS)
             .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
@@ -143,14 +140,14 @@ public static <T> T execute(Callable<ApiResponse<T>> supplier) throws Exception
 
     public static void writeJson(File file, Object object, boolean pretty) throws IOException {
         if (pretty) {
-            objectMapper.writerWithDefaultPrettyPrinter().writeValue(file, object);
+            jsonMapper.writerWithDefaultPrettyPrinter().writeValue(file, object);
         } else {
-            objectMapper.writeValue(file, object);
+            jsonMapper.writeValue(file, object);
         }
     }
 
     public static Object readJson(File file, Class cl) throws IOException {
-        return objectMapper.readValue(file, cl);
+        return jsonMapper.readValue(file, cl);
     }
 
     public static Map<String, Object> fromJson(String json) {
@@ -159,14 +156,22 @@ public static Map<String, Object> fromJson(String json) {
 
     public static <T> T fromJson(String json, Class<T> cl) {
         try {
-            return objectMapper.readValue(json, cl);
+            return jsonMapper.readValue(json, cl);
         } catch (JsonProcessingException ex) {
             throw new IllegalArgumentException(ex);
         }
     }
 
     public static <T> T convert(Object object, Class<T> cl) {
-        return objectMapper.convertValue(object, cl);
+        return jsonMapper.convertValue(object, cl);
+    }
+
+    public static String string(Object object) {
+        try {
+            return jsonMapper.writeValueAsString(object);
+        } catch (JsonProcessingException ex) {
+            throw new IllegalArgumentException(ex.getMessage(), ex);
+        }
     }
 
     public static void print(Object object) {
@@ -193,11 +198,11 @@ private static void print(Object object, String interpretedString, Formatting.Va
             if (formatting == Formatting.Value.interpreted) {
                 string = interpretedString == null ? "(null)" : interpretedString;
             } else if (formatting == Formatting.Value.pretty) {
-                if (object instanceof String) object = objectMapper.readValue((String) object, Object.class);
-                string = object == null ? "(null)" : objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(object);
+                if (object instanceof String) object = jsonMapper.readValue((String) object, Object.class);
+                string = object == null ? "(null)" : jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(object);
             } else if (formatting == Formatting.Value.flat) {
-                if (object instanceof String) object = objectMapper.readValue((String) object, Object.class);
-                string = object == null ? "(null)" : objectMapper.writeValueAsString(object);
+                if (object instanceof String) object = jsonMapper.readValue((String) object, Object.class);
+                string = object == null ? "(null)" : jsonMapper.writeValueAsString(object);
             } else if (formatting == Formatting.Value.raw) {
                 string = object == null ? "(null)" : object.toString();
             } else if (formatting == Formatting.Value.off) {
@@ -235,7 +240,7 @@ public static void printHeaders(HttpHeaders httpHeaders, String prefix) {
 
     private static String constructInterpretedString(RegistrarRequest registrarRequest) {
         String name = registrarRequest.getClass().getSimpleName();
-        String jobId = registrarRequest.getJobId();
+        String jobId = "" + (registrarRequest.getJobId() == null ? "" : registrarRequest.getJobId().getString());
         String didDocumentVerificationMethods = "" + (! (registrarRequest instanceof CreateRequest createRequest) ? 0 : createRequest.getDidDocument() == null ? 0 : createRequest.getDidDocument().getVerificationMethod() == null ? 0 : createRequest.getDidDocument().getVerificationMethod().size()) + " DID document verification methods";
         String secretVerificationMethods = "" + (registrarRequest.getSecret() == null ? 0 : registrarRequest.getSecret().getVerificationMethod() == null ? 0 : registrarRequest.getSecret().getVerificationMethod().size()) + " secret verification methods";
         String signingResponses = "" + (registrarRequest.getSecret() == null ? 0 : registrarRequest.getSecret().getSigningResponse() == null ? 0 : registrarRequest.getSecret().getSigningResponse().size()) + " signing responses";
@@ -257,7 +262,7 @@ private static String constructInterpretedString(RegistrarRequest registrarReque
 
     private static String constructInterpretedString(RegistrarState registrarState) {
         String name = registrarState.getClass().getSimpleName();
-        String jobId = registrarState.getJobId();
+        String jobId = "" + (registrarState.getJobId() == null ? "" : string(registrarState.getJobId()));
         String state = registrarState.getDidState() == null ? "null" : registrarState.getDidState().getState();
         String action = ! (registrarState.getDidState() instanceof DidStateAction didStateAction) ? "null" : didStateAction.getAction() == null ? "null" : didStateAction.getAction();
         String did = registrarState.getDidState() == null ? "null" : registrarState.getDidState().getDid();
@@ -288,7 +293,7 @@ private static String constructInterpretedString(RegistrarState registrarState)
 
     private static String constructInterpretedString(RegistrarResourceState registrarResourceState) {
         String name = registrarResourceState.getClass().getSimpleName();
-        String jobId = registrarResourceState.getJobId();
+        String jobId = "" + (registrarResourceState.getJobId() == null ? "" : registrarResourceState.getJobId().getString());
         String state = registrarResourceState.getDidUrlState() == null ? "null" : registrarResourceState.getDidUrlState().getState();
         String action = ! (registrarResourceState.getDidUrlState() instanceof DidUrlStateAction didUrlStateAction) ? "null" : didUrlStateAction.getAction() == null ? "null" : didUrlStateAction.getAction();
         String didUrl = registrarResourceState.getDidUrlState() == null ? "null" : registrarResourceState.getDidUrlState().getDidUrl();