From 9df1c781eb34e2512a49414d016ab00e496f8d51 Mon Sep 17 00:00:00 2001
From: Sophie Tauchert <sophie@999eagle.moe>
Date: Fri, 6 Oct 2023 13:41:42 +0200
Subject: [PATCH] Fix generated OpenAPI spec

Changes:
- update the smallrye openapi generator plugin to latest to correctly handle
  Stream<T> responses
- add annotations to RealmRepresentation.clientProfiles and .clientPolicies
---
 core/pom.xml                                                  | 4 ++++
 .../org/keycloak/representations/idm/RealmRepresentation.java | 3 +++
 pom.xml                                                       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7e4ef767d4..2a08402350 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -59,6 +59,10 @@
             <artifactId>jboss-logging</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.openapi</groupId>
+            <artifactId>microprofile-openapi-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
index b35f949c7d..d7e77d6dfc 100755
--- a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
+++ b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
@@ -20,6 +20,7 @@ package org.keycloak.representations.idm;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.jboss.logging.Logger;
 import org.keycloak.common.util.MultivaluedHashMap;
 import org.keycloak.util.JsonSerialization;
@@ -154,9 +155,11 @@ public class RealmRepresentation {
     // Client Policies/Profiles
 
     @JsonProperty("clientProfiles")
+    @Schema(implementation = ClientProfilesRepresentation.class)
     protected JsonNode clientProfiles;
 
     @JsonProperty("clientPolicies")
+    @Schema(implementation = ClientPoliciesRepresentation.class)
     protected JsonNode clientPolicies;
 
     protected List<UserRepresentation> users;
diff --git a/pom.xml b/pom.xml
index 1d3bd725a5..ede0da1ae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@
         <docker.maven.plugin.version>0.40.3</docker.maven.plugin.version>
         <verifier.plugin.version>1.1</verifier.plugin.version>
         <shade.plugin.version>3.4.1</shade.plugin.version>
-        <smallrye.openapi.generator.plugin.version>3.1.2</smallrye.openapi.generator.plugin.version>
+        <smallrye.openapi.generator.plugin.version>3.6.2</smallrye.openapi.generator.plugin.version>
         <openapi.generator.plugin.version>6.3.0</openapi.generator.plugin.version>
 
         <!-- Surefire Settings -->