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 2022/07/26 11:25:23 UTC

[camel] branch camel-3.18.x updated (c9c5b24cd8d -> e9fb40a1c15)

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

davsclaus pushed a change to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git


    from c9c5b24cd8d CAMEL-18289: camel-core - fix exchange before sending it when submit in AggregateProcessor (#8038)
     new 9f1bb355a1a CAMEL-18306: camel-jbang - Allow to specify open-api in application.properties
     new e9fb40a1c15 CAMEL-18306: camel-jbang - Allow to specify open-api in application.properties

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/dsl/jbang/core/commands/Run.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


[camel] 01/02: CAMEL-18306: camel-jbang - Allow to specify open-api in application.properties

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9f1bb355a1a613c5ecdd783c5d1183729564656a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jul 26 12:55:41 2022 +0200

    CAMEL-18306: camel-jbang - Allow to specify open-api in application.properties
---
 .../java/org/apache/camel/dsl/jbang/core/commands/Run.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 c8a714a41fd..868eaeb6f43 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
@@ -275,11 +275,6 @@ class Run extends CamelCommand {
         removeDir(work);
         work.mkdirs();
 
-        // generate open-api early
-        if (openapi != null) {
-            generateOpenApi();
-        }
-
         Properties profileProperties = null;
         File profilePropertiesFile = new File(getProfile() + ".properties");
         if (profilePropertiesFile.exists()) {
@@ -296,9 +291,15 @@ class Run extends CamelCommand {
                 propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getName();
             }
             repos = profileProperties.getProperty("camel.jbang.repos", repos);
+            openapi = profileProperties.getProperty("camel.jbang.open-api", openapi);
             download = "true".equals(profileProperties.getProperty("camel.jbang.download", download ? "true" : "false"));
         }
 
+        // generate open-api early
+        if (openapi != null) {
+            generateOpenApi();
+        }
+
         // if no specific file to run then try to auto-detect
         if (files == null || files.length == 0) {
             String routes = profileProperties != null ? profileProperties.getProperty("camel.main.routesIncludePattern") : null;


[camel] 02/02: CAMEL-18306: camel-jbang - Allow to specify open-api in application.properties

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e9fb40a1c1546106256b6dcc266e54b2a80330e0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jul 26 13:24:33 2022 +0200

    CAMEL-18306: camel-jbang - Allow to specify open-api in application.properties
---
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 868eaeb6f43..4f3d33c272c 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
@@ -291,7 +291,7 @@ class Run extends CamelCommand {
                 propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getName();
             }
             repos = profileProperties.getProperty("camel.jbang.repos", repos);
-            openapi = profileProperties.getProperty("camel.jbang.open-api", openapi);
+            openapi = profileProperties.getProperty("camel.jbang.openApi", openapi);
             download = "true".equals(profileProperties.getProperty("camel.jbang.download", download ? "true" : "false"));
         }
 
@@ -356,6 +356,7 @@ class Run extends CamelCommand {
         // allow java-dsl to compile to .class which we need in uber-jar mode
         writeSetting(main, profileProperties, "camel.main.routesCompileDirectory", WORK_DIR);
         writeSetting(main, profileProperties, "camel.jbang.dependencies", dependencies);
+        writeSetting(main, profileProperties, "camel.jbang.openApi", openapi);
         writeSetting(main, profileProperties, "camel.jbang.repos", repos);
         writeSetting(main, profileProperties, "camel.jbang.health", health ? "true" : "false");
         writeSetting(main, profileProperties, "camel.jbang.console", console ? "true" : "false");