From 2ff2a5e93560ac5f8766414bb44fbad045f2c198 Mon Sep 17 00:00:00 2001
From: Marten <marten@rocketbase.io>
Date: Thu, 14 Sep 2023 09:33:14 +0200
Subject: [PATCH] fix: solved some version issues + changed to default locale

---
 commons-rest-api/pom.xml                                       | 2 +-
 .../commons/openapi/OpenApiClientCreatorService.java           | 3 ++-
 pom.xml                                                        | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/commons-rest-api/pom.xml b/commons-rest-api/pom.xml
index 2b545a3..275abbe 100755
--- a/commons-rest-api/pom.xml
+++ b/commons-rest-api/pom.xml
@@ -40,7 +40,7 @@ SOFTWARE.
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>2.2.14</version>
+            <version>${swagger-annotations.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiClientCreatorService.java b/commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiClientCreatorService.java
index 00f61fa..6fcff21 100644
--- a/commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiClientCreatorService.java
+++ b/commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiClientCreatorService.java
@@ -46,7 +46,8 @@ public class OpenApiClientCreatorService {
 
     @SneakyThrows
     public List<OpenApiController> getControllers(HttpServletRequest request) {
-        OpenAPI openAPI = Json.mapper().readValue(openApiWebMvcResource.openapiJson(request, Constants.DEFAULT_API_DOCS_URL, Locale.GERMAN), OpenAPI.class);
+        byte[] openapiJson = openApiWebMvcResource.openapiJson(request, Constants.DEFAULT_API_DOCS_URL, Locale.getDefault());
+        OpenAPI openAPI = Json.mapper().readValue(openapiJson, OpenAPI.class);
         Map<String, List<OpenApiControllerMethodExtraction>> remapped = new HashMap<>();
         for (Map.Entry<String, PathItem> entry : openAPI.getPaths().entrySet()) {
             addOperation(remapped, PathItem.HttpMethod.GET, entry.getKey(), entry.getValue().getGet());
diff --git a/pom.xml b/pom.xml
index 9572b61..92c3a95 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@ SOFTWARE.
         <pebble.version>3.2.1</pebble.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
         <lombok.version>1.18.28</lombok.version>
+        <swagger-annotations.version>2.2.15</swagger-annotations.version>
     </properties>
 
     <dependencyManagement>