From acbcaa860537e79aa098970b7e4b0729e4560270 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sat, 4 Jan 2025 17:36:34 +0100
Subject: [PATCH] [cometvisu] Upgrade openapi generator to 7.0.1

* Upgrade openapi-generator-maven-plugin from 4.3.0 to 7.0.1

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bundles/org.openhab.ui.cometvisu/pom.xml                      | 3 ++-
 .../org.openhab.ui.cometvisu/src/main/resources/openapi.yaml  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.ui.cometvisu/pom.xml b/bundles/org.openhab.ui.cometvisu/pom.xml
index 9855a611ef..3695091509 100644
--- a/bundles/org.openhab.ui.cometvisu/pom.xml
+++ b/bundles/org.openhab.ui.cometvisu/pom.xml
@@ -123,7 +123,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-maven-plugin</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>4.3.0</version>
+        <version>7.0.1</version>
         <!-- /RELEASE_VERSION -->
         <executions>
           <execution>
@@ -141,6 +141,7 @@
               <modelPackage>org.openhab.ui.cometvisu.internal.backend.model.rest</modelPackage>
               <generateAliasAsModel>true</generateAliasAsModel>
               <generateSupportingFiles>false</generateSupportingFiles>
+              <openapiNormalizer>REF_AS_PARENT_IN_ALLOF=true</openapiNormalizer>
               <configOptions>
                 <sourceFolder>src-gen</sourceFolder>
                 <interfaceOnly>true</interfaceOnly>
diff --git a/bundles/org.openhab.ui.cometvisu/src/main/resources/openapi.yaml b/bundles/org.openhab.ui.cometvisu/src/main/resources/openapi.yaml
index 106f57b5e9..ce688b51ba 100644
--- a/bundles/org.openhab.ui.cometvisu/src/main/resources/openapi.yaml
+++ b/bundles/org.openhab.ui.cometvisu/src/main/resources/openapi.yaml
@@ -238,7 +238,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                allOf:
                   - $ref: '#/components/schemas/HiddenConfig'
                   - $ref: '#/components/schemas/ConfigSection'
                   - $ref: '#/components/schemas/ConfigOptionValue'
@@ -477,7 +477,7 @@ components:
       additionalProperties:
         type: string
     ReadResponse:
-      oneOf:
+      allOf:
         - $ref: '#/components/schemas/DirContent'
     DirContent:
       type: array