You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/03/10 19:22:29 UTC
(camel) branch main updated (0b364bbb9f8 -> c2302083a32)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 0b364bbb9f8 camel-jbang - Fix generate rest to work with openapi v3
new 13375cae32d camel-jbang - Fix generate rest to work with openapi v3
new c2302083a32 Polished
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:
.../camel/dsl/jbang/core/commands/CodeRestGenerator.java | 10 +++++++++-
.../org/apache/camel/generator/openapi/RestDslGenerator.java | 10 ----------
2 files changed, 9 insertions(+), 11 deletions(-)
(camel) 01/02: camel-jbang - Fix generate rest to work with openapi v3
Posted by da...@apache.org.
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
commit 13375cae32d2bf38e7d5bb4db22b75ade8c82a53
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 10 20:22:03 2024 +0100
camel-jbang - Fix generate rest to work with openapi v3
---
.../camel/dsl/jbang/core/commands/CodeRestGenerator.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 7c3e3363e4f..3914748251a 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
@@ -29,6 +29,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import io.apicurio.datamodels.Library;
import io.apicurio.datamodels.models.Document;
import io.apicurio.datamodels.models.ModelType;
+import io.apicurio.datamodels.models.openapi.OpenApiDocument;
import io.apicurio.datamodels.models.openapi.v30.OpenApi30Document;
import org.apache.camel.CamelContext;
import org.apache.camel.generator.openapi.RestDslGenerator;
@@ -75,13 +76,20 @@ public class CodeRestGenerator extends CamelCommand {
@Override
public Integer doCall() throws Exception {
+ OpenApiDocument doc;
+
final ObjectNode node = input.endsWith("json") ? readNodeFromJson() : readNodeFromYaml();
Document source = Library.readDocument(node);
ModelType mt = ModelType.OPENAPI30;
if ("3.1".equals(openApiVersion)) {
mt = ModelType.OPENAPI31;
}
- OpenApi30Document doc = (OpenApi30Document) Library.transformDocument(source, mt);
+ if (!source.root().modelType().equals(mt)) {
+ doc = (OpenApiDocument) Library.transformDocument(source, mt);
+ } else {
+ doc = (OpenApiDocument) source;
+ }
+
Configurator.setRootLevel(Level.OFF);
try (CamelContext context = new DefaultCamelContext()) {
String text = null;
(camel) 02/02: Polished
Posted by da...@apache.org.
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
commit c2302083a321a43947d2e6ee5ae810ce96af553e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 10 20:22:16 2024 +0100
Polished
---
.../org/apache/camel/generator/openapi/RestDslGenerator.java | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
index d03233897ce..c7b8722fab2 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
@@ -40,25 +40,15 @@ import static org.apache.camel.util.ObjectHelper.notNull;
public abstract class RestDslGenerator<G> {
String apiContextPath;
-
DestinationGenerator destinationGenerator;
-
String destinationToSyntax;
-
final OpenApiDocument document;
-
OperationFilter filter = new OperationFilter();
-
String restComponent;
-
String restContextPath;
-
boolean clientRequestValidation;
-
boolean springBootProject;
-
boolean springComponent;
-
String basePath;
RestDslGenerator(final OpenApiDocument document) {