fix: solved some version issues + changed to default locale

rocketbase-io · Sep 14, 2023 · 2ff2a5e · 2ff2a5e
1 parent bd9375d
commit 2ff2a5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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/...rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiClientCreatorService.java b/...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
@@ -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>