(camel) branch main updated: [CAMEL-21531]RestOpenApiReaderTest is broken for some locations (#16513)

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new b2e551a900f [CAMEL-21531]RestOpenApiReaderTest is broken for some 
locations (#16513)
b2e551a900f is described below

commit b2e551a900fd6d5ec5b09fc28e8c9d11003483a3
Author: Freeman(Yue) Fang <freeman.f...@gmail.com>
AuthorDate: Tue Dec 10 16:53:33 2024 -0500

    [CAMEL-21531]RestOpenApiReaderTest is broken for some locations (#16513)
---
 .../camel/openapi/RestOpenApiReaderTest.java       | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
 
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
index 6416ab51f45..91c4ec31f11 100644
--- 
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
+++ 
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
@@ -16,6 +16,14 @@
  */
 package org.apache.camel.openapi;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.core.util.Json;
+import io.swagger.v3.core.util.Json31;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import org.apache.camel.BindToRegistry;
@@ -232,7 +240,7 @@ public class RestOpenApiReaderTest extends CamelTestSupport 
{
                 new DefaultClassResolver());
         assertNotNull(openApi);
 
-        String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, 
config);
+        String json = getJsonFromOpenAPIAsString(openApi, config);
         log.info(json);
         json = json.replace("\n", " ").replaceAll("\\s+", " ");
 
@@ -270,4 +278,24 @@ public class RestOpenApiReaderTest extends 
CamelTestSupport {
         context.stop();
     }
 
+    /*
+     * set TimeZone as default GMT to eusure this test pass everywhere
+     */
+    private String getJsonFromOpenAPIAsString(OpenAPI openApi, BeanConfig 
config) {
+        ObjectMapper mapper = config.isOpenApi31() ? Json31.mapper() : 
Json.mapper();
+        DateFormat origin = mapper.getDateFormat();
+        String result = null;
+        try {
+            DateFormat testDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            testDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+            mapper.setDateFormat(testDateFormat);
+            result = mapper.writer(new 
DefaultPrettyPrinter()).writeValueAsString(openApi);
+        } catch (Exception e) {
+            return null;
+        } finally {
+            mapper.setDateFormat(origin);
+        }
+        return result;
+    }
+
 }