fix: Fix processing of Open API docs by API Catalog (JavaTimeModule) (#…

…3040) Signed-off-by: Pavel Jareš <[email protected]>
zowe · Aug 22, 2023 · 09f5095 · 09f5095
1 parent de6923e
commit 09f5095
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...catalog-services/src/main/java/org/zowe/apiml/apicatalog/swagger/api/ApiDocV2Service.java b/...catalog-services/src/main/java/org/zowe/apiml/apicatalog/swagger/api/ApiDocV2Service.java
@@ -11,6 +11,8 @@
 package org.zowe.apiml.apicatalog.swagger.api;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.swagger.models.ExternalDocs;
 import io.swagger.models.Path;
 import io.swagger.models.Scheme;
@@ -54,13 +56,19 @@ public String transformApiDoc(String serviceId, ApiDocInfo apiDocInfo) {
         updateExternalDoc(swagger, apiDocInfo);
 
         try {
-            return Json.mapper().writeValueAsString(swagger);
+            return initializeObjectMapper().writeValueAsString(swagger);
         } catch (JsonProcessingException e) {
             log.debug("Could not convert Swagger to JSON", e);
             throw new ApiDocTransformationException("Could not convert Swagger to JSON");
         }
     }
 
+    private ObjectMapper initializeObjectMapper() {
+        ObjectMapper objectMapper = Json.mapper();
+        objectMapper.registerModule(new JavaTimeModule());
+        return objectMapper;
+    }
+
     /**
      * Updates scheme and hostname, and adds API doc link to Swagger
      *

diff --git a/...catalog-services/src/main/java/org/zowe/apiml/apicatalog/swagger/api/ApiDocV3Service.java b/...catalog-services/src/main/java/org/zowe/apiml/apicatalog/swagger/api/ApiDocV3Service.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
@@ -74,7 +75,7 @@ public String transformApiDoc(String serviceId, ApiDocInfo apiDocInfo) {
             return initializeObjectMapper().writeValueAsString(openAPI);
         } catch (JsonProcessingException e) {
             log.debug("Could not convert OpenAPI to JSON", e);
-            throw new ApiDocTransformationException("Could not convert Swagger to JSON");
+            throw new ApiDocTransformationException("Could not convert Swagger to JSON: " + e.getMessage());
         }
     }
 
@@ -195,6 +196,8 @@ private ObjectMapper initializeObjectMapper() {
         objectMapper.registerModule(simpleModule);
         objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
 
+        objectMapper.registerModule(new JavaTimeModule());
+
         return objectMapper;
     }
 }