Simplify OpenAPI

Author: peacekeeper

openapi/openapi.yaml

@@ -454,10 +454,8 @@ components:
       type: array
       items:
         oneOf:
-          - $ref: "#/components/schemas/VerificationMethodPublicDataPublicKeyJwk"
-          - $ref: "#/components/schemas/VerificationMethodPublicDataPublicKeyMultibase"
-          - $ref: "#/components/schemas/VerificationMethodPrivateDataPrivateKeyJwk"
-          - $ref: "#/components/schemas/VerificationMethodPrivateDataPrivateKeyMultibase"
+          - $ref: "#/components/schemas/VerificationMethodPublicData"
+          - $ref: "#/components/schemas/VerificationMethodPrivateData"
     CreateRequest:
       description: Input fields for a DID create operation.
       allOf:
@@ -795,10 +793,8 @@ components:
       type: array
       items:
         oneOf:
-          - $ref: "#/components/schemas/VerificationMethodPublicDataPublicKeyJwk"
-          - $ref: "#/components/schemas/VerificationMethodPublicDataPublicKeyMultibase"
-          - $ref: "#/components/schemas/VerificationMethodPrivateDataPrivateKeyJwk"
-          - $ref: "#/components/schemas/VerificationMethodPrivateDataPrivateKeyMultibase"
+          - $ref: "#/components/schemas/VerificationMethodPublicData"
+          - $ref: "#/components/schemas/VerificationMethodPrivateData"
           - $ref: "#/components/schemas/DidStateSecretVerificationMethodVerificationMethodTemplate"
     DidStateSecretVerificationMethodVerificationMethodTemplate:
       type: array
@@ -985,46 +981,26 @@ components:
           type: array
           items:
             type: string
-    VerificationMethodPublicDataPublicKeyJwk:
+    VerificationMethodPublicData:
       description: A verification method public data object, see https://identity.foundation/did-registration/#verification-method-public-data
       allOf:
         - $ref: "#/components/schemas/VerificationMethodData"
         - type: object
-          required:
-            - publicKeyJwk
           properties:
             publicKeyJwk:
               type: object
               additionalProperties: { }
-    VerificationMethodPublicDataPublicKeyMultibase:
-      description: A verification method public data object, see https://identity.foundation/did-registration/#verification-method-public-data
-      allOf:
-        - $ref: "#/components/schemas/VerificationMethodData"
-        - type: object
-          required:
-            - publicKeyMultibase
-          properties:
             publicKeyMultibase:
               type: string
-    VerificationMethodPrivateDataPrivateKeyJwk:
+    VerificationMethodPrivateData:
       description: A verification method private data object, see https://identity.foundation/did-registration/#verification-method-private-data
       allOf:
         - $ref: "#/components/schemas/VerificationMethodData"
         - type: object
-          required:
-            - privateKeyJwk
           properties:
             privateKeyJwk:
               type: object
               additionalProperties: { }
-    VerificationMethodPrivateDataPrivateKeyMultibase:
-      description: A verification method private data object, see https://identity.foundation/did-registration/#verification-method-private-data
-      allOf:
-        - $ref: "#/components/schemas/VerificationMethodData"
-        - type: object
-          required:
-            - privateKeyMultibase
-          properties:
             privateKeyMultibase:
               type: string
     VerificationMethodTemplate:

uni-registrar-core/src/main/patches/DidStateRequestSecretVerificationMethodInner.patch

@@ -1,6 +1,6 @@
 --- src/main/java/uniregistrar/openapi/model/DidStateRequestSecretVerificationMethodInner.java	2026-01-19 14:00:12.159445907 +0100
 +++ src/main/java/uniregistrar/openapi/model/DidStateRequestSecretVerificationMethodInner.java.changed	2026-01-19 14:04:24.063072670 +0100
-@@ -104,17 +104,17 @@
+@@ -102,17 +102,17 @@
              try {
                  boolean attemptParsing = true;
                  // ensure that we respect type coercion as set on the client ObjectMapper
@@ -24,16 +24,16 @@
                      // TODO: there is no validation against JSON schema constraints
                      // (min, max, enum, pattern...), this does not perform a strict JSON
                      // validation, which means the 'match' count may be higher than it should be.
-@@ -280,7 +280,7 @@
+@@ -216,7 +216,7 @@
      }
 
      static {
 -        schemas.put("List<@Valid VerificationMethodTemplate>", List<@Valid VerificationMethodTemplate>.class);
 +        schemas.put("List<@Valid VerificationMethodTemplate>", List.class);
-         schemas.put("VerificationMethodPrivateDataPrivateKeyJwk", VerificationMethodPrivateDataPrivateKeyJwk.class);
-         schemas.put("VerificationMethodPrivateDataPrivateKeyMultibase", VerificationMethodPrivateDataPrivateKeyMultibase.class);
-         schemas.put("VerificationMethodPublicDataPublicKeyJwk", VerificationMethodPublicDataPublicKeyJwk.class);
-@@ -303,7 +303,7 @@
+         schemas.put("VerificationMethodPrivateData", VerificationMethodPrivateData.class);
+         schemas.put("VerificationMethodPublicData", VerificationMethodPublicData.class);
+         JSON.registerDescendants(DidStateRequestSecretVerificationMethodInner.class, Collections.unmodifiableMap(schemas));
+@@ -237,7 +237,7 @@
       */
      @Override
      public void setActualInstance(Object instance) {
@@ -42,7 +42,7 @@
              super.setActualInstance(instance);
              return;
          }
-@@ -349,7 +349,7 @@
+@@ -273,7 +273,7 @@
       * @return The actual instance of `List<@Valid VerificationMethodTemplate>`
       * @throws ClassCastException if the instance is not `List<@Valid VerificationMethodTemplate>`
       */
@@ -51,7 +51,7 @@
          return (List<@Valid VerificationMethodTemplate>)super.getActualInstance();
      }
 
-@@ -455,11 +455,11 @@
+@@ -345,11 +345,11 @@
          }
          return joiner.toString();
      }
@@ -60,8 +60,8 @@
          if (getActualInstance() != null) {
            for (int i = 0; i < ((List<@Valid VerificationMethodTemplate>)getActualInstance()).size(); i++) {
              if (((List<@Valid VerificationMethodTemplate>)getActualInstance()).get(i) != null) {
--              joiner.add(((VerificationMethodTemplate)getActualInstance()).get(i).toUrlQueryString(String.format(java.util.Locale.ROOT, "%sone_of_4%s%s", prefix, suffix,
-+              joiner.add(((List<@Valid VerificationMethodTemplate>)getActualInstance()).get(i).toUrlQueryString(String.format(java.util.Locale.ROOT, "%sone_of_4%s%s", prefix, suffix,
+-              joiner.add(((VerificationMethodTemplate)getActualInstance()).get(i).toUrlQueryString(String.format(java.util.Locale.ROOT, "%sone_of_2%s%s", prefix, suffix,
++              joiner.add(((List<@Valid VerificationMethodTemplate>)getActualInstance()).get(i).toUrlQueryString(String.format(java.util.Locale.ROOT, "%sone_of_2%s%s", prefix, suffix,
                "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
              }
            }