[camel] branch main updated: CAMEL-19614: camel-openapi-rest-dsl-generator - Upgrade apicurio-data-model to 2.0.3

[davsclaus]

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

davsclaus 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 38662bbe583 CAMEL-19614: camel-openapi-rest-dsl-generator - Upgrade 
apicurio-data-model to 2.0.3
38662bbe583 is described below

commit 38662bbe58335a1083adb2fe5d1b53a3b9ec09b9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jul 19 11:42:35 2023 +0200

    CAMEL-19614: camel-openapi-rest-dsl-generator - Upgrade apicurio-data-model 
to 2.0.3
---
 .../camel/dsl/jbang/core/commands/CodeRestGenerator.java | 16 ++++++++--------
 .../org/apache/camel/dsl/jbang/core/commands/Run.java    |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
index c21578c3072..4589b36c8c5 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
@@ -24,10 +24,10 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.apicurio.datamodels.Library;
-import io.apicurio.datamodels.openapi.models.OasDocument;
+import io.apicurio.datamodels.models.openapi.v30.OpenApi30Document;
 import org.apache.camel.CamelContext;
 import org.apache.camel.generator.openapi.RestDslGenerator;
 import org.apache.camel.impl.DefaultCamelContext;
@@ -69,8 +69,8 @@ public class CodeRestGenerator extends CamelCommand {
 
     @Override
     public Integer doCall() throws Exception {
-        final JsonNode node = input.endsWith("json") ? readNodeFromJson() : 
readNodeFromYaml();
-        OasDocument document = (OasDocument) Library.readDocument(node);
+        final ObjectNode node = input.endsWith("json") ? readNodeFromJson() : 
readNodeFromYaml();
+        OpenApi30Document document = (OpenApi30Document) 
Library.readDocument(node);
         Configurator.setRootLevel(Level.OFF);
         try (CamelContext context = new DefaultCamelContext()) {
             String text = null;
@@ -93,16 +93,16 @@ public class CodeRestGenerator extends CamelCommand {
         return 0;
     }
 
-    private JsonNode readNodeFromJson() throws Exception {
+    private ObjectNode readNodeFromJson() throws Exception {
         final ObjectMapper mapper = new ObjectMapper();
-        return mapper.readTree(Paths.get(input).toFile());
+        return (ObjectNode) mapper.readTree(Paths.get(input).toFile());
     }
 
-    private JsonNode readNodeFromYaml() throws FileNotFoundException {
+    private ObjectNode readNodeFromYaml() throws FileNotFoundException {
         final ObjectMapper mapper = new ObjectMapper();
         Yaml loader = new Yaml(new SafeConstructor(new LoaderOptions()));
         Map<?, ?> map = loader.load(new 
FileInputStream(Paths.get(input).toFile()));
-        return mapper.convertValue(map, JsonNode.class);
+        return mapper.convertValue(map, ObjectNode.class);
     }
 
     private void generateDto() throws IOException {
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 059f3df0c24..54d74ab2f5e 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -45,11 +45,11 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import io.apicurio.datamodels.Library;
-import io.apicurio.datamodels.openapi.models.OasDocument;
+import io.apicurio.datamodels.models.openapi.OpenApiDocument;
 import org.apache.camel.CamelContext;
 import org.apache.camel.catalog.CamelCatalog;
 import org.apache.camel.catalog.DefaultCamelCatalog;
@@ -972,8 +972,8 @@ public class Run extends CamelCommand {
         } else {
             mapper = new ObjectMapper();
         }
-        JsonNode node = mapper.readTree(file);
-        OasDocument document = (OasDocument) Library.readDocument(node);
+        ObjectNode node = (ObjectNode) mapper.readTree(file);
+        OpenApiDocument document = (OpenApiDocument) 
Library.readDocument(node);
         RuntimeUtil.setRootLoggingLevel("off");
         try {
             try (CamelContext context = new DefaultCamelContext()) {