Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[quarkus-main] camel-quarkus-openapi-java: alter to use OpenAPIDefinitionIO #6523

Merged
merged 1 commit into from
Sep 23, 2024
Merged

[quarkus-main] camel-quarkus-openapi-java: alter to use OpenAPIDefinitionIO #6523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions ...java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.camel.quarkus.component.openapi.java.deployment;

import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand All @@ -27,7 +25,12 @@
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
import io.quarkus.deployment.Capabilities;
import io.quarkus.deployment.Capability;
Expand All @@ -38,10 +41,10 @@
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.smallrye.openapi.deployment.spi.AddToOpenAPIDefinitionBuildItem;
import io.smallrye.openapi.api.OpenApiConfigImpl;
import io.smallrye.openapi.api.util.MergeUtil;
import io.smallrye.openapi.runtime.io.Format;
import io.smallrye.openapi.runtime.io.OpenApiParser;
import io.smallrye.openapi.runtime.io.IOContext;
import io.smallrye.openapi.runtime.io.JsonIO;
import io.smallrye.openapi.runtime.io.OpenAPIDefinitionIO;
import io.swagger.v3.core.jackson.mixin.Components31Mixin;
import io.swagger.v3.core.jackson.mixin.ComponentsMixin;
import io.swagger.v3.core.jackson.mixin.DateSchemaMixin;
Expand Down Expand Up @@ -229,12 +232,16 @@ public void filterOpenAPI(OpenAPI openAPI) {
clearVendorExtensions(openApi);
}

// dump to json
final ObjectMapper mapper = new ObjectMapper(new JsonFactory());
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);

String jsonContent = RestOpenApiSupport.getJsonFromOpenAPIAsString(openApi, bc);
try (ByteArrayInputStream stream = new ByteArrayInputStream(jsonContent.getBytes(StandardCharsets.UTF_8))) {
OpenAPI parsedOpenAPI = OpenApiParser.parse(stream, Format.JSON,
new OpenApiConfigImpl(ConfigProvider.getConfig()));
MergeUtil.merge(openAPI, parsedOpenAPI);
}
final JsonNode node = mapper.readTree(jsonContent);

OpenAPI oai = new OpenAPIDefinitionIO(IOContext.forJson(JsonIO.newInstance(null))).readObject(node);
MergeUtil.merge(openAPI, oai);
} catch (Exception e) {
LOGGER.warn("Error generating OpenAPI from Camel Rest DSL due to: {}. This exception is ignored.", e.getMessage(),
e);
Expand Down
Loading