From 5903971a977f11a73e9358da804fa496336ad11b Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Wed, 6 Dec 2023 16:07:48 +0800 Subject: [PATCH] CAMEL-20181: camel-openapi-java - fix compilain errors --- .../test/java/org/apache/camel/openapi/ComplexTypesTest.java | 2 +- .../openapi/RestOpenApiModelApiSecurityRequirementsTest.java | 2 +- .../camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java | 2 +- .../org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java | 2 +- .../apache/camel/openapi/RestOpenApiReaderContextPathTest.java | 2 +- .../apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java | 2 +- .../openapi/RestOpenApiReaderEnableVendorExtensionTest.java | 2 +- .../camel/openapi/RestOpenApiReaderFileResponseModelTest.java | 2 +- .../camel/openapi/RestOpenApiReaderModelApiSecurityTest.java | 2 +- .../camel/openapi/RestOpenApiReaderModelBookOrderTest.java | 2 +- .../org/apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 +- .../camel/openapi/RestOpenApiReaderOverrideHostApiDocsTest.java | 2 +- .../camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java | 2 +- .../java/org/apache/camel/openapi/RestOpenApiReaderTest.java | 2 +- .../apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java | 2 +- .../openapi/SpringRestOpenApiReaderModelApiSecurityTest.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java index afa9bbd196e..7b02519f920 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java @@ -157,7 +157,7 @@ private void checkSchemaGeneration(String uri, String apiVersion, String schemaR RestOpenApiReader reader = new RestOpenApiReader(); OpenAPI openApi = reader.read(context, rests, config, context.getName(), new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); LOG.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java index 281730f05a5..1cf146bac87 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiModelApiSecurityRequirementsTest.java @@ -97,7 +97,7 @@ public void testReaderRead() throws Exception { OpenAPI openApi = reader.read(context, ((ModelCamelContext) context).getRestDefinitions(), config, context.getName(), new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); assertTrue(json.contains("\"securityDefinitions\" : {")); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java index 09cefca521a..f113a00fb6b 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java @@ -101,7 +101,7 @@ public void testReaderRead() throws Exception { assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); assertFalse(json.contains("\"/hello/bye\"")); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java index 081996ea048..5f214724a87 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java @@ -100,7 +100,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java index c17b73a1ef8..282b17274b8 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderContextPathTest.java @@ -107,7 +107,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java index d04358b4bb2..44e65248f2b 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java @@ -102,7 +102,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java index db630ad6322..ac68e98d0c9 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java @@ -116,7 +116,7 @@ public void testEnableVendorExtension() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java index f494a92c20a..4014a62e4c0 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java @@ -95,7 +95,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); LOG.info(json); assertTrue(json.contains("\"type\" : \"file\"")); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java index 3e2e52ea5e7..07e48bdf83d 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java @@ -121,7 +121,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java index 2902dd59de9..fa5651bbf10 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java @@ -116,7 +116,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java index 0e493bae6de..f47b1f85a34 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java @@ -114,7 +114,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderOverrideHostApiDocsTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderOverrideHostApiDocsTest.java index 07ae52b9193..db5f7e66926 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderOverrideHostApiDocsTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderOverrideHostApiDocsTest.java @@ -51,7 +51,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java index 4805ff0616e..604382e00bc 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java @@ -109,7 +109,7 @@ public void testReaderRead() throws Exception { assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java index ab2bb8d398e..7f5feebbdb3 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java @@ -106,7 +106,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java index 84444882436..dfa09a54306 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/RestOpenApiV2SecuritySchemesTest.java @@ -104,7 +104,7 @@ public void testSecuritySchemesV2() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json); diff --git a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java index 35356e16e0d..e16e241b0aa 100644 --- a/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java +++ b/components-starter/camel-openapi-java-starter/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java @@ -72,7 +72,7 @@ public void testReaderRead() throws Exception { new DefaultClassResolver()); assertNotNull(openApi); - String json = RestOpenApiSupport.getJsonFromOpenAPI(openApi, config); + String json = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, config); log.info(json);