From 7f4f62977d20d79145a61d14a83d7f4905d285ee Mon Sep 17 00:00:00 2001
From: "Badr.NassLahsen" <badr.nasslahsen@gmail.com>
Date: Sat, 2 Dec 2023 23:08:27 +0100
Subject: [PATCH] Upgrade swagger-ui to version: 5.10.3 Upgrade spring-boot to
 version: 3.2.0

---
 pom.xml                                                       | 4 ++--
 .../oauth2/SpringDocOidcClientRegistrationResponse.java       | 1 -
 .../core/configuration/SpringDocHateoasConfigurationTest.java | 1 +
 .../test/org/springdoc/api/v31/app8/ExamplesResponse.java     | 4 ++--
 .../test/org/springdoc/api/app20/CodeLookupRepository.java    | 2 +-
 .../src/test/resources/results/app20.json                     | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index b8ea139b4..5bd6f1609 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.2</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<licenses>
@@ -62,7 +62,7 @@
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 		<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
 		<swagger-api.version>2.2.19</swagger-api.version>
-		<swagger-ui.version>5.9.0</swagger-ui.version>
+		<swagger-ui.version>5.10.3</swagger-ui.version>
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jaxb-impl.version>2.1</jaxb-impl.version>
 		<javax.jws-api.version>1.1</javax.jws-api.version>
diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java
index f115b8673..f62c8d0c0 100644
--- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java
+++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java
@@ -1,6 +1,5 @@
 package org.springdoc.core.configuration.oauth2;
 
-import java.time.Instant;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java
index 156fc33d0..c99de580c 100644
--- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java
+++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java
@@ -4,6 +4,7 @@
 import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
 import org.springdoc.core.customizers.OpenApiHateoasLinksCustomizer;
 import org.springdoc.core.properties.SpringDocConfigProperties;
+
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java
index 8bbb89fee..aeb3d7ea9 100644
--- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java
+++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java
@@ -1,9 +1,9 @@
 package test.org.springdoc.api.v31.app8;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.List;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED;
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app20/CodeLookupRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app20/CodeLookupRepository.java
index efd859b9e..01e6e8792 100644
--- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app20/CodeLookupRepository.java
+++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app20/CodeLookupRepository.java
@@ -4,7 +4,7 @@
 import org.springframework.data.repository.query.Param;
 
 @NoRepositoryBean
-public interface CodeLookupRepository<EntityT, KeyT> {
+public interface CodeLookupRepository<EntityT,  KeyT extends String> {
 	EntityT findOneByCode(@Param("code") KeyT code);
 
 	Long countByCode(KeyT code);
diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/app20.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/app20.json
index 1bd475e16..3ebaa3cd8 100644
--- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/app20.json
+++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/app20.json
@@ -117,7 +117,7 @@
             "name": "code",
             "in": "query",
             "schema": {
-              "type": "object"
+              "type": "string"
             }
           }
         ],
@@ -150,7 +150,7 @@
             "name": "code",
             "in": "query",
             "schema": {
-              "type": "object"
+              "type": "string"
             }
           }
         ],