You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/07/04 07:05:18 UTC
(camel-quarkus) 18/20: Fix camel-k-maven-plugin REST DSL generation
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 816b1e3d60c5496ea48c0082800bbf420075a3f9
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jul 4 07:53:17 2024 +0100
Fix camel-k-maven-plugin REST DSL generation
---
.../camel/quarkus/k/tooling/maven/GenerateRestXML.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/quarkus/k/tooling/maven/GenerateRestXML.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/quarkus/k/tooling/maven/GenerateRestXML.java
index c451167248..b80f3ec1c1 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/quarkus/k/tooling/maven/GenerateRestXML.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/quarkus/k/tooling/maven/GenerateRestXML.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.k.tooling.maven;
-import java.io.FileInputStream;
import java.io.PrintWriter;
import java.io.Writer;
import java.nio.file.Files;
@@ -24,12 +23,10 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import io.apicurio.datamodels.Library;
-import io.apicurio.datamodels.models.openapi.OpenApiDocument;
-import io.apicurio.datamodels.models.util.JsonUtil;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.parser.OpenAPIV3Parser;
import org.apache.camel.CamelContext;
import org.apache.camel.generator.openapi.RestDslXmlGenerator;
import org.apache.camel.impl.DefaultCamelContext;
@@ -67,10 +64,8 @@ class GenerateRestXML extends AbstractMojo {
ObjectMapper mapper = new ObjectMapper(factory);
mapper.findAndRegisterModules();
- FileInputStream fis = new FileInputStream(inputFile);
-
- JsonNode node = mapper.readTree(fis);
- OpenApiDocument document = (OpenApiDocument) Library.readDocument(JsonUtil.toObject(node));
+ OpenAPIV3Parser parser = new OpenAPIV3Parser();
+ OpenAPI document = parser.read("file:" + input.toAbsolutePath());
final Writer writer;