You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/10/21 01:29:13 UTC
[camel-karavan] branch main updated (56ffa2fa -> e70d6be5)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 56ffa2fa Fix #931
new 055529af apicurio.datamodels changes in camel 4.1 #931
new e70d6be5 apicurio.datamodels changes in camel 4.1 #931
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/karavan/code/CodeService.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
[camel-karavan] 02/02: apicurio.datamodels changes in camel 4.1 #931
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit e70d6be53c6a0088163b85eb7be2768ef8c26736
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Oct 20 21:29:02 2023 -0400
apicurio.datamodels changes in camel 4.1 #931
---
.../src/main/java/org/apache/camel/karavan/code/CodeService.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
index b85ec6c9..19de51cb 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.karavan.code;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.apicurio.datamodels.Library;
[camel-karavan] 01/02: apicurio.datamodels changes in camel 4.1 #931
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 055529af8b08a93056833d6b79e51c1fdb86563e
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Oct 20 21:28:54 2023 -0400
apicurio.datamodels changes in camel 4.1 #931
---
.../java/org/apache/camel/karavan/code/CodeService.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
index 655e660f..b85ec6c9 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
@@ -18,8 +18,9 @@ package org.apache.camel.karavan.code;
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.OpenApiDocument;
import io.quarkus.qute.Engine;
import io.quarkus.qute.Template;
import io.quarkus.qute.TemplateInstance;
@@ -196,23 +197,23 @@ public class CodeService {
}
public String generate(String fileName, String openApi, boolean generateRoutes) throws Exception {
- final JsonNode node = fileName.endsWith("json") ? readNodeFromJson(openApi) : readNodeFromYaml(openApi);
- OasDocument document = (OasDocument) Library.readDocument(node);
+ final ObjectNode node = fileName.endsWith("json") ? readNodeFromJson(openApi) : readNodeFromYaml(openApi);
+ OpenApiDocument document = (OpenApiDocument) Library.readDocument(node);
try (CamelContext context = new DefaultCamelContext()) {
return RestDslGenerator.toYaml(document).generate(context, generateRoutes);
}
}
- private JsonNode readNodeFromJson(String openApi) throws Exception {
+ private ObjectNode readNodeFromJson(String openApi) throws Exception {
final ObjectMapper mapper = new ObjectMapper();
- return mapper.readTree(openApi);
+ return (ObjectNode) mapper.readTree(openApi);
}
- private JsonNode readNodeFromYaml(String openApi) throws FileNotFoundException {
+ private ObjectNode readNodeFromYaml(String openApi) throws FileNotFoundException {
final ObjectMapper mapper = new ObjectMapper();
Yaml loader = new Yaml(new SafeConstructor(new LoaderOptions()));
Map map = loader.load(openApi);
- return mapper.convertValue(map, JsonNode.class);
+ return mapper.convertValue(map, ObjectNode.class);
}
public String getPropertiesFile(GitRepo repo) {