[java][microprofile] Extend support for useOneOfInterfaces to the microprofile library when Jackson serialisation is enabled

bin/configs/java-microprofile-oneof-interface.yaml

@@ -0,0 +1,11 @@
+generatorName: java
+outputDir: samples/client/petstore/java/microprofile-oneof-interface
+library: microprofile
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/oneof_interface_petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  serializationLibrary: jackson
+  artifactId: microprofile-oneof-interface
+  useOneOfInterfaces: "true"
+  microprofileRestClientVersion: "3.0"
+  hideGenerationTimestamp: true

modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache

@@ -58,7 +58,12 @@ import {{rootJavaEEPackage}}.validation.Valid;
 
 {{/isEnum}}
 {{^isEnum}}
+{{#vendorExtensions.x-is-one-of-interface}}
+{{>oneof_interface}}
+{{/vendorExtensions.x-is-one-of-interface}}
+{{^vendorExtensions.x-is-one-of-interface}}
 {{>pojo}}
+{{/vendorExtensions.x-is-one-of-interface}}
 
 {{/isEnum}}
 {{/model}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

@@ -4192,6 +4192,33 @@ public void givenOneOfUsesInterfacesAndLibraryNotJacksonWhenGenerateThenOneOfInt
         TestUtils.assertFileNotContains(testModel.toPath(), "com.fasterxml.jackson");
     }
 
+    @Test
+    public void oneOfInterfaceMicroprofileJackson() {
+        final Path output = newTempFolder();
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName(JAVA_GENERATOR)
+                .setLibrary(MICROPROFILE)
+                .setAdditionalProperties(Map.of(
+                        USE_ONE_OF_INTERFACES, "true",
+                        CodegenConstants.SERIALIZATION_LIBRARY, SERIALIZATION_LIBRARY_JACKSON
+                ))
+                .setInputSpec("src/test/resources/3_0/java/oneof_interface_petstore.yaml")
+                .setOutputDir(output.toString().replace("\\", "/"));
+
+        new DefaultGenerator().opts(configurator.toClientOptInput()).generate();
+
+        final Path model = output.resolve("src/main/java/org/openapitools/client/model");
+        // oneOf schema rendered as an interface (not a pojo); the discriminator getter resolves to the enum
+        assertFileContains(model.resolve("PetRequest.java"), "public interface PetRequest {");
+        assertFileContains(model.resolve("PetRequest.java"), "public PetType getPetType();");
+        // children implement the interface
+        assertFileContains(model.resolve("CatRequest.java"), "implements PetRequest");
+        assertFileContains(model.resolve("DogRequest.java"), "implements PetRequest");
+        // not sealed (useSealedOneOfInterfaces not set)
+        assertFileNotContains(model.resolve("PetRequest.java"), "sealed interface");
+        assertFileNotContains(model.resolve("CatRequest.java"), "public final class");
+    }
+
     @DataProvider(name = "sealedInterfaceScenarios")
     public static Object[][] sealedInterfaceScenarios() {
         return new Object[][]{

modules/openapi-generator/src/test/resources/3_0/java/oneof_interface_petstore.yaml

@@ -0,0 +1,79 @@
+openapi: 3.0.3
+info:
+  title: oneOf interface petstore
+  description: >
+    A minimal, self-consistent oneOf-interface spec for the Java (microprofile) client generator.
+    The oneOf container and the shared base both declare the discriminator property so the interface
+    getter resolves to the enum type. Children inherit the base via allOf and only implement the
+    generated interface.
+  version: 1.0.0
+paths:
+  /pets:
+    post:
+      operationId: createPet
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PetRequest'
+      responses:
+        '200':
+          description: created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PetRequest'
+components:
+  schemas:
+    PetType:
+      type: string
+      enum:
+        - CAT
+        - DOG
+      description: Discriminator value identifying the type of pet
+
+    PetRequest:
+      type: object
+      properties:
+        petType:
+          $ref: '#/components/schemas/PetType'
+      oneOf:
+        - $ref: '#/components/schemas/CatRequest'
+        - $ref: '#/components/schemas/DogRequest'
+      discriminator:
+        propertyName: petType
+        mapping:
+          CAT: '#/components/schemas/CatRequest'
+          DOG: '#/components/schemas/DogRequest'
+
+    PetBase:
+      type: object
+      required:
+        - petType
+        - name
+      properties:
+        petType:
+          $ref: '#/components/schemas/PetType'
+        name:
+          type: string
+
+    CatRequest:
+      allOf:
+        - $ref: '#/components/schemas/PetBase'
+        - type: object
+          required:
+            - indoor
+          properties:
+            indoor:
+              type: boolean
+
+    DogRequest:
+      allOf:
+        - $ref: '#/components/schemas/PetBase'
+        - type: object
+          required:
+            - trained
+          properties:
+            trained:
+              type: boolean

samples/client/petstore/java/microprofile-oneof-interface/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/petstore/java/microprofile-oneof-interface/.openapi-generator/FILES

@@ -0,0 +1,19 @@
+README.md
+docs/CatRequest.md
+docs/DefaultApi.md
+docs/DogRequest.md
+docs/PetBase.md
+docs/PetRequest.md
+docs/PetType.md
+pom.xml
+src/main/java/org/openapitools/client/RFC3339DateFormat.java
+src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java
+src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java
+src/main/java/org/openapitools/client/api/ApiException.java
+src/main/java/org/openapitools/client/api/ApiExceptionMapper.java
+src/main/java/org/openapitools/client/api/DefaultApi.java
+src/main/java/org/openapitools/client/model/CatRequest.java
+src/main/java/org/openapitools/client/model/DogRequest.java
+src/main/java/org/openapitools/client/model/PetBase.java
+src/main/java/org/openapitools/client/model/PetRequest.java
+src/main/java/org/openapitools/client/model/PetType.java

samples/client/petstore/java/microprofile-oneof-interface/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.24.0-SNAPSHOT

samples/client/petstore/java/microprofile-oneof-interface/README.md

@@ -0,0 +1,10 @@
+# oneOf interface petstore - MicroProfile Rest Client & MicroProfile Server
+
+A minimal, self-consistent oneOf-interface spec for the Java (microprofile) client generator. The oneOf container and the shared base both declare the discriminator property so the interface getter resolves to the enum type. Children inherit the base via allOf and only implement the generated interface.
+
+
+## Overview
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
+[MicroProfile Rest Client](https://github.com/eclipse/microprofile-rest-client) is a type-safe way of calling
+REST services. The generated client contains an interface which acts as the client, you can inject it into dependent classes.
+

samples/client/petstore/java/microprofile-oneof-interface/docs/CatRequest.md

@@ -0,0 +1,19 @@
+
+
+# CatRequest
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**petType** | **PetType** |  |  |
+|**name** | **String** |  |  |
+|**indoor** | **Boolean** |  |  |
+
+
+## Implemented Interfaces
+
+* PetRequest
+
+

samples/client/petstore/java/microprofile-oneof-interface/docs/DefaultApi.md

@@ -0,0 +1,73 @@
+# DefaultApi
+
+All URIs are relative to *http://localhost*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**createPet**](DefaultApi.md#createPet) | **POST** /pets |  |
+
+
+
+## createPet
+
+> PetRequest createPet(petRequest)
+
+
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.DefaultApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://localhost");
+
+        DefaultApi apiInstance = new DefaultApi(defaultClient);
+        PetRequest petRequest = new PetRequest(); // PetRequest | 
+        try {
+            PetRequest result = apiInstance.createPet(petRequest);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling DefaultApi#createPet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **petRequest** | [**PetRequest**](PetRequest.md)|  | |
+
+### Return type
+
+[**PetRequest**](PetRequest.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | created |  -  |
+

samples/client/petstore/java/microprofile-oneof-interface/docs/DogRequest.md

@@ -0,0 +1,19 @@
+
+
+# DogRequest
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**petType** | **PetType** |  |  |
+|**name** | **String** |  |  |
+|**trained** | **Boolean** |  |  |
+
+
+## Implemented Interfaces
+
+* PetRequest
+
+

samples/client/petstore/java/microprofile-oneof-interface/docs/PetBase.md

@@ -0,0 +1,14 @@
+
+
+# PetBase
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**petType** | **PetType** |  |  |
+|**name** | **String** |  |  |
+
+
+

samples/client/petstore/java/microprofile-oneof-interface/docs/PetRequest.md

@@ -0,0 +1,10 @@
+
+
+# Interface PetRequest
+
+## Implementing Classes
+
+* CatRequest
+* DogRequest
+
+

samples/client/petstore/java/microprofile-oneof-interface/docs/PetType.md

@@ -0,0 +1,13 @@
+
+
+# PetType
+
+## Enum
+
+
+* `CAT` (value: `"CAT"`)
+
+* `DOG` (value: `"DOG"`)
+
+
+