Improve OpenAPI generation

Author: peacekeeper

openapi/openapi.yaml

@@ -390,6 +390,7 @@ components:
     RegistrarRequest:
       description: Input fields for a DID operation.
       type: object
+      x-parent: true
       properties:
         jobId:
           description: This input field is used to keep track of an ongoing DID operation
@@ -593,7 +594,6 @@ components:
       additionalProperties: { }
     DidDocumentController:
       oneOf:
-        - type: null
         - type: string
         - type: array
           items:
@@ -611,6 +611,7 @@ components:
     RegistrarState:
       description: The state after a DID operation.
       type: object
+      x-parent: true
       required:
         - didState
       properties:
@@ -628,6 +629,7 @@ components:
     RegistrarResourceState:
       description: The state after a DID URL operation.
       type: object
+      x-parent: true
       required:
         - didUrlState
       properties:
@@ -688,6 +690,7 @@ components:
     DidState:
       description: The current state of a DID.
       type: object
+      x-parent: true
       required:
         - state
       discriminator:
@@ -712,6 +715,7 @@ components:
     DidUrlState:
       description: The current state of a DID URL and associated resource.
       type: object
+      x-parent: true
       required:
         - state
       discriminator:
@@ -815,6 +819,7 @@ components:
     Secret:
       description: Secrets in requests and states.
       type: object
+      x-parent: true
       properties:
         verificationMethod:
           $ref: "#/components/schemas/SecretVerificationMethod"
@@ -953,6 +958,7 @@ components:
         $ref: "#/components/schemas/DecryptionResponse"
     VerificationMethodData:
       type: object
+      x-parent: true
       required:
         - type
       properties:

pom.xml

@@ -75,16 +75,16 @@
 
 		<!-- Plugin Versions -->
 
-		<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
-		<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
-		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-		<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
-		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-		<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-		<maven-patch-plugin.version>1.2</maven-patch-plugin.version>
+		<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
+		<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
+		<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
+		<maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
+		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+		<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+		<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
+		<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
+		<maven-release-plugin.version>3.3.1</maven-release-plugin.version>
+		<maven-patch-plugin.version>1.3</maven-patch-plugin.version>
 
 		<!-- Testing Versions -->
 
@@ -107,7 +107,7 @@
 
 		<!-- OpenAPI Versions -->
 
-		<openapi-generator.version>7.4.0</openapi-generator.version>
+		<openapi-generator.version>7.18.0</openapi-generator.version>
 		<jakarta-annotation.version>3.0.0</jakarta-annotation.version>
 		<jakarta-validation.version>3.1.1</jakarta-validation.version>
 
@@ -198,7 +198,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<release>${java.version}</release>
-					<forceJavacCompilerUse>true</forceJavacCompilerUse>
+					<forceLegacyJavacApi>true</forceLegacyJavacApi>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -222,7 +222,7 @@
 						<configuration>
 							<rules>
 								<requireMavenVersion>
-									<version>3.2.5</version>
+									<version>3.6.3</version>
 								</requireMavenVersion>
 							</rules>
 							<fail>true</fail>

uni-registrar-core/pom.xml

@@ -48,7 +48,6 @@
 							<apiPackage>uniregistrar.openapi.api</apiPackage>
 							<modelPackage>uniregistrar.openapi.model</modelPackage>
 							<invokerPackage>uniregistrar.openapi</invokerPackage>
-							<openapiNormalizer>REF_AS_PARENT_IN_ALLOF=true</openapiNormalizer>
 							<configOptions>
 								<basePackage>uniregistrar</basePackage>
 								<sourceFolder>src/main/java/</sourceFolder>
@@ -58,6 +57,7 @@
 								<configPackage>uniregistrar.openapi.config</configPackage>
 								<asyncNative>false</asyncNative>
 								<disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
+								<legacyDiscriminatorBehavior>false</legacyDiscriminatorBehavior>
 								<library>native</library>
 								<useBeanValidation>true</useBeanValidation>
 								<dateLibrary>java8</dateLibrary>

uni-registrar-core/src/main/patches/DecryptionRequest.java.patch

@@ -0,0 +1,68 @@
+--- src/main/java/uniregistrar/openapi/model/DidDocumentController.java	2026-01-19 13:55:05.276890450 +0100
++++ src/main/java/uniregistrar/openapi/model/DidDocumentController.java.changed	2026-01-19 13:53:22.947007764 +0100
+@@ -94,17 +94,17 @@
+             try {
+                 boolean attemptParsing = true;
+                 // ensure that we respect type coercion as set on the client ObjectMapper
+-                if (List<String>.class.equals(Integer.class) || List<String>.class.equals(Long.class) || List<String>.class.equals(Float.class) || List<String>.class.equals(Double.class) || List<String>.class.equals(Boolean.class) || List<String>.class.equals(String.class)) {
++                if (List.class.equals(Integer.class) || List.class.equals(Long.class) || List.class.equals(Float.class) || List.class.equals(Double.class) || List.class.equals(Boolean.class) || List.class.equals(String.class)) {
+                     attemptParsing = typeCoercion;
+                     if (!attemptParsing) {
+-                        attemptParsing |= ((List<String>.class.equals(Integer.class) || List<String>.class.equals(Long.class)) && token == JsonToken.VALUE_NUMBER_INT);
+-                        attemptParsing |= ((List<String>.class.equals(Float.class) || List<String>.class.equals(Double.class)) && token == JsonToken.VALUE_NUMBER_FLOAT);
+-                        attemptParsing |= (List<String>.class.equals(Boolean.class) && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
+-                        attemptParsing |= (List<String>.class.equals(String.class) && token == JsonToken.VALUE_STRING);
++                        attemptParsing |= ((List.class.equals(Integer.class) || List.class.equals(Long.class)) && token == JsonToken.VALUE_NUMBER_INT);
++                        attemptParsing |= ((List.class.equals(Float.class) || List.class.equals(Double.class)) && token == JsonToken.VALUE_NUMBER_FLOAT);
++                        attemptParsing |= (List.class.equals(Boolean.class) && (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
++                        attemptParsing |= (List.class.equals(String.class) && token == JsonToken.VALUE_STRING);
+                     }
+                 }
+                 if (attemptParsing) {
+-                    deserialized = tree.traverse(jp.getCodec()).readValueAs(List<String>.class);
++                    deserialized = tree.traverse(jp.getCodec()).readValueAs(List.class);
+                     // 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.
+@@ -232,7 +232,7 @@
+     }
+
+     static {
+-        schemas.put("List<String>", List<String>.class);
++        schemas.put("List<String>", List.class);
+         schemas.put("String", String.class);
+         JSON.registerDescendants(DidDocumentController.class, Collections.unmodifiableMap(schemas));
+     }
+@@ -252,7 +252,7 @@
+      */
+     @Override
+     public void setActualInstance(Object instance) {
+-        if (JSON.isInstanceOf(List<String>.class, instance, new HashSet<Class<?>>())) {
++        if (JSON.isInstanceOf(List.class, instance, new HashSet<Class<?>>())) {
+             super.setActualInstance(instance);
+             return;
+         }
+@@ -283,7 +283,7 @@
+      * @return The actual instance of `List<String>`
+      * @throws ClassCastException if the instance is not `List<String>`
+      */
+-    public List<String> getList<String>() throws ClassCastException {
++    public List<String> getList() throws ClassCastException {
+         return (List<String>)super.getActualInstance();
+     }
+
+@@ -338,12 +338,12 @@
+         }
+         return joiner.toString();
+     }
+-    if (getActualInstance() instanceof List<String>) {
++    if (getActualInstance() instanceof List) {
+         if (getActualInstance() != null) {
+           for (int i = 0; i < ((List<String>)getActualInstance()).size(); i++) {
+             joiner.add(String.format(java.util.Locale.ROOT, "%sone_of_1%s%s=%s", prefix, suffix,
+                 "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
+-                ApiClient.urlEncode(String.valueOf(getActualInstance().get(i)))));
++                ApiClient.urlEncode(String.valueOf(((List<String>)getActualInstance()).get(i)))));
+           }
+         }
+         return joiner.toString();