(camel) branch main updated: Polished
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 af9689af0ea Polished
af9689af0ea is described below
commit af9689af0ea71b5b8d97a265e158d4c1afe2fa79
Author: Claus Ibsen
AuthorDate: Thu May 16 17:36:52 2024 +0200
Polished
---
.../apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
index 80dec6b6cfe..66d45e5ae02 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
@@ -23,11 +23,6 @@ public abstract class AbstractJsseUtilFactoryBean extends
AbstractCamelFactor
@Override
public abstract T getObject() throws Exception;
-@Override
-public boolean isSingleton() {
-return true;
-}
-
@Override
public abstract Class getObjectType();
}
(camel) branch main updated: Polished
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 914b19c90e4 Polished
914b19c90e4 is described below
commit 914b19c90e48175f23546a5a24671c361475cd0b
Author: Claus Ibsen
AuthorDate: Tue May 14 15:01:45 2024 +0200
Polished
---
.../kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
index db92705233e..04bbd26fe36 100644
---
a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
+++
b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
@@ -32,7 +32,7 @@ import
kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT
@Experimental
@ManagedResource(description = "Managed KotlinRoutesBuilderLoader")
@RoutesLoader(EXTENSION)
-class KotlinRoutesBuilderLoader :
org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport(EXTENSION)
{
+class KotlinRoutesBuilderLoader : EndpointRouteBuilderLoaderSupport(EXTENSION)
{
@Throws(Exception::class)
override fun doLoadEndpointRouteBuilder(reader: Reader, builder:
EndpointRouteBuilder) {
val host = BasicJvmScriptingHost()
(camel) branch main updated: Polished
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 fe5da2805db Polished
fe5da2805db is described below
commit fe5da2805db24679c9f07da9b095f1bdd507ee1c
Author: Claus Ibsen
AuthorDate: Tue May 7 10:50:38 2024 +0200
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4
1 file changed, 4 insertions(+)
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 07420806a1a..480a08e0759 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
@@ -855,6 +855,8 @@ public class Run extends CamelCommand {
// export to hidden folder
ExportQuarkus eq = new ExportQuarkus(getMain());
eq.symbolicLink = true;
+eq.mavenWrapper = true;
+eq.gradleWrapper = false;
eq.quarkusVersion = this.quarkusVersion;
eq.camelVersion = this.camelVersion;
eq.kameletsVersion = this.kameletsVersion;
@@ -920,6 +922,8 @@ public class Run extends CamelCommand {
// export to hidden folder
ExportSpringBoot eq = new ExportSpringBoot(getMain());
eq.symbolicLink = true;
+eq.mavenWrapper = true;
+eq.gradleWrapper = false;
eq.springBootVersion = this.springBootVersion;
eq.camelVersion = this.camelVersion;
eq.camelSpringBootVersion = this.camelVersion;
(camel) branch main updated: Polished
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 86842afe186 Polished 86842afe186 is described below commit 86842afe186677551b71d090a43a1054b894a12f Author: Claus Ibsen AuthorDate: Thu Apr 4 19:58:23 2024 +0200 Polished --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc index 54c545b4d6a..b3caaad7ae7 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc @@ -96,7 +96,7 @@ Routes startup (total:2) Started demo (rest://post:%7B%7Bapp.mypath%7D%7D) -The placeholder is now resolved eagerly and you will see _nicer_ startup logs such as: +The placeholder is now resolved eagerly, and you will see _nicer_ startup logs such as: [source,text] @@ -139,7 +139,7 @@ Camel release versions to ensure the BOM is always correct. === camel-main -The options `camel.main.backlogTracing`, `"camel.main.backlogTracingStandby`, and `camel.main.backlogTracingTemplates` has been +The options `camel.main.backlogTracing`, `camel.main.backlogTracingStandby`, and `camel.main.backlogTracingTemplates` has been moved into a new group `camel.debug` with more options to configure the backlog tracer. To enable backlog tracing you should now set `camel.trace.enabled=true` instead of `camel.main.backlogTracing=true`.
(camel) branch main updated: Polished
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 70d0a6a9db0 Polished
70d0a6a9db0 is described below
commit 70d0a6a9db0136f25aea0f21a13dfd18f6d9151d
Author: Claus Ibsen
AuthorDate: Thu Mar 28 17:02:59 2024 +0100
Polished
---
.../main/java/org/apache/camel/cli/connector/LocalCliConnector.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index 069dd3946ca..6f6521bb928 100644
---
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -178,9 +178,9 @@ public class LocalCliConnector extends ServiceSupport
implements CliConnector, C
traceFile = createLockFile(lockFile.getName() + "-trace.json");
debugFile = createLockFile(lockFile.getName() + "-debug.json");
executor.scheduleWithFixedDelay(this::task, 0, delay,
TimeUnit.MILLISECONDS);
-LOG.info("Management from Camel JBang enabled");
+LOG.info("Camel JBang CLI enabled");
} else {
-LOG.warn("Cannot create PID file: {}. This integration cannot be
managed by Camel JBang.", getPid());
+LOG.warn("Cannot create PID file: {}. This integration cannot be
managed by Camel JBang CLI.", getPid());
}
}
(camel) branch main updated: Polished
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 4f75cd593d4 Polished 4f75cd593d4 is described below commit 4f75cd593d443556371e87cee02502eb2a43d310 Author: Claus Ibsen AuthorDate: Wed Feb 14 13:00:54 2024 +0100 Polished --- .../src/main/java/org/apache/camel/spi/DataTypeTransformer.java | 1 - .../apache/camel/processor/transformer/ByteArrayDataTypeTransformer.java | 1 - .../apache/camel/processor/transformer/StringDataTypeTransformer.java| 1 - .../java/org/apache/camel/impl/engine/LowercaseDataTypeTransformer.java | 1 - .../java/org/apache/camel/impl/engine/UppercaseDataTypeTransformer.java | 1 - .../camel/processor/transformer/custom/CustomDataTypeTransformer.java| 1 - 6 files changed, 6 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java index 7b2c9cd84f2..9d3de679f6a 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.spi; import java.lang.annotation.Documented; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/ByteArrayDataTypeTransformer.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/ByteArrayDataTypeTransformer.java index d553d979ea1..742ab3e62e2 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/ByteArrayDataTypeTransformer.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/ByteArrayDataTypeTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.processor.transformer; import org.apache.camel.Exchange; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/StringDataTypeTransformer.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/StringDataTypeTransformer.java index 02e53b2a06b..75f291a278e 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/StringDataTypeTransformer.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/StringDataTypeTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.processor.transformer; import java.nio.charset.StandardCharsets; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/LowercaseDataTypeTransformer.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/LowercaseDataTypeTransformer.java index 3cdf31ee232..5c89d184712 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/LowercaseDataTypeTransformer.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/LowercaseDataTypeTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.impl.engine; import org.apache.camel.Message; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/UppercaseDataTypeTransformer.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/UppercaseDataTypeTransformer.java index 58cdd93eca7..a5ed10e9456 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/UppercaseDataTypeTransformer.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/UppercaseDataTypeTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.impl.engine; import org.apache.camel.Message; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/custom/CustomDataTypeTransformer.java b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/custom/CustomDataTypeTransformer.java index 3dc9339c69e..876a80e7f79 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/custom/CustomDataTypeTransformer.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/custom/CustomDataTypeTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.processor.transformer.custom; import
(camel) branch main updated: Polished
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 94f98c23178 Polished
94f98c23178 is described below
commit 94f98c2317808c6902842a94c422aadee09d8fce
Author: Claus Ibsen
AuthorDate: Wed Feb 14 11:20:14 2024 +0100
Polished
---
.../java/org/apache/camel/spi/DataTypeTransformer.java | 12 +++-
.../src/main/java/org/apache/camel/spi/Transformer.java| 14 +-
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java
b/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java
index 062e6754543..7b2c9cd84f2 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeTransformer.java
@@ -38,25 +38,19 @@ import org.apache.camel.spi.annotations.ServiceFactory;
public @interface DataTypeTransformer {
/**
- * Data type transformer name. Identifies the data type transformer.
Should be unique in the Camel context. Can be a
- * combination of scheme and name. Is used to detect/reference the
transformer when specifying input/output data
- * types on routes.
- *
- * @return the data type transformer name.
+ * Data type transformer name. Identifies the data type transformer. It
Should be unique in the Camel context. It
+ * Can be a combination of scheme and name. It Is used to detect/reference
the transformer when specifying
+ * input/output data types on routes.
*/
String name() default "";
/**
* Data type representing the input of the transformation. Also used to
detect the transformer.
- *
- * @return
*/
String fromType() default "";
/**
* Data type representing the result of the transformation. Also used to
detect the transformer.
- *
- * @return
*/
String toType() default "";
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/Transformer.java
b/core/camel-api/src/main/java/org/apache/camel/spi/Transformer.java
index b5e5e6177e3..09e48fd359b 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/Transformer.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/Transformer.java
@@ -69,8 +69,6 @@ public abstract class Transformer extends ServiceSupport
implements CamelContext
/**
* Get the transformer name that represents the supported data type model.
- *
- * @return
*/
public String getName() {
return name;
@@ -92,8 +90,6 @@ public abstract class Transformer extends ServiceSupport
implements CamelContext
/**
* Set the name for this transformer. Usually a combination of scheme and
name.
- *
- * @param name the transformer name
*/
public Transformer setName(String name) {
this.name = name;
@@ -101,7 +97,7 @@ public abstract class Transformer extends ServiceSupport
implements CamelContext
}
/**
- * Set the scheme and/or name for this transformer. When using only a
scheme the transformer applies to all
+ * Set the scheme and/or name for this transformer. When using only a
scheme, the transformer applies to all
* transformations with that scheme.
*
* @param scheme supported data type scheme
@@ -122,8 +118,6 @@ public abstract class Transformer extends ServiceSupport
implements CamelContext
/**
* Set 'from' data type.
- *
- * @param from 'from' data type
*/
public Transformer setFrom(String from) {
this.from = new DataType(from);
@@ -132,8 +126,6 @@ public abstract class Transformer extends ServiceSupport
implements CamelContext
/**
* Set 'to' data type.
- *
- * @param to 'to' data type
*/
public Transformer setTo(String to) {
this.to = new DataType(to);
@@ -155,8 +147,4 @@ public abstract class Transformer extends ServiceSupport
implements CamelContext
return String.format("%s[name='%s', from='%s', to='%s']",
this.getClass().getSimpleName(), name, from, to);
}
-@Override
-protected void doStop() throws Exception {
-// no-op
-}
}
(camel) branch main updated: Polished
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 0c5b620c3cf Polished
0c5b620c3cf is described below
commit 0c5b620c3cfeb3881a7ab1ebfab6758faa63a1ca
Author: Claus Ibsen
AuthorDate: Tue Feb 13 13:54:39 2024 +0100
Polished
---
docs/user-manual/modules/ROOT/pages/variables.adoc | 32 ++
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/variables.adoc
b/docs/user-manual/modules/ROOT/pages/variables.adoc
index 9c3dc1a9a38..084adc21b69 100644
--- a/docs/user-manual/modules/ROOT/pages/variables.adoc
+++ b/docs/user-manual/modules/ROOT/pages/variables.adoc
@@ -4,10 +4,9 @@
In Camel 4.4, we have introduced the concept of _variables_.
-A variable is a key/value that can hold a value that can either be private per
`Exchange` or global shared
-in the `CamelContext`.
+A variable is a key/value that can hold a value that can either be private per
`Exchange`, or shared per route, or globally.
-NOTE: You can also use _exchange properties_ as variables but the exchange
properties are also used internally by Camel,
+NOTE: You can also use _exchange properties_ as variables, but the exchange
properties are also used internally by Camel,
and some EIPs and components. With the newly introduced _variables_ then these
are exclusively for end users.
== Variable Repository
@@ -22,8 +21,8 @@ The `ExchangeVariableRepository` is special as its private
per exchange and is t
The `RouteVariableRepository` is a single repository that holds variables that
are route scoped.
TIP: There is also `org.apache.camel.spi.BrowsableVariableRepository` which is
an extension to `VariableRepository` that
-has APIs to browse the currently variables. This is used by Camel with Camel
JBang, and JMX to be able to see the current variables
-from management tooling, CLI and the developer console.
+has APIs to browse the current variables. Camel uses this with Camel JBang,
and JMX to be able to see the current variables
+from management tooling, CLI, and the developer console.
=== Custom variable repositories
@@ -98,9 +97,9 @@ String str =
context.getVariable("route:myRouteId:myRouteKey", String.class);
It is also possible to use variables in Camel xref:routes.adoc[routes] using
the
setVariable, removeVariable, and convertVariableTo EIPs.
-These EIPs makes it possible to set and remove variables from routes. And you
can also access variables from the
xref:components:languages:simple-language.adoc[Simple] language.
+These EIPs make it possible to set and remove variables from routes. And you
can also access variables from the
xref:components:languages:simple-language.adoc[Simple] language.
-In the following route we set a variable on the exchange which we use later to
build a human-readable event message:
+In the following route, we set a variable on the exchange which we use later
to build a human-readable event message:
[tabs]
@@ -159,8 +158,8 @@ YAML::
When `route` variables in Camel routes, then the `routeId` is implied as the
current route, if not explicit declared.
-For example the following example the first route will set a variable in the
2nd route. And then 2nd route can then get
-the route variable without having to specify the route id:
+For example, the following example the first route will set a variable
(`route:second:foo`) in the second route.
+Then the second route can get hold of the variable without having to specify
its route id `route:foo`:
[tabs]
@@ -205,8 +204,8 @@ camel.variable.random = 999
Here the gold variable is set on the `route` repository, and the other
variables are set on the `global` repository.
-The value of a variable can also be loaded from file system, such as a JSon
file. To do this you should
-prefix the value with `resource:file:` or `resource:classpath:` to load from
file system or classpath,
+The value of a variable can also be loaded from the file system, such as a
JSon file. To do this, you should
+prefix the value with `resource:file:` or `resource:classpath:` to load from
the file system or classpath,
as shown below:
[source,properties]
@@ -234,10 +233,10 @@ or with the
xref:components:eips:claimCheck-eip.adoc[Claim Check] EIP.
=== Important concept when using variables and EIPs
-It is **important** to understand that the variables focuses the use of the
message **body** only.
+It is **important** to understand that the variables focus the use of the
message **body** only.
This is on purpose to keep it simpler and primary work with the message body
as the user data.
-The following table summarises what the EIP supports with variables:
+The following table summarizes what the EIP supports with variables:
|===
|*EIP* | *VariableSend* |
(camel) branch main updated: Polished
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 7f842fc3c04 Polished
7f842fc3c04 is described below
commit 7f842fc3c048a585890bfb225a4a698ac8a6122b
Author: Claus Ibsen
AuthorDate: Fri Jan 26 09:47:14 2024 +0100
Polished
---
dsl/camel-jbang/camel-jbang-it/pom.xml | 520 -
1 file changed, 256 insertions(+), 264 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-it/pom.xml
b/dsl/camel-jbang/camel-jbang-it/pom.xml
index 475e544d80d..e237ede9423 100644
--- a/dsl/camel-jbang/camel-jbang-it/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-it/pom.xml
@@ -18,277 +18,269 @@
-->
http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
-
- org.apache.camel
- camel-jbang-parent
- 4.4.0-SNAPSHOT
- ../pom.xml
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
- camel-jbang-it
- Camel :: JBang :: Integration tests
- jar
+
+org.apache.camel
+camel-jbang-parent
+4.4.0-SNAPSHOT
+../pom.xml
+
-
- true
-
+camel-jbang-it
+Camel :: JBang :: Integration tests
+jar
-
-
-
- org.awaitility
- awaitility
- ${awaitility-version}
- test
-
-
- ch.qos.logback
- logback-core
- ${logback-version}
-
-
- ch.qos.logback
- logback-classic
- ${logback-version}
-
-
- org.assertj
- assertj-core
- ${assertj-version}
-
-
- org.apache.camel
- camel-test-infra-cli
- ${project.version}
- test-jar
-
-
- org.apache.camel
-
camel-test-infra-mosquitto
- ${project.version}
- test-jar
-
-
- org.apache.camel
- camel-jbang-core
- ${project.version}
- test
-
-
-
+
+true
+
-
+
+
+
+org.awaitility
+awaitility
+${awaitility-version}
+test
+
+
+ch.qos.logback
+logback-core
+${logback-version}
+
+
+ch.qos.logback
+logback-classic
+${logback-version}
+
+
+org.assertj
+assertj-core
+${assertj-version}
+
+
+org.apache.camel
+camel-test-infra-cli
+${project.version}
+test-jar
+
+
+org.apache.camel
+camel-test-infra-mosquitto
+${project.version}
+test-jar
+
+
+org.apache.camel
+camel-jbang-core
+${project.version}
+test
+
+
+
-
- org.slf4j
- slf4j-api
- test
-
+
+
+org.slf4j
+slf4j-api
+test
+
+
+ch.qos.logback
+logback-core
+test
+
+
+ch.qos.logback
+logback-classic
+test
+
+
+org.awaitility
+awaitility
+test
+
+
+org.junit.jupiter
+junit-jupiter
+test
+
+
+org.junit.jupiter
(camel) branch main updated: Polished
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 7aaacb2dc37 Polished
7aaacb2dc37 is described below
commit 7aaacb2dc374648c66b3921536eb7020046c429a
Author: Claus Ibsen
AuthorDate: Thu Jan 18 18:21:52 2024 +0100
Polished
---
.../main/java/org/apache/camel/spi/InternalProcessor.java | 15 +++
1 file changed, 15 insertions(+)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/InternalProcessor.java
b/core/camel-api/src/main/java/org/apache/camel/spi/InternalProcessor.java
index 1275ef64be5..9716f3c6cdf 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/InternalProcessor.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/InternalProcessor.java
@@ -54,14 +54,29 @@ public interface InternalProcessor extends AsyncProcessor {
*/
T getAdvice(Class type);
+/**
+ * Adds advice for handling {@link RoutePolicy} for the route
+ */
void addRoutePolicyAdvice(List routePolicyList);
+/**
+ * Adds advice for tracking inflight exchanges for the given route
+ */
void addRouteInflightRepositoryAdvice(InflightRepository
inflightRepository, String routeId);
+/**
+ * Add advice for setting up {@link UnitOfWork} with the lifecycle of the
route.
+ */
void addRouteLifecycleAdvice();
+/**
+ * Add advice for JMX management for the route
+ */
void
addManagementInterceptStrategy(ManagementInterceptStrategy.InstrumentationProcessor
processor);
+/**
+ * To make it possible for advices to access the created route.
+ */
void setRouteOnAdvices(Route route);
}
(camel) branch main updated: Polished
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 6959b2e986a Polished
6959b2e986a is described below
commit 6959b2e986a15dbf45bdef5b27a186a03e1223e5
Author: Claus Ibsen
AuthorDate: Wed Dec 27 09:47:17 2023 +0100
Polished
---
.../src/main/docs/dynamic-router-control-component.adoc | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-dynamic-router/src/main/docs/dynamic-router-control-component.adoc
b/components/camel-dynamic-router/src/main/docs/dynamic-router-control-component.adoc
index b5912332a41..619537ca3cf 100644
---
a/components/camel-dynamic-router/src/main/docs/dynamic-router-control-component.adoc
+++
b/components/camel-dynamic-router/src/main/docs/dynamic-router-control-component.adoc
@@ -38,12 +38,12 @@ include::partial$component-endpoint-options.adoc[]
// endpoint options: START
// endpoint options: END
-=== Subscribing
+== Subscribing
Subscribing can be achieved by using query parameters in the control endpoint
URI, or by sending a
`DynamicRouterControlMessage` to the control endpoint URI.
- URI examples
+=== URI examples
.Example Java URI `RouteBuilder` Subscription
[source,java]
@@ -85,7 +85,7 @@ dynamic URI, we have to send subscription parameters from a
`ProducerTemplate` i
endpoint uses headers "under the hood", because the URI params are converted
to headers, so we can set the headers
deliberately.
- DynamicRouterControlMessage example
+=== DynamicRouterControlMessage example
.Example Java `DynamicRouterControlMessage` Subscription
[source,java]
@@ -101,13 +101,13 @@ DynamicRouterControlMessage controlMessage =
DynamicRouterControlMessage.newBuil
producerTemplate.sendBody("dynamic-router-control:subscribe", controlMessage);
-=== Unsubscribing
+== Unsubscribing
Like subscribing, unsubscribing can also be achieved by using query
parameters in the control endpoint URI, or by
sending a `DynamicRouterControlMessage` to the control endpoint URI. The
difference is that unsubscribing can be
achieved by using either one or two parameters.
- URI examples
+=== URI examples
.Example Java URI `RouteBuilder` Unsubscribe
[source,java]
@@ -135,7 +135,7 @@ template.sendBodyAndHeaders("direct:unsubscribe", "",
Above, because the control URI is dynamic, we have to send it from a
`ProducerTemplate` in a different way. The
dynamic-aware endpoint uses headers, rather than URI params, so we set the
headers deliberately.
-= DynamicRouterControlMessage example
+=== DynamicRouterControlMessage example
.Example Java `DynamicRouterControlMessage` Unsubscribe
[source,java]
(camel) branch main updated: Polished
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 8c3da6d829c Polished
8c3da6d829c is described below
commit 8c3da6d829c9bf5d9d7aa1546d0dd418035ca9e3
Author: Claus Ibsen
AuthorDate: Thu Dec 21 13:21:58 2023 +0100
Polished
---
.../camel/main/download/DependencyDownloaderComponentResolver.java | 1 -
.../camel/main/download/DependencyDownloaderDataFormatResolver.java | 1 -
.../apache/camel/main/download/DependencyDownloaderLanguageResolver.java | 1 -
3 files changed, 3 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
index edd1bd469d5..c1548d841c2 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
@@ -112,7 +112,6 @@ public final class DependencyDownloaderComponentResolver
extends DefaultComponen
}
private boolean accept(String name) {
-// kamelet component must not be stubbed
if (stubPattern == null) {
return true;
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
index c8154e73e88..20e6506fd6f 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderDataFormatResolver.java
@@ -75,7 +75,6 @@ public final class DependencyDownloaderDataFormatResolver
extends DefaultDataFor
}
private boolean accept(String name) {
-// kamelet component must not be stubbed
if (stubPattern == null) {
return true;
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
index 1d5b8a7758a..df6bc024bd4 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
@@ -82,7 +82,6 @@ public final class DependencyDownloaderLanguageResolver
extends DefaultLanguageR
}
private boolean accept(String name) {
-// kamelet component must not be stubbed
if (stubPattern == null) {
return true;
}
(camel) branch main updated: Polished
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 ad32d8619de Polished
ad32d8619de is described below
commit ad32d8619de9ad676a0efad49777a8cae147
Author: Claus Ibsen
AuthorDate: Thu Dec 21 10:16:45 2023 +0100
Polished
---
core/camel-api/src/main/java/org/apache/camel/Clock.java | 2 +-
core/camel-api/src/main/java/org/apache/camel/Exchange.java| 3 +++
.../src/main/java/org/apache/camel/support/DefaultExchange.java| 7 ---
.../src/main/java/org/apache/camel/support/MonotonicClock.java | 4 +++-
.../src/main/java/org/apache/camel/support/ResetableClock.java | 4 +++-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Clock.java
b/core/camel-api/src/main/java/org/apache/camel/Clock.java
index ffe50fe6387..66e18399965 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Clock.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Clock.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel;
import java.time.Instant;
@@ -26,6 +25,7 @@ import java.util.Date;
* A clock used to track the lifetime of an exchange
*/
public interface Clock {
+
/**
* The elapsed time since the creation of the exchange
*
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index f8390711f73..9f7aac0f0bc 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -673,6 +673,9 @@ public interface Exchange {
*/
ExchangeExtension getExchangeExtension();
+/**
+ * Gets {@link Clock} that holds time information about the exchange
+ */
Clock getClock();
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
index 77a34dbec27..0ed154f3817 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
@@ -35,31 +35,26 @@ public final class DefaultExchange extends AbstractExchange
{
DefaultExchange(CamelContext context, EnumMap
internalProperties,
Map properties) {
super(context, internalProperties, properties);
-
this.timeInfo = new MonotonicClock();
}
public DefaultExchange(CamelContext context) {
super(context);
-
this.timeInfo = new MonotonicClock();
}
public DefaultExchange(CamelContext context, ExchangePattern pattern) {
super(context, pattern);
-
this.timeInfo = new MonotonicClock();
}
public DefaultExchange(Exchange parent) {
super(parent);
-
this.timeInfo = parent.getClock();
}
DefaultExchange(AbstractExchange parent) {
super(parent);
-
this.timeInfo = parent.getClock();
}
@@ -79,9 +74,7 @@ public final class DefaultExchange extends AbstractExchange {
public static DefaultExchange newFromEndpoint(Endpoint fromEndpoint,
ExchangePattern exchangePattern) {
DefaultExchange exchange = new
DefaultExchange(fromEndpoint.getCamelContext(), exchangePattern);
-
exchange.getExchangeExtension().setFromEndpoint(fromEndpoint);
-
return exchange;
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/MonotonicClock.java
b/core/camel-support/src/main/java/org/apache/camel/support/MonotonicClock.java
index 9a28d8b37e8..4cbda16341c 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/MonotonicClock.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/MonotonicClock.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.support;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Clock;
+/**
+ * A clock that is used for precise timing.
+ */
public class MonotonicClock implements Clock {
private final long createdNano;
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ResetableClock.java
b/core/camel-support/src/main/java/org/apache/camel/support/ResetableClock.java
index 130deaecfd4..dfacfa694ef 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ResetableClock.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ResetableClock.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
*
(camel) branch main updated: Polished
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 fb75371e9e9 Polished fb75371e9e9 is described below commit fb75371e9e9e3594247dd955ff88506750096d81 Author: Claus Ibsen AuthorDate: Wed Nov 22 09:33:01 2023 +0100 Polished --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc index d10fc3a5675..d094f7c2a55 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc @@ -12,7 +12,7 @@ Added `boolean` parameter to `matchProcess` method on `org.apache.camel.spi.Cond === camel-base-engine -`org.apache.camel.impl.debuggerBacklogDebugger` has been splitted between an interface `org.apache.camel.spi.BacklogDebugger` and a default implementation `org.apache.camel.impl.debugger.DefaultBacklogDebugger`. +The class `org.apache.camel.impl.DebuggerBacklogDebugger` has been refactored to an interface `org.apache.camel.spi.BacklogDebugger` and a default implementation `org.apache.camel.impl.debugger.DefaultBacklogDebugger`. === camel-main
(camel) branch main updated: Polished
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 da6507d0f7e Polished
da6507d0f7e is described below
commit da6507d0f7efaead42f1603de3715affc3ff4238
Author: Claus Ibsen
AuthorDate: Wed Nov 22 07:46:13 2023 +0100
Polished
---
.../apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java | 8
1 file changed, 4 insertions(+), 4 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 4589b36c8c5..343ca59f4ef 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
@@ -53,14 +53,14 @@ public class CodeRestGenerator extends CamelCommand {
private String output;
@CommandLine.Option(names = { "-t", "--type" }, description = "REST DSL
type (YAML or XML)", defaultValue = "yaml")
private String type;
-@CommandLine.Option(names = { "-r", "--routes" }, description = "Generate
routes (YAML)")
+@CommandLine.Option(names = { "-r", "--routes" }, description = "Generate
routes (only in YAML)")
private boolean generateRoutes;
-@CommandLine.Option(names = { "-d", "--dto" }, description = "Data
Objects")
+@CommandLine.Option(names = { "-d", "--dto" }, description = "Generate
Java Data Objects")
private boolean generateDataObjects;
-@CommandLine.Option(names = { "-run", "--runtime" }, description =
"Runtime (quarkus, spring-boot)",
+@CommandLine.Option(names = { "-run", "--runtime" }, description =
"Runtime (quarkus, or spring-boot)",
defaultValue = "quarkus")
private String runtime;
-@CommandLine.Option(names = { "-p", "--package" }, description = "Package
for generated models", defaultValue = "model")
+@CommandLine.Option(names = { "-p", "--package" }, description = "Package
for generated Java models", defaultValue = "model")
private String packageName;
public CodeRestGenerator(CamelJBangMain main) {
[camel] branch main updated: Polished
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 f12421c5232 Polished
f12421c5232 is described below
commit f12421c5232a85fccad95b58f9f4b61e9fac0d84
Author: Claus Ibsen
AuthorDate: Wed Oct 25 12:02:11 2023 +0200
Polished
---
.../camel-opentelemetry/src/main/docs/opentelemetry.adoc | 13 +
.../apache/camel/opentelemetry/AttributeProcessor.java | 10 --
.../opentelemetry/OpenTelemetryTracingStrategy.java | 2 ++
.../opentelemetry/SetCorrelationContextProcessor.java| 16 ++--
.../opentelemetry/propagators/OpenTelemetrySetter.java | 1 +
5 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
b/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
index 26bbec426ad..c61cdd1bde8 100644
--- a/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
+++ b/components/camel-opentelemetry/src/main/docs/opentelemetry.adoc
@@ -69,19 +69,24 @@ This package includes the instrumentation agent as well as
instrumentations for
The package provides a completely automatic, out-of-the-box experience.
Enable the instrumentation agent using the `-javaagent` flag to the JVM.
-```
+
+[source,bash]
+
java -javaagent:path/to/opentelemetry-javaagent.jar \
-jar myapp.jar
-```
+
+
By default, the OpenTelemetry Java agent uses
https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp[OTLP
exporter] configured to send data to
https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md[OpenTelemetry
collector] at `http://localhost:4317`.
Configuration parameters are passed as Java system properties (`-D` flags) or
as environment variables. See
https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/agent-config.md[the
configuration documentation] for the full list of configuration items. For
example:
-```
+
+[source,bash]
+
java -javaagent:path/to/opentelemetry-javaagent.jar \
-Dotel.service.name=your-service-name \
-Dotel.traces.exporter=jaeger \
-jar myapp.jar
-```
+
include::spring-boot:partial$starter.adoc[]
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
index 6a111aeb694..61d81726941 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java
@@ -100,16 +100,6 @@ public class AttributeProcessor extends
AsyncProcessorSupport implements Traceab
return expression;
}
-@Override
-protected void doStart() throws Exception {
-// noop
-}
-
-@Override
-protected void doStop() throws Exception {
-// noop
-}
-
@Override
public String toString() {
return id;
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
index da3b3c854a7..9f3f3870cd1 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
@@ -31,7 +31,9 @@ import org.apache.camel.tracing.ActiveSpanManager;
import org.apache.camel.tracing.SpanDecorator;
public class OpenTelemetryTracingStrategy implements InterceptStrategy {
+
private static final String UNNAMED = "unnamed";
+
private final OpenTelemetryTracer tracer;
public OpenTelemetryTracingStrategy(OpenTelemetryTracer tracer) {
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
index 28330c199f2..3bb03a91252 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
@@ -28,9 +28,6 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * @author rvargasp
- */
public class SetCorrelationContextProcessor extends AsyncProcessorSupport
implements Traceable, IdAware, RouteIdAware {
private static final Logger LOG =
[camel] branch main updated: Polished
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 13c7ed82ff2 Polished
13c7ed82ff2 is described below
commit 13c7ed82ff2732b5c69f624c9eb3541d5b3fa490
Author: Claus Ibsen
AuthorDate: Wed Oct 18 16:27:03 2023 +0200
Polished
---
.../org/apache/camel/impl/engine/DefaultContextPluginManager.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
index 79b9e06ca5a..f33ad017b61 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.impl.engine;
import java.util.Map;
@@ -25,11 +24,8 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.PluginManager;
public class DefaultContextPluginManager implements PluginManager {
-private final Map, Object> extensions = new ConcurrentHashMap<>();
-
-public DefaultContextPluginManager() {
-}
+private final Map, Object> extensions = new ConcurrentHashMap<>();
@Override
public T getContextPlugin(Class type) {
[camel] branch main updated: Polished
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 ccdb249d863 Polished
ccdb249d863 is described below
commit ccdb249d863244c3ac64471915659d071a3b4ee6
Author: Claus Ibsen
AuthorDate: Sat Oct 7 10:12:50 2023 +0200
Polished
---
dsl/camel-jbang/camel-jbang-core/pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml
b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 73097ec60c7..9e2bbaa6beb 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -126,7 +126,7 @@
jansi
${jansi-version}
-
+
org.apache.camel
camel-openapi-rest-dsl-generator
@@ -151,8 +151,7 @@
com.fasterxml.jackson.core
jackson-databind
-
-
+
[camel] branch main updated: Polished
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 fff2a09c1c8 Polished
fff2a09c1c8 is described below
commit fff2a09c1c84d8b6851f48e97d81c419a8b279e2
Author: Claus Ibsen
AuthorDate: Wed Oct 4 21:11:35 2023 +0200
Polished
---
.../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 ++--
.../java/org/apache/camel/dsl/jbang/core/commands/Transform.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 7f0f22e1007..4f052d10534 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -129,6 +129,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("copy", new CommandLine(new
DependencyCopy(main
.addSubcommand("generate", new CommandLine(new
CodeGenerator(main))
.addSubcommand("rest", new CommandLine(new
CodeRestGenerator(main
+.addSubcommand("sbom", new CommandLine(new
SBOMGenerator(main)))
.addSubcommand("catalog", new CommandLine(new
CatalogCommand(main))
.addSubcommand("component", new CommandLine(new
CatalogComponent(main)))
.addSubcommand("dataformat", new CommandLine(new
CatalogDataFormat(main)))
@@ -150,8 +151,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("version", new CommandLine(new
VersionCommand(main))
.addSubcommand("get", new CommandLine(new
VersionGet(main)))
.addSubcommand("set", new CommandLine(new
VersionSet(main)))
-.addSubcommand("list", new CommandLine(new
VersionList(main
-.addSubcommand("sbom", new CommandLine(new
SBOMGenerator(main)));
+.addSubcommand("list", new CommandLine(new
VersionList(main;
commandLine.getCommandSpec().versionProvider(() -> {
CamelCatalog catalog = new DefaultCamelCatalog();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
index 4439455a27b..d1e1bf60c95 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
@@ -29,7 +29,7 @@ import org.apache.camel.util.StopWatch;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "transform", description = "Transform Camel route to XML or
YAML format", sortOptions = false)
+@Command(name = "transform", description = "Transform Camel routes to XML or
YAML format", sortOptions = false)
public class Transform extends CamelCommand {
@CommandLine.Parameters(description = "The Camel file(s) to run. If no
files specified then application.properties is used as source for which files
to run.",
@@ -52,7 +52,8 @@ public class Transform extends CamelCommand {
boolean resolvePlaceholders;
@CommandLine.Option(names = { "--uri-as-parameters" },
-description = "Whether to expand URIs into separated
key/value parameters (only in use for YAML format)")
+description = "Whether to expand URIs into separated
key/value parameters (only in use for YAML format"
+ + "and recommended to enable when using
Apache Camel Karavan)")
boolean uriAsParameters;
@CommandLine.Option(names = { "--ignore-loading-error" },
[camel] branch main updated: Polished docs
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 c5ff7cbf85e Polished docs
c5ff7cbf85e is described below
commit c5ff7cbf85e09587659dab3e4785fb3a37e8d26e
Author: Claus Ibsen
AuthorDate: Mon Aug 14 20:51:27 2023 +0200
Polished docs
---
.../src/main/docs/aws2-step-functions-component.adoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-aws/camel-aws2-step-functions/src/main/docs/aws2-step-functions-component.adoc
b/components/camel-aws/camel-aws2-step-functions/src/main/docs/aws2-step-functions-component.adoc
index b61b01964c0..3ac24548ded 100644
---
a/components/camel-aws/camel-aws2-step-functions/src/main/docs/aws2-step-functions-component.adoc
+++
b/components/camel-aws/camel-aws2-step-functions/src/main/docs/aws2-step-functions-component.adoc
@@ -16,7 +16,8 @@
*{component-header}*
The AWS2 Step Functions component supports following operations on
-https://aws.amazon.com/step-functions/[AWS Step Functions]
+https://aws.amazon.com/step-functions/[AWS Step Functions]:
+
- Create, delete, update, describe, list state machines.
- Create, delete, describe, list activities.
- Start, start sync, stop, list, describe executions.
[camel] branch main updated: Polished
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 e81ba41bb4a Polished
e81ba41bb4a is described below
commit e81ba41bb4a24f9f6bcdfa744b00b033191bd8dd
Author: Claus Ibsen
AuthorDate: Mon Jul 24 19:44:34 2023 +0200
Polished
---
.../src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java
b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java
index e830d9d05b2..acc564175a8 100644
---
a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java
+++
b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java
@@ -24,8 +24,6 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font;
/**
* The 14 standard fonts by name. Created here because there is no way to get
a standard font by name in {@code pdfbox}
* 2.0
- *
- * @author https://github.com/ppalaga;>Peter Palaga
*/
public final class Standard14Fonts {
private static final Map FONTS_BY_NAME = new
HashMap<>();
[camel] branch main updated: Polished
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 38e70d294cb Polished
38e70d294cb is described below
commit 38e70d294cb7fbb647604853535579d47d04d1d6
Author: Claus Ibsen
AuthorDate: Wed Jun 28 08:00:36 2023 +0200
Polished
---
.../org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
index 4ef6e82332f..741396875a3 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
@@ -27,7 +27,7 @@ import picocli.CommandLine.Command;
@Command(name = "stop", description = "Shuts down running Camel integrations")
public class StopProcess extends ProcessBaseCommand {
-@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "0..1")
+@CommandLine.Parameters(description = "Name or pid of running Camel
integration(s)", arity = "0..1")
String name = "*";
@CommandLine.Option(names = { "--kill" },
[camel] branch main updated: Polished 3.21 upgrade guide
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 076949cd6e5 Polished 3.21 upgrade guide 076949cd6e5 is described below commit 076949cd6e528c1393b44d06952381a625ee801c Author: Claus Ibsen AuthorDate: Fri Jun 16 12:45:28 2023 +0200 Polished 3.21 upgrade guide --- .../ROOT/pages/camel-3x-upgrade-guide-3_21.adoc| 76 +++--- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc index f2227d00e77..5d4a20bb53c 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc @@ -83,7 +83,41 @@ The command `camel dependencies` has been renamed to `camel dependency`. In Camel JBang the `-dir` parameter for `init` and `run` goal has been renamed to require 2 dashes `--dir` like all the other options. -=== camel-spring-boot +=== camel-java-joor-dsl + +The `camel-java-joor-dsl` cannot anymore load routes defined in class files as we consider it no more needed, consequently the ability to configure the compile directory and the compile load first flag using the corresponding `camel-main` properties is no longer possible. + +=== camel-elasticsearch + +The `certificatePath` parameter can now be specified as resource: for user pointing to a local certificate, the file should be now prefixed with `file:`. It's also possible to use the classic resource helper prefixes, like `classpath`, `https` etc. + +=== camel-rest + +The deprecated option `componentName` was removed. Please use either `producerComponentName` or `consumerComponentName`. + +=== Deprecated Components + +The following components that had been marked as deprecated, were removed in this release: + +* camel-dozer +* camel-cmis + +=== Backlog Tracing + +The option `backlogTracing=true` now automatic enabled the tracer on startup. The previous behavior +was _surprisingly_ that the tracer was only made available, and had to be manually enabled afterwards. +The old behavior can be archived by setting `backlogTracingStandby=true`. + +Move the following class from `org.apache.camel.api.management.mbean.BacklogTracerEventMessage` in `camel-management-api` JAR +to `org.apache.camel.spi.BacklogTracerEventMessage` in `camel-api` JAR. + + +== Camel Spring Boot + +The `camel-spring-boot` dependency no longer includes `camel-spring-xml`. To use legacy Spring XML files `` +with Camel on Spring Boot, then include the `camel-spring-boot-xml-starter` dependency. + +=== Health Check The health-check has aligned to be more similar to microprofile-health in the JSon output. Spring Boot now also includes additional data per check, when using full exposure level. @@ -121,44 +155,6 @@ For example as shown below for the context health check: } -=== camel-java-joor-dsl - -The `camel-java-joor-dsl` cannot anymore load routes defined in class files as we consider it no more needed, consequently the ability to configure the compile directory and the compile load first flag using the corresponding `camel-main` properties is no longer possible. - -=== camel-elasticsearch - -The `certificatePath` parameter can now be specified as resource: for user pointing to a local certificate, the file should be now prefixed with `file:`. It's also possible to use the classic resource helper prefixes, like `classpath`, `https` etc. - -=== camel-rest - -The deprecated option `componentName` was removed. Please use either `producerComponentName` or `consumerComponentName`. - -=== camel-platform-http-starter - -If the route or consumer is suspended then http status 503 is now returned instead of 404. - -=== Deprecated Components - -The following components that had been marked as deprecated, were removed in this release: - -* camel-dozer -* camel-cmis - -== Backlog Tracing - -The option `backlogTracing=true` now automatic enabled the tracer on startup. The previous behavior -was _surprisingly_ that the tracer was only made available, and had to be manually enabled afterwards. -The old behavior can be archived by setting `backlogTracingStandby=true`. - -Move the following class from `org.apache.camel.api.management.mbean.BacklogTracerEventMessage` in `camel-management-api` JAR -to `org.apache.camel.spi.BacklogTracerEventMessage` in `camel-api` JAR. - - -== Camel Spring Boot - -The `camel-spring-boot` dependency no longer includes `camel-spring-xml`. To use legacy Spring XML files `` -with Camel on Spring Boot, then include the `camel-spring-boot-xml-starter` dependency. - === camel-micrometer-starter The `uri` tags are now static instead of dynamic (by default), as potential too many tags
[camel] branch main updated: Polished
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 84d313feb1c Polished
84d313feb1c is described below
commit 84d313feb1c9c7966ae41b4dcc5d0fde40a6d278
Author: Claus Ibsen
AuthorDate: Wed Apr 26 09:41:48 2023 +0200
Polished
---
docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
index 270cc60e83b..ab47d1a2c58 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
@@ -253,10 +253,12 @@ Now the context-path is not in use, and the endpoint can
be called with `http://
NOTE: The `platform-http-starter` can also be used with Rest DSL.
== camel-optaplanner
+
The `camel-optaplanner` component has been change to use `SolverManager`. If
you were using `SoverManager` in Camel 3, you don't need anymore the boolean
useSolverManager in the Route.
Deprecated `ProblemFactChange` has been replaced by `ProblemChange`.
-The new URI path is :
+The new URI path is:
+
[source,java]
from("optaplanner:myProblemName")
@@ -264,12 +266,14 @@ from("optaplanner:myProblemName")
You can pass the Optaplanner SolverManager in 2 ways:
+
- as #parameter
- as header
-When running `camel-optaplanner` on Spring Boot or Quarkus, it is preferrable
to use the Spring Boot or Quarkus way of creating the SolverManager.
+When running `camel-optaplanner` on Spring Boot or Quarkus, it is preferable
to use the Spring Boot or Quarkus way of creating the SolverManager.
It is possible to migrate legacy Camel Optaplanner Routes, by putting the XML
config file, as show in the code below. Camel Optaplanner will handle creating
the SolverManager for those legacy Routes:
+
[source,java]
from("optaplanner:myProblemName?configFile=PATH/TO/CONFIG.FILE.xml")
[camel] branch main updated: Polished doc
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 696aaf1ee8d Polished doc
696aaf1ee8d is described below
commit 696aaf1ee8dcea24084a949a6b53b934e8197074
Author: Claus Ibsen
AuthorDate: Mon Apr 24 20:45:22 2023 +0200
Polished doc
---
.../camel-sql/src/main/docs/sql-component.adoc | 107 +
1 file changed, 45 insertions(+), 62 deletions(-)
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc
b/components/camel-sql/src/main/docs/sql-component.adoc
index 301e477a739..74388dabc70 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -36,11 +36,8 @@ for this component:
The SQL component also supports:
-* a JDBC based repository for the
-Idempotent Consumer EIP pattern. See
-further below.
-* a JDBC based repository for the Aggregator EIP
-pattern. See further below.
+* a JDBC based repository for the Idempotent Consumer EIP pattern. See further
below.
+* a JDBC based repository for the Aggregator EIP pattern. See further below.
== URI format
@@ -56,8 +53,7 @@ The SQL component uses the following endpoint URI notation:
sql:select * from table where id=# order by name[?options]
-You can use named parameters by using
-:`#name_of_the_parameter` style as shown:
+You can use named parameters by using `:#name_of_the_parameter` style as shown:
sql:select * from table where id=:#myId order by name[?options]
@@ -66,13 +62,13 @@ sql:select * from table where id=:#myId order by
name[?options]
When using named parameters, Camel will lookup the names from, in the
given precedence:
-1. from message body if its a `java.util.Map`
-2. from message headers
+1. from a xref:languages:simple-language.adoc[Simple] expressions
+2. from message body if its a `java.util.Map`
+3. from message headers
If a named parameter cannot be resolved, then an exception is thrown.
-You can use Simple expressions as parameters as
-shown:
+You can use xref:languages:simple-language.adoc[Simple] expressions as
parameters as shown:
sql:select * from table where id=:#${exchangeProperty.myId} order by
name[?options]
@@ -83,14 +79,13 @@ SQL query is substituted with the `pass:[#]` symbol,
because the `?` symbol is
used to specify options for the endpoint. The `?` symbol replacement can
be configured on endpoint basis.
-You can externalize your SQL queries to files
-in the classpath or file system as shown:
+You can externalize your SQL queries to files in the classpath or file system
as shown:
sql:classpath:sql/myquery.sql[?options]
-And the myquery.sql file is in the classpath and is just a plain text
+And the `myquery.sql` file is in the classpath and is just a plain text
[source,sql]
@@ -107,7 +102,6 @@ In the file you can use multilines and format the SQL as
you wish. And
also use comments such as the – dash line.
-
// component-configure options: START
// component-configure options: END
@@ -156,7 +150,7 @@ depending on the presence of query parameters.
For `select` operations, the result is an instance of
`List>` type, as returned by the
-http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/jdbc/core/JdbcTemplate.html#queryForList(java.lang.String,%20java.lang.Object%91%93)[JdbcTemplate.queryForList()]
+http://static.springframework.org/spring/docs/6.0.x/api/org/springframework/jdbc/core/JdbcTemplate.html#queryForList(java.lang.String,%20java.lang.Object%91%93)[JdbcTemplate.queryForList()]
method. For `update` operations, a `NULL` body is returned as the `update`
operation is only set as a header and never as a body.
By default, the result is placed in the message body. If the
@@ -175,7 +169,7 @@ from("jms:order.inbox")
== Using StreamList
-The producer supports outputType=StreamList
+The producer supports `outputType=StreamList`
that uses an iterator to stream the output of the query. This allows to
process the data in a streaming fashion which for example can be used by
the Splitter EIP to process each row one at a time,
@@ -184,32 +178,28 @@ and load data from the database as needed.
[source,java]
from("direct:withSplitModel")
-.to("sql:select * from projects order by
id?outputType=StreamList=org.apache.camel.component.sql.ProjectModel")
-.to("log:stream")
-.split(body()).streaming()
-.to("log:row")
-.to("mock:result")
-.end();
+.to("sql:select * from projects order by
id?outputType=StreamList=org.apache.camel.component.sql.ProjectModel")
+.to("log:stream")
+.split(body()).streaming()
+.to("log:row")
+.to("mock:result")
+.end();
== Generated keys
-*Since Camel 2.12.4, 2.13.1 and 2.14*
-
If
[camel] branch main updated: Polished
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 28766fb5b87 Polished 28766fb5b87 is described below commit 28766fb5b87ac9c3f7421246391b5e453321a22d Author: Claus Ibsen AuthorDate: Thu Jan 19 12:59:31 2023 +0100 Polished --- components/pom.xml | 7 --- 1 file changed, 7 deletions(-) diff --git a/components/pom.xml b/components/pom.xml index 79e514050d1..6b2ce0ad1e6 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -76,7 +76,6 @@ camel-service - camel-amqp camel-any23 camel-arangodb @@ -113,7 +112,6 @@ camel-crypto camel-csimple-joor camel-csv - camel-debug camel-debezium camel-digitalocean @@ -170,7 +168,6 @@ camel-jasypt camel-javascript camel-jaxb - camel-jcache camel-tracing camel-jcr @@ -180,7 +177,6 @@ camel-jgroups camel-jira camel-jmx - camel-jolt camel-joor camel-jpa @@ -213,7 +209,6 @@ camel-metrics camel-micrometer camel-microprofile - camel-mina camel-minio camel-mllp @@ -232,7 +227,6 @@ camel-olingo4 camel-openstack camel-opentelemetry - camel-paho camel-paho-mqtt5 camel-pdf @@ -292,7 +286,6 @@ camel-stream camel-stringtemplate camel-stitch - camel-openapi-java camel-syslog camel-tarfile
[camel] branch main updated: Polished
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 3be7adaaaff Polished 3be7adaaaff is described below commit 3be7adaaaffed1a462b2dcb6ff8e6f3de8f96313 Author: Claus Ibsen AuthorDate: Fri Jan 13 17:19:15 2023 +0100 Polished --- .../camel-debezium-common/camel-debezium-maven-plugin/pom.xml | 4 ++-- .../resources/META-INF/services/org/apache/camel/other.properties | 4 ++-- .../src/generated/resources/debezium-maven-plugin.json| 2 +- components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 4 ++-- .../resources/META-INF/services/org/apache/camel/other.properties | 4 ++-- .../src/generated/resources/salesforce-maven-plugin.json | 2 +- components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml | 4 ++-- .../resources/META-INF/services/org/apache/camel/other.properties | 4 ++-- .../src/generated/resources/servicenow-maven-plugin.json | 2 +- tooling/maven/camel-restdsl-openapi-plugin/pom.xml| 4 ++-- tooling/maven/sync-properties-maven-plugin/pom.xml| 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml index a91ecb4a461..f1d2fbe7b12 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml @@ -30,8 +30,8 @@ org.apache.camel.maven camel-debezium-maven-plugin maven-plugin -Camel :: Debezium :: Maven plugin -Camel Debezium Maven plugin +Camel :: Debezium :: Maven Plugin +Camel Debezium Maven Plugin 3.0.0 diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties index d3ae0876289..2d00d6c3fa2 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=debezium-maven-plugin groupId=org.apache.camel.maven artifactId=camel-debezium-maven-plugin version=4.0.0-SNAPSHOT -projectName=Camel :: Debezium :: Maven plugin -projectDescription=Camel Debezium Maven plugin +projectName=Camel :: Debezium :: Maven Plugin +projectDescription=Camel Debezium Maven Plugin diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/debezium-maven-plugin.json b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/debezium-maven-plugin.json index 1ae2aff4a1d..4db983c7cab 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/debezium-maven-plugin.json +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/generated/resources/debezium-maven-plugin.json @@ -3,7 +3,7 @@ "kind": "other", "name": "debezium-maven-plugin", "title": "Debezium Maven Plugin", -"description": "Camel Debezium Maven plugin", +"description": "Camel Debezium Maven Plugin", "deprecated": false, "firstVersion": "3.0.0", "supportLevel": "Stable", diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index c2359b4fa05..1d1e6f7b584 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -30,8 +30,8 @@ org.apache.camel.maven camel-salesforce-maven-plugin maven-plugin -Camel :: Salesforce :: Maven plugin -Camel Salesforce Maven plugin +Camel :: Salesforce :: Maven Plugin +Camel Salesforce Maven Plugin .. diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-salesforce/camel-salesforce-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 279afd39280..5f911090940 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++
[camel] branch main updated: Polished
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 a4fdd1e5c3c Polished
a4fdd1e5c3c is described below
commit a4fdd1e5c3cba7ee909437a838c925d4aba74bdb
Author: Claus Ibsen
AuthorDate: Fri Jan 6 19:59:38 2023 +0100
Polished
---
.../org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java| 2 +-
.../main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
index 6b9828110fb..e595e4b2807 100644
---
a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
+++
b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
@@ -106,7 +106,7 @@ public final class CamelAnnotationsHandler {
} else if (!testClass.isAnnotationPresent(EnableRouteCoverage.class)) {
// route coverage need JMX so do not disable it by default
LOGGER.info(
-"Disabling Camel JMX globally for tests by default. Use
the DisableJMX annotation to override the default setting.");
+"Disabling Camel JMX globally for tests by default. Use
the DisableJMX annotation to override the default setting.");
DefaultCamelContext.setDisableJmx(true);
} else {
LOGGER.info("Enabling Camel JMX as EnableRouteCoverage is used.");
diff --git
a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
index 025a7008e57..1fb7432c098 100644
---
a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
+++
b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
@@ -102,7 +102,7 @@ public final class CamelAnnotationsHandler {
} else if (!testClass.isAnnotationPresent(EnableRouteCoverage.class)) {
// route coverage need JMX so do not disable it by default
LOGGER.info(
-"Disabling Camel JMX globally for tests by default. Use
the DisableJMX annotation to override the default setting.");
+"Disabling Camel JMX globally for tests by default. Use
the DisableJMX annotation to override the default setting.");
DefaultCamelContext.setDisableJmx(true);
} else {
LOGGER.info("Enabling Camel JMX as EnableRouteCoverage is used.");
[camel] branch main updated: Polished
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 bc7b56e5315 Polished
bc7b56e5315 is described below
commit bc7b56e5315ac5e754bf5043006b0e82eae409a8
Author: Claus Ibsen
AuthorDate: Mon Dec 26 19:54:46 2022 +0100
Polished
---
core/camel-api/src/main/java/org/apache/camel/StreamCache.java| 2 +-
.../java/org/apache/camel/support/jsse/KeyStoreParameters.java| 8 +---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/StreamCache.java
b/core/camel-api/src/main/java/org/apache/camel/StreamCache.java
index c89f5ec2793..622c9bc6e86 100644
--- a/core/camel-api/src/main/java/org/apache/camel/StreamCache.java
+++ b/core/camel-api/src/main/java/org/apache/camel/StreamCache.java
@@ -33,7 +33,7 @@ import java.io.OutputStream;
*/
public interface StreamCache {
-long DEFAULT_SPOOL_THRESHOLD = 128 * 1024;
+long DEFAULT_SPOOL_THRESHOLD = 128 * 1024L;
/**
* Resets the StreamCache for a new stream consumption.
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
index 33d1fe8ad59..ea063819de7 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
@@ -209,10 +209,12 @@ public class KeyStoreParameters extends JsseParameters {
try {
aliasEnum = ks.aliases();
} catch (KeyStoreException e) {
-e.printStackTrace();
+// ignore - only used for logging purposes
}
-while (aliasEnum.hasMoreElements()) {
-aliases.add(aliasEnum.nextElement());
+if (aliasEnum != null) {
+while (aliasEnum.hasMoreElements()) {
+aliases.add(aliasEnum.nextElement());
+}
}
return aliases;
}
[camel] branch main updated: Polished
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 43586526137 Polished
43586526137 is described below
commit 435865261370efdfddf9784b18b574492e87a3da
Author: Claus Ibsen
AuthorDate: Mon Dec 26 19:27:40 2022 +0100
Polished
---
.../main/java/org/apache/camel/parser/helper/CamelXmlHelper.java | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
index f7e87d26817..40020ea2a18 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
@@ -216,7 +216,7 @@ public final class CamelXmlHelper {
if (first) {
first = false;
String actual = getIdOrIndex(node, rootNodeCounts);
-if (!equal(actual, path)) {
+if (!Objects.equals(actual, path)) {
node = null;
}
} else {
@@ -244,7 +244,7 @@ public final class CamelXmlHelper {
Node child = childNodes.item(i);
if (child instanceof Element) {
String actual = getIdOrIndex(child, nodeCounts);
-if (equal(actual, path)) {
+if (Objects.equals(actual, path)) {
return child;
}
}
@@ -295,8 +295,4 @@ public final class CamelXmlHelper {
return name.equals(node.getLocalName()) ||
name.equals(node.getNodeName());
}
-private static boolean equal(Object a, Object b) {
-return Objects.equals(a, b);
-}
-
}
[camel] branch main updated: Polished
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 569149dd77e Polished
569149dd77e is described below
commit 569149dd77e542572914fb87353bc3ea8b1890ac
Author: Claus Ibsen
AuthorDate: Thu Dec 22 19:23:21 2022 +0100
Polished
---
.../main/java/org/apache/camel/component/docker/DockerOperation.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
index 971bdb3ccc4..e274ea358d0 100644
---
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
+++
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
@@ -27,13 +27,13 @@ public enum DockerOperation {
/**
* Events *
*/
-EVENTS("events", false, true, false,
+EVENTS("events", true, false, false,
DockerConstants.DOCKER_INITIAL_RANGE, Long.class),
/**
* Stats *
*/
-STATS("stats", false, true, false,
+STATS("stats", true, false, false,
DockerConstants.DOCKER_CONTAINER_ID, Long.class),
/**
[camel] branch main updated: Polished
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 309ce7ec89d Polished 309ce7ec89d is described below commit 309ce7ec89d4c6774a5f90a825610e7de0ee5864 Author: Claus Ibsen AuthorDate: Wed Dec 21 12:41:32 2022 +0100 Polished --- .../services/org/apache/camel/component.properties | 2 +- .../main/docs/modules/eips/pages/message-history.adoc | 12 ++-- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 18 +- .../modules/ROOT/pages/camel-maven-archetypes.adoc | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties index ef294ffe97d..7ae5b92b330 100644 --- a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -2,6 +2,6 @@ components=cxf cxfrs groupId=org.apache.camel artifactId=camel-cxf -version=3.20.0-SNAPSHOT +version=3.21.0-SNAPSHOT projectName=Camel :: CXF projectDescription=Camel CXF support diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc index 9004a6baa4e..445a875ecc7 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc @@ -153,8 +153,8 @@ Stacktrace java.lang.IllegalArgumentException: The number is too low at sample.camel.MyJavaRouteBuilder.configure(MyJavaRouteBuilder.java:34) ~[classes/:na] - at org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:607) ~[camel-core-model-3.20.0-SNAPSHOT.jar:3.20.0-SNAPSHOT] - at org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:553) ~[camel-core-model-3.20.0-SNAPSHOT.jar:3.20.0-SNAPSHOT] + at org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:607) ~[camel-core-model-3.20.0.jar:3.20.0] + at org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:553) ~[camel-core-model-3.20.0.jar:3.20.0] When Message History is enabled then the full history is logged as shown above. Here we can see the full path @@ -179,8 +179,8 @@ Stacktrace java.lang.IllegalArgumentException: The number is too low at sample.camel.MyJavaRouteBuilder.configure(MyJavaRouteBuilder.java:34) ~[classes/:na] - at org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:607) ~[camel-core-model-3.20.0-SNAPSHOT.jar:3.20.0-SNAPSHOT] - at org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:553) ~[camel-core-model-3.20.0-SNAPSHOT.jar:3.20.0-SNAPSHOT] + at org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:607) ~[camel-core-model-3.20.0.jar:3.20.0] + at org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:553) ~[camel-core-model-3.20.0.jar:3.20.0] Here you can see the Message History only outputs the input (route1) and the last step @@ -207,8 +207,8 @@ Stacktrace java.lang.IllegalArgumentException: The number is too low at sample.camel.MyJavaRouteBuilder.configure(MyJavaRouteBuilder.java:34) ~[classes/:na] - at org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:607) ~[camel-core-model-3.20.0-SNAPSHOT.jar:3.20.0-SNAPSHOT] - at org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:553) ~[camel-core-model-3.20.0-SNAPSHOT.jar:3.20.0-SNAPSHOT] + at org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:607) ~[camel-core-model-3.20.0.jar:3.20.0] + at org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:553) ~[camel-core-model-3.20.0.jar:3.20.0] In this case we can see its the `MyJavaRouteBuilder` class on line 35 that is the problem. diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 7dc872dd7ab..64dc1c7c695 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -549,7 +549,7 @@ And you can also try bleeding edge development by using SNAPSHOT such as: [source,bash] -jbang run --fresh -Dcamel.jbang.version=3.20.0-SNAPSHOT camel@apache/camel [command] +jbang run --fresh -Dcamel.jbang.version=3.21.0-SNAPSHOT camel@apache/camel [command] @@ -700,10 +700,10 @@ To display the status of the running
[camel] branch main updated: Polished
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 f90ede4372d Polished
f90ede4372d is described below
commit f90ede4372d4eee6ff252561f55f8bba6f3eeaae
Author: Claus Ibsen
AuthorDate: Tue Dec 20 11:44:22 2022 +0100
Polished
---
.../resources/org/apache/camel/catalog/components/plc4x.json| 2 +-
.../generated/resources/org/apache/camel/component/plc4x/plc4x.json | 2 +-
components/camel-plc4x/src/main/docs/plc4x-component.adoc | 2 +-
.../main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java | 3 +++
.../apache/camel/builder/component/ComponentsBuilderFactory.java| 2 +-
.../camel/builder/component/dsl/Plc4xComponentBuilderFactory.java | 4 ++--
dsl/camel-componentdsl/src/generated/resources/metadata.json| 2 +-
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++--
.../camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java | 6 +++---
9 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
index 67c4e12624b..64942f811b3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "plc4x",
"title": "PLC4X",
-"description": "Camel PLC4X support",
+"description": "Read and write to PLC devices",
"deprecated": false,
"firstVersion": "3.20.0",
"label": "iot",
diff --git
a/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
b/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
index 67c4e12624b..64942f811b3 100644
---
a/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
+++
b/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "plc4x",
"title": "PLC4X",
-"description": "Camel PLC4X support",
+"description": "Read and write to PLC devices",
"deprecated": false,
"firstVersion": "3.20.0",
"label": "iot",
diff --git a/components/camel-plc4x/src/main/docs/plc4x-component.adoc
b/components/camel-plc4x/src/main/docs/plc4x-component.adoc
index e17bd6e892d..87cedd0bec9 100644
--- a/components/camel-plc4x/src/main/docs/plc4x-component.adoc
+++ b/components/camel-plc4x/src/main/docs/plc4x-component.adoc
@@ -2,7 +2,7 @@
:doctitle: PLC4X
:shortname: plc4x
:artifactid: camel-plc4x
-:description: Camel PLC4X support
+:description: Read and write to PLC devices
:since: 3.20
:supportlevel: Preview
:component-header: Both producer and consumer are supported
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
index 9883ccd4831..4ad9fa58694 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
@@ -35,6 +35,9 @@ import
org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+/**
+ * Read and write to PLC devices
+ */
@UriEndpoint(scheme = "plc4x", firstVersion = "3.20.0", title = "PLC4X",
syntax = "plc4x:driver", category = Category.IOT)
public class Plc4XEndpoint extends DefaultEndpoint {
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 014bba87ea0..db5aaa3a824 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3452,7 +3452,7 @@ public interface ComponentsBuilderFactory {
}
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
[camel] branch main updated: Polished
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 40b4cd8a4cd Polished
40b4cd8a4cd is described below
commit 40b4cd8a4cd41f9ced1e8fa5330a87949968be11
Author: Claus Ibsen
AuthorDate: Thu Dec 15 07:06:19 2022 +0100
Polished
---
docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 2 --
1 file changed, 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index a6152e1e466..0ce9a508fae 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -367,7 +367,6 @@ use it to configure repository password:
[source,bash]
$ mvn -emp
-[INFO] BuildTimeEventSpy is registered.
Master password: camel
{hqXUuec2RowH8dA8vdqkF6jn4NU9ybOsDjuTmWvYj4U=}
@@ -386,7 +385,6 @@ Then a normal password can be configured like this:
[source,bash]
$ mvn -ep
-[INFO] BuildTimeEventSpy is registered.
Password: camel
{SSVqy/PexxQHvubrWhdguYuG7HnTvHlaNr6g3dJn7nk=}
[camel] branch main updated: Polished
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 78ec812707d Polished
78ec812707d is described below
commit 78ec812707dc43f65dffbfeff5b17eadbf39d9a5
Author: Claus Ibsen
AuthorDate: Wed Dec 14 11:38:21 2022 +0100
Polished
---
.../camel/processor/aggregate/AbstractListAggregationStrategy.java | 2 +-
.../camel/processor/aggregate/GroupedMessageAggregationStrategy.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
index a2b1767b35d..acc29410da2 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
@@ -114,7 +114,7 @@ public abstract class AbstractListAggregationStrategy
implements AggregationS
@Override
public String toString() {
-// lets override toString so we don't write data for all the
Exchanges by default
+// override toString, so we don't write data for all the Exchanges
by default
return "List(" + size() + " elements)";
}
}
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
index 35ce2da6625..0a1aa519062 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
@@ -26,7 +26,7 @@ import org.apache.camel.support.DefaultExchange;
* Aggregate all {@link Message} into a single combined Exchange holding all
the aggregated messages in a {@link List}
* of {@link Message} as the message body.
*
- * This aggregation strategy can used in combination with {@link
org.apache.camel.processor.Splitter} to batch messages
+ * This aggregation strategy can be used in combination with {@link
org.apache.camel.processor.Splitter} to batch messages
*/
public class GroupedMessageAggregationStrategy extends
AbstractListAggregationStrategy {
[camel] branch main updated: Polished
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 13f2df2568e Polished
13f2df2568e is described below
commit 13f2df2568ec6f7632ff85887c5580eb72d8b2a4
Author: Claus Ibsen
AuthorDate: Mon Dec 12 11:46:26 2022 +0100
Polished
---
.../main/java/org/apache/camel/builder/BuilderSupport.java | 2 +-
.../src/main/java/org/apache/camel/processor/Pipeline.java | 12 +---
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
index 9c0c99dbd8d..4e3270a06cc 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -573,7 +573,7 @@ public abstract class BuilderSupport implements
CamelContextAware {
/**
*
- * @return true if it an error handler factory was initialized
+ * @return true if an error handler factory was initialized
*/
public boolean hasErrorHandlerFactory() {
return this.errorHandlerFactory != null;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
index 48ac38e1ec5..68c8e8d8f36 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -107,7 +107,7 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate>> {}",
exchange.getExchangeId(), exchange);
@@ -127,16 +127,6 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate processors) {
if (processors.isEmpty()) {
return null;
[camel] branch main updated: Polished
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 e487506ef99 Polished e487506ef99 is described below commit e487506ef99fbe8c1a99fd58850c87d86afe3d55 Author: Claus Ibsen AuthorDate: Thu Dec 1 08:04:39 2022 +0100 Polished --- components/camel-wal/pom.xml | 43 +-- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/components/camel-wal/pom.xml b/components/camel-wal/pom.xml index 736bc5fdf3d..0eb2204e07a 100644 --- a/components/camel-wal/pom.xml +++ b/components/camel-wal/pom.xml @@ -1,34 +1,34 @@ -http://maven.apache.org/POM/4.0.0; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +--> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + +4.0.0 + -org.apache.camel components +org.apache.camel 3.20.0-SNAPSHOT -4.0.0 camel-wal jar - Camel :: WAL Camel WAL component for the Resume API @@ -67,5 +67,4 @@ -
[camel] branch main updated: Polished
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 bf98522eb05 Polished bf98522eb05 is described below commit bf98522eb05c8e477c182f11d15c302e69d0bc0d Author: Claus Ibsen AuthorDate: Wed Nov 30 07:02:54 2022 +0100 Polished --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2b07c9539a1..173d658b53b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -92,7 +92,7 @@ 5.13.3 3.2.0 0.9.5.5 - 3.1.2 +3.1.2 2.7.2 2.7.4 4.15.0
[camel] branch main updated: Polished
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 7d0d85a71cd Polished
7d0d85a71cd is described below
commit 7d0d85a71cd5cbbf0a5f2e0b40643020d14d85d8
Author: Claus Ibsen
AuthorDate: Tue Nov 8 09:56:53 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index a8b9b3a2300..6b68ce405a2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -26,7 +26,7 @@ import org.apache.camel.util.CamelCaseOrderedProperties;
import picocli.CommandLine.Command;
@Command(name = "export",
- description = "Export Camel integration to Maven based runtime (such
as Spring Boot or Quarkus)")
+ description = "Export Camel integration to Spring Boot or Quarkus
based project")
class Export extends ExportBaseCommand {
public Export(CamelJBangMain main) {
[camel] branch main updated: Polished
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 963c7c4910d Polished
963c7c4910d is described below
commit 963c7c4910d6ac17c0dbaef9f19e0f6d360a4a94
Author: Claus Ibsen
AuthorDate: Mon Nov 7 15:48:09 2022 +0100
Polished
---
core/camel-api/src/main/java/org/apache/camel/Route.java| 6 +++---
.../org/apache/camel/api/management/mbean/ManagedRouteMBean.java| 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Route.java
b/core/camel-api/src/main/java/org/apache/camel/Route.java
index 500e407eb46..b2039689899 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Route.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Route.java
@@ -212,10 +212,10 @@ public interface Route extends RuntimeConfiguration {
* Gets the last error that happened during changing the route lifecycle,
i.e. such as when an exception was thrown
* during starting the route.
*
- * This is only errors for route lifecycle changes, it is not exceptions
thrown during routing messsages with the
+ * This is only errors for route lifecycle changes, it is not exceptions
thrown during routing exchanges by the
* Camel routing engine.
*
- * @return the error
+ * @return the error or null if no error
*/
RouteError getLastError();
@@ -223,7 +223,7 @@ public interface Route extends RuntimeConfiguration {
* Sets the last error that happened during changing the route lifecycle,
i.e. such as when an exception was thrown
* during starting the route.
*
- * This is only errors for route lifecycle changes, it is not exceptions
thrown during routing messsages with the
+ * This is only errors for route lifecycle changes, it is not exceptions
thrown during routing exchanges by the
* Camel routing engine.
*
* @param error the error
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
index 72b00aa6a43..ce73585d0bd 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
@@ -142,7 +142,7 @@ public interface ManagedRouteMBean extends
ManagedPerformanceCounterMBean {
@ManagedAttribute(description = "Oldest inflight exchange id")
String getOldestInflightExchangeId();
-@ManagedAttribute(description = "Route controller")
+@ManagedAttribute(description = "Is using route controller")
Boolean getHasRouteController();
@ManagedAttribute(description = "Last error")
[camel] branch main updated: Polished
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 ecd891c9b40 Polished
ecd891c9b40 is described below
commit ecd891c9b405451563721b675b6de22f1db8ee95
Author: Claus Ibsen
AuthorDate: Sun Nov 6 20:24:56 2022 +0100
Polished
---
.../org/apache/camel/dsl/jbang/core/commands/DependencyTree.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
index eb262c08c60..be9b50df944 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
@@ -39,7 +39,7 @@ public class DependencyTree extends Export {
protected static final String EXPORT_DIR = ".camel-jbang/export";
-@CommandLine.Option(names = { "--output" }, description = "Output format
(gav or maven", defaultValue = "gav")
+@CommandLine.Option(names = { "--output" }, description = "Output format
(gav or maven)", defaultValue = "gav")
protected String output;
public DependencyTree(CamelJBangMain main) {
@@ -48,7 +48,12 @@ public class DependencyTree extends Export {
@Override
protected Integer export() throws Exception {
-this.quiet = true; // lets be quiet and generate from fresh data to
ensure the output is up to date
+this.quiet = true; // be quiet and generate from fresh data to ensure
the output is up-to-date
+
+if (!"gav".equals(output) && !"maven".equals(output)) {
+System.err.println("--output must be either gav or maven, was: " +
output);
+return 1;
+}
Integer answer = doExport();
if (answer == 0) {
[camel] branch main updated: Polished
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 e3dd702d492 Polished
e3dd702d492 is described below
commit e3dd702d4923c67070f37bd3e4f5bb6cfbf97b6c
Author: Claus Ibsen
AuthorDate: Sat Nov 5 11:33:00 2022 +0100
Polished
---
camel-dependencies/pom.xml | 2 +-
components/camel-plc4x/pom.xml | 26 +++---
.../camel/component/plc4x/Plc4XEndpoint.java | 14 +++-
parent/pom.xml | 2 +-
4 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0d88165b283..8b71caaac2e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -451,7 +451,7 @@
42.4.1
0.8.9
4.6.3
-0.10.0
+0.10.0
2.0.7
1.0-alpha-2
0.6.1
diff --git a/components/camel-plc4x/pom.xml b/components/camel-plc4x/pom.xml
index 3369ee6004d..02aaba77fee 100644
--- a/components/camel-plc4x/pom.xml
+++ b/components/camel-plc4x/pom.xml
@@ -42,17 +42,17 @@
org.apache.plc4x
plc4j-api
-${plc4x.version}
+${plc4x-version}
org.apache.plc4x
plc4j-connection-pool
-${plc4x.version}
+${plc4x-version}
org.apache.plc4x
plc4j-scraper
-${plc4x.version}
+${plc4x-version}
com.fasterxml.jackson.core
@@ -65,7 +65,7 @@
org.apache.plc4x
plc4j-driver-ab-eth
-${plc4x.version}
+${plc4x-version}
runtime
@@ -81,55 +81,55 @@
org.apache.plc4x
plc4j-driver-ads
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-canopen
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-eip
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-firmata
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-knxnetip
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-modbus
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-opcua
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-s7
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-simulated
-${plc4x.version}
+${plc4x-version}
runtime
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
index 2fcb95d44a9..9883ccd4831 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
@@ -99,11 +99,6 @@ public class Plc4XEndpoint extends DefaultEndpoint {
return connection;
}
-@Override
-public void setProperties(Object bean, Map parameters) {
-
-}
-
@Override
public Producer createProducer() throws Exception {
//Checking if connection is still up and reconnecting if not
@@ -119,12 +114,9 @@ public class Plc4XEndpoint extends DefaultEndpoint {
if (!connection.isConnected()) {
connection =
plcDriverManager.getConnection(uri.replaceFirst("plc4x:/?/?", ""));
}
-return new Plc4XConsumer(this, processor);
-}
-
-@Override
-public boolean isSingleton() {
-return true;
+Plc4XConsumer consumer = new Plc4XConsumer(this, processor);
+configureConsumer(consumer);
+return consumer;
}
public PlcDriverManager getPlcDriverManager() {
diff --git a/parent/pom.xml b/parent/pom.xml
index 298b9f9b7a9..eb1aec4ed4c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -437,7 +437,7 @@
42.4.1
0.8.9
4.6.3
-0.10.0
+0.10.0
2.0.7
[camel] branch main updated: Polished
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 a844bce291f Polished
a844bce291f is described below
commit a844bce291f8addf30c24c7357e1bccf3f717321
Author: Claus Ibsen
AuthorDate: Tue Oct 25 14:20:36 2022 +0200
Polished
---
.../src/main/resources/auto-configure/camel-microprofile-metrics.joor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-kamelet-main/src/main/resources/auto-configure/camel-microprofile-metrics.joor
b/dsl/camel-kamelet-main/src/main/resources/auto-configure/camel-microprofile-metrics.joor
index d3ecf6e4b41..0927fde9e1b 100644
---
a/dsl/camel-kamelet-main/src/main/resources/auto-configure/camel-microprofile-metrics.joor
+++
b/dsl/camel-kamelet-main/src/main/resources/auto-configure/camel-microprofile-metrics.joor
@@ -28,7 +28,7 @@ if (mr == null) {
context.addRoutePolicyFactory(rpf);
// and setup dev console
var dcr =
context.getExtension(org.apache.camel.console.DevConsoleRegistry.class);
-if (dcr != null){
+if (dcr != null) {
dcr.resolveById("microprofile-metrics");
}
}
[camel] branch main updated: Polished
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 109aad80734 Polished
109aad80734 is described below
commit 109aad80734aae38d7508f18c360f49ea315ab92
Author: Claus Ibsen
AuthorDate: Tue Oct 18 07:08:59 2022 +0200
Polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 12 ++--
1 file changed, 6 insertions(+), 6 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 1e5e4eb7179..a2e00c750e3 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
@@ -98,23 +98,23 @@ class Run extends CamelCommand {
String profile;
@Option(names = {
-"--dep", "--deps" }, description = "Add additional dependencies
(Use commas to separate multiple dependencies).")
+"--dep", "--deps" }, description = "Add additional dependencies
(Use commas to separate multiple dependencies)")
String dependencies;
-@Option(names = {"--repos"}, description = "Additional maven repositories
for download on-demand (Use commas to separate multiple repositories).")
+@Option(names = {"--repos"}, description = "Additional maven repositories
for download on-demand (Use commas to separate multiple repositories)")
String repos;
@Option(names = {"--settings"}, description = "Optional location of maven
setting.xml file to configure servers, repositories, mirrors and proxies." +
" If set to \"false\", not even the default ~/.m2/settings.xml
will be used.")
String mavenSettings;
-@Option(names = {"--settings-security"}, description = "Optional location
of maven settings-security.xml file to decrypt settings.xml.")
+@Option(names = {"--settings-security"}, description = "Optional location
of maven settings-security.xml file to decrypt settings.xml")
String mavenSettingsSecurity;
@Option(names = { "--fresh" }, description = "Make sure we use fresh (i.e.
non-cached) resources")
boolean fresh;
-@Option(names = {"--download"}, defaultValue = "true", description =
"Whether to allow automatic downloaded JAR dependencies, over the internet,
that Camel requires.")
+@Option(names = {"--download"}, defaultValue = "true", description =
"Whether to allow automatic downloading JAR dependencies (over the internet)")
boolean download = true;
@Option(names = { "--name" }, defaultValue = "CamelJBang", description =
"The name of the Camel application")
@@ -168,7 +168,7 @@ class Run extends CamelCommand {
String jfrProfile;
@Option(names = { "--local-kamelet-dir" },
-description = "Local directory for loading Kamelets (takes
precedence). Multiple directories can be specified separateed by comma.")
+description = "Local directory for loading Kamelets (takes
precedence). Multiple directories can be specified separated by comma.")
String localKameletDir;
@Option(names = { "--port" }, description = "Embeds a local HTTP server on
this port")
@@ -183,7 +183,7 @@ class Run extends CamelCommand {
@Option(names = { "--modeline" }, defaultValue = "true", description =
"Enables Camel-K style modeline")
boolean modeline = true;
-@Option(names = { "--open-api" }, description = "Add an OpenAPI spec from
the given file")
+@Option(names = { "--open-api" }, description = "Adds an OpenAPI spec from
the given file")
String openapi;
public Run(CamelJBangMain main) {
[camel] branch main updated: Polished
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 0d0fe6758ee Polished 0d0fe6758ee is described below commit 0d0fe6758ee7e08388a05a64aa21c7756ecd186d Author: Claus Ibsen AuthorDate: Wed Oct 12 07:43:28 2022 +0200 Polished --- components/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/pom.xml b/components/pom.xml index d3061f4ea96..36f073209ff 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -130,8 +130,8 @@ camel-docker camel-dozer camel-drill - camel-dropbox - camel-dynamic-router +camel-dropbox +camel-dynamic-router camel-ehcache camel-elasticsearch camel-elasticsearch-rest
[camel] branch main updated: Polished docs: fixed grammar and wording issues (#8507)
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 c488049f90e Polished docs: fixed grammar and wording issues (#8507) c488049f90e is described below commit c488049f90e69653ca19b631bff7eb80e54b40cb Author: Elena Sadler <36947886+sadler-el...@users.noreply.github.com> AuthorDate: Tue Oct 11 04:14:12 2022 -0500 Polished docs: fixed grammar and wording issues (#8507) * Polished docs: fixed grammar and wording issues * Added more concise wording --- .../modules/ROOT/pages/getting-started.adoc| 33 ++ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/getting-started.adoc b/docs/user-manual/modules/ROOT/pages/getting-started.adoc index c8e421d399a..61e9ea578e7 100644 --- a/docs/user-manual/modules/ROOT/pages/getting-started.adoc +++ b/docs/user-manual/modules/ROOT/pages/getting-started.adoc @@ -1,31 +1,30 @@ = Getting Started -You can get started with Apache Camel using different ways, such as: +You can get started with Apache Camel in a variety of ways, such as: - Using online Project generators - Using the Camel CLI (command line) - Using Camel Karavan (visual UI Camel designer) -And these approaches requires more knowledge to perform: +And some more alternative methods: - Adding Camel to an existing project - Using IDE tooling wizards - Using Maven Archetypes -- Copy an existing Camel example and modify +- Cloning an existing example to modify == Using online Project generators -You can use https://kameleon.dev/#/standalone[Camel Kameleon] which is Camels own +You can use https://kameleon.dev/#/standalone[Camel Kameleon] which is Camel's own online project generator. This generator is Camel focused only, which is recommended -for most users to Camel. +for most Camel users. You can also use https://start.spring.io/[Spring Boot Initializer] which is the Spring Boot -generator that also has Camel support. However, this generator does not allow users -to fine-grained choose which Camel components, data formats, kamelets etc. to use. +generator that also has Camel support. However, this generator does not allow users to have fine-grained control over which components, data formats, kamelets etc. they can use. -And there is https://code.quarkus.io/[Code with Quarkus] which is the Quarkus -generator that have great Camel support. +And there is https://code.quarkus.io/[Code with Quarkus], the Quarkus +generator, which has great support with Camel. == Getting Started from command line (CLI) @@ -87,20 +86,19 @@ You can run in live coding mode, as shown: camel run hello.java --dev -And then you can do source updates to `hello.java` and when the file is saved, -Camel will automatically do live updates. +While in live coding mode, whenever you save changes to `hello.java`, Camel will automatically load the updated version. *Step 5* -Make sure to look at the xref:camel-jbang.adoc[Camel JBang] documentation, for more details on the powers +Make sure to check out the xref:camel-jbang.adoc[Camel JBang] documentation, for more details on the powers of the Camel CLI. You will also find information how you can _export_ what you have built with the Camel CLI into a vanilla Camel Spring Boot or Camel Quarkus project. == Getting started with Camel using Karavan The https://github.com/apache/camel-karavan[Camel Karavan] is a toolkit for visually -designing Camel integrations, and fully integrated with xref:camel-jbang.adoc[Camel JBang] -to quickly try Camel while using the designer. +designing Camel integrations, it is fully integrated with xref:camel-jbang.adoc[Camel JBang] +which allows users to easily try Camel while using the designer. == Alternative ways of getting started with Camel @@ -119,9 +117,8 @@ Apache Camel via Spring Boot Initializer or Code with Quarkus. Apache Camel comes with a set of xref:camel-maven-archetypes.adoc[Camel Maven Archetypes], you can use to create a new Camel project. -=== Copy an existing example +=== Cloning an existing example to modify -You can find an existing example which are hosted on github, -such as https://github.com/apache/camel-spring-boot-examples[Camel Spring Boot examples] -where you can find an example and copy, and then modify. +There are tons of Camel examples hosted on Github that you can clone and modify, +such as https://github.com/apache/camel-spring-boot-examples[Camel Spring Boot examples].
[camel] branch main updated: Polished
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 a2fdbf12c89 Polished
a2fdbf12c89 is described below
commit a2fdbf12c89f352454e91d86ab6fba408a81770b
Author: Claus Ibsen
AuthorDate: Mon Sep 26 19:10:58 2022 +0200
Polished
---
.../org/apache/camel/dsl/jbang/core/commands/process/ListVault.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
index 64dd9b8661d..a5851960e58 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
@@ -32,7 +32,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "vault", aliases = { "vault", "vaults" },
- description = "List secrets from security vaults (AWS,GCP and Azure)
used by running Camel integrations")
+ description = "List secrets from security vaults (AWS, GCP and Azure)
used by running Camel integrations")
public class ListVault extends ProcessBaseCommand {
@CommandLine.Option(names = { "--sort" },
[camel] branch main updated: Polished
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 56c6414e8ae Polished
56c6414e8ae is described below
commit 56c6414e8ae59f4fe48dfd90b28aa322166707c3
Author: Claus Ibsen
AuthorDate: Sun Sep 25 13:53:52 2022 +0200
Polished
---
.../camel/dsl/jbang/core/commands/process/CamelContextTop.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
index c08e3b66d8d..a521d0b7287 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
@@ -136,10 +136,8 @@ public class CamelContextTop extends ProcessBaseCommand {
.with(this::getLoad),
new
Column().header("HEAP").headerAlign(HorizontalAlign.CENTER).with(this::getHeapMemory),
new
Column().header("NON-HEAP").headerAlign(HorizontalAlign.CENTER).with(this::getNonHeapMemory),
-new
Column().header("GC").headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.LEFT)
-.with(this::getGC),
-new
Column().header("THREADS").headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.CENTER)
-.with(this::getThreads;
+new
Column().header("GC").headerAlign(HorizontalAlign.CENTER).with(this::getGC),
+new
Column().header("THREADS").headerAlign(HorizontalAlign.CENTER).with(this::getThreads;
}
return 0;
[camel] branch main updated: Polished
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 7fbf931c624 Polished
7fbf931c624 is described below
commit 7fbf931c624e4fbdd38f04e4123c7071c818eb64
Author: Claus Ibsen
AuthorDate: Wed Sep 21 16:02:38 2022 +0200
Polished
---
.../src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index 1e3506621e0..22864c346dd 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -104,7 +104,7 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
Map> groups = new
LinkedHashMap<>();
for (Resource resource : resources) {
RoutesBuilderLoader loader = resolveRoutesBuilderLoader(resource);
-List list = groups.getOrDefault(loader, new
ArrayList());
+List list = groups.getOrDefault(loader, new
ArrayList<>());
list.add(resource);
groups.put(loader, list);
}
[camel] branch main updated: Polished
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 b0339a00640 Polished
b0339a00640 is described below
commit b0339a0064087025ceab4c65a5625d5d97be16dd
Author: Claus Ibsen
AuthorDate: Tue Sep 13 12:43:17 2022 +0200
Polished
---
.../main/java/org/apache/camel/impl/console/EndpointsDevConsole.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointsDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointsDevConsole.java
index 95b306ae50f..7f9ab81b56d 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointsDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/EndpointsDevConsole.java
@@ -39,11 +39,10 @@ public class EndpointsDevConsole extends AbstractDevConsole
{
EndpointRegistry reg = getCamelContext().getEndpointRegistry();
sb.append(
-String.format("\nEndpoints: %s (static: %s dynamic: %s",
reg.size(), reg.staticSize(), reg.dynamicSize()));
-sb.append(String.format("\nMaximum Cache Size: %s",
reg.getMaximumCacheSize()));
+String.format("Endpoints: %s (static: %s dynamic: %s\n",
reg.size(), reg.staticSize(), reg.dynamicSize()));
+sb.append(String.format("Maximum Cache Size: %s\n",
reg.getMaximumCacheSize()));
Collection col = reg.getReadOnlyValues();
if (!col.isEmpty()) {
-sb.append("\n");
for (Endpoint e : col) {
sb.append(String.format("\n%s", e.toString()));
}
[camel] branch main updated: Polished
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 27bb3ca7b04 Polished
27bb3ca7b04 is described below
commit 27bb3ca7b045221168e9e6c6bd3e61419c25b915
Author: Claus Ibsen
AuthorDate: Sat Aug 13 10:31:51 2022 +0200
Polished
---
.../main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index 1542381e664..63841173d84 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -50,7 +50,7 @@ class Bind extends CamelCommand {
@CommandLine.Parameters(description = "Sink such as a Kamelet or Camel
endpoint uri", arity = "1")
private String sink;
-@CommandLine.Parameters(description = "Name of binding file", arity = "1")
+@CommandLine.Parameters(description = "Name of binding file to be saved",
arity = "1")
private String file;
public Bind(CamelJBangMain main) {
@@ -94,8 +94,8 @@ class Bind extends CamelCommand {
protected String kameletProperties(String kamelet) throws Exception {
StringBuilder sb = new StringBuilder();
-InputStream is = null;
-String loc = null;
+InputStream is;
+String loc;
// try local disk first before github
Resource res = new
DefaultResourceResolvers.FileResolver().resolve("file:" + kamelet +
".kamelet.yaml");
[camel] branch main updated: Polished docs
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 62600fa5e6c Polished docs 62600fa5e6c is described below commit 62600fa5e6cf02f67c371591e8356854fc1be791 Author: Claus Ibsen AuthorDate: Fri Aug 5 12:33:38 2022 +0200 Polished docs --- dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc index edb80de30ce..1d69bb54493 100644 --- a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc +++ b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc @@ -20,12 +20,8 @@ The `KameletMain` is pre-configured with the following properties: [source,properties] camel.component.kamelet.location = classpath:/kamelets,github:apache:camel-kamelets/kamelets -camel.main.routes-include-pattern = classpath:camel/* -camel.main.routes-reload-enabled = true -camel.main.routes-reload-directory = src/main/resources -camel.main.routes-reload-pattern = camel/*.yaml -camel.main.shutdown-timeout = 5 -camel.main.lightweight = false +camel.component.rest.consumerComponentName = platform-http +camel.component.rest.producerComponentName = vertx-http These settings can be overridden by configuration in `application.properties`. @@ -50,7 +46,5 @@ For example a Camel route can be _coded_ in YAML which uses the Earthquake Kamel In this use-case the earthquake kamelet will be downloaded from github, and as well its required dependencies. -NOTE: The dependencies are downloaded to `~/.groovy/grapes` directory. To force re-download then this directory can be deleted. - You can find an example with this at https://github.com/apache/camel-examples/tree/main/examples/kamelet-main[kamelet-main].
[camel] branch main updated: Polished
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 67168959c13 Polished
67168959c13 is described below
commit 67168959c135c3441cbd3dba784280d4d28699dd
Author: Claus Ibsen
AuthorDate: Thu Jul 28 12:47:58 2022 +0200
Polished
---
components/camel-hyperledger-aries/pom.xml | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/components/camel-hyperledger-aries/pom.xml
b/components/camel-hyperledger-aries/pom.xml
index 17a96f29903..64d0f0776ca 100644
--- a/components/camel-hyperledger-aries/pom.xml
+++ b/components/camel-hyperledger-aries/pom.xml
@@ -33,16 +33,17 @@
jar
+
+
+org.apache.camel
+camel-support
+
io.nessus.aries
nessus-aries-common
${nessus-hyperledger-aries-version}
-
-org.apache.camel
-camel-support
-
-
+
org.apache.camel
camel-test-junit5
[camel] branch main updated: Polished
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 49d03b05720 Polished
49d03b05720 is described below
commit 49d03b0572092d8c8a0534c5a44802380caaffb3
Author: Claus Ibsen
AuthorDate: Wed Jul 27 09:38:37 2022 +0200
Polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index eedb9b824a2..342cc5f7c85 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -277,13 +277,13 @@ class ExportQuarkus extends Export {
if (clazz != null) {
RuntimeProvider provider =
main.getCamelContext().getInjector().newInstance(clazz);
if (provider != null) {
-// re-create answer with the classloader that loaded
spring-boot to be able to load resources in this catalog
+// re-create answer with the classloader that loaded
quarkus to be able to load resources in this catalog
Class clazz2
=
main.getCamelContext().getClassResolver().resolveClass(DEFAULT_CAMEL_CATALOG,
CamelCatalog.class);
answer =
main.getCamelContext().getInjector().newInstance(clazz2);
answer.setRuntimeProvider(provider);
-// use classloader that loaded spring-boot provider to
ensure we can load its resources
+// use classloader that loaded quarkus provider to
ensure we can load its resources
answer.getVersionManager().setClassLoader(main.getCamelContext().getApplicationContextClassLoader());
answer.enableCache();
}
[camel] branch main updated: Polished
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 4e80cc47eb3 Polished
4e80cc47eb3 is described below
commit 4e80cc47eb39d4b4fa9cd8bfbc680de0179703ea
Author: Claus Ibsen
AuthorDate: Tue Jul 26 10:00:54 2022 +0200
Polished
---
.../camel/processor/InterceptSendToEndpointProcessor.java | 7 ++-
.../src/main/java/org/apache/camel/processor/Pipeline.java | 5 +
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 10 ++
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
index 17e7bf12623..207032f507c 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
@@ -31,6 +31,7 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.DefaultInterceptSendToEndpoint;
+import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -108,11 +109,7 @@ public class InterceptSendToEndpointProcessor extends
DefaultAsyncProducer {
}
if (!shouldSkip) {
-if (exchange.hasOut()) {
-// replace OUT with IN as detour changed something
-exchange.setIn(exchange.getOut());
-exchange.setOut(null);
-}
+ExchangeHelper.prepareOutToIn(exchange);
// route to original destination leveraging the asynchronous
routing engine if possible
boolean s = producer.process(exchange, ds -> {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
index 29d7596ef5c..2887bc7c167 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -98,10 +98,7 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate
[camel] branch main updated: Polished
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 5e6a39b1696 Polished
5e6a39b1696 is described below
commit 5e6a39b16964ffd6a09fea1eb5bb333f887ba9c2
Author: Claus Ibsen
AuthorDate: Fri Jul 1 12:52:58 2022 +0200
Polished
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index ebbdb77e7aa..6bd6a8e816c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3386,9 +3386,9 @@ public abstract class AbstractCamelContext extends
BaseService
long timeout =
shutdownStrategy.getTimeUnit().toMillis(shutdownStrategy.getTimeout());
// only use precise print duration if timeout is shorter than
10 seconds
String to = TimeUtils.printDuration(timeout, timeout < 1);
-LOG.info("Apache Camel {} ({}) shutting down (timeout:{})",
getVersion(), getName(), to);
+LOG.info("Apache Camel {} ({}) is shutting down (timeout:{})",
getVersion(), getName(), to);
} else {
-LOG.info("Apache Camel {} ({}) shutting down", getVersion(),
getName());
+LOG.info("Apache Camel {} ({}) is shutting down",
getVersion(), getName());
}
}
[camel] branch main updated: Polished
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 13a9c21c001 Polished
13a9c21c001 is described below
commit 13a9c21c001264534fdc9b7ca583b1c44b2742f0
Author: Claus Ibsen
AuthorDate: Fri Jul 1 08:52:47 2022 +0200
Polished
---
.../src/main/java/org/apache/camel/language/joor/JoorCompiler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
index f96a7cb7461..a8410192fe2 100644
---
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
+++
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
@@ -89,7 +89,7 @@ public class JoorCompiler extends ServiceSupport implements
StaticService {
protected void doStop() throws Exception {
super.doStop();
if (counter > 0) {
-LOG.info("jOOR language compiled {} scripts in {}", counter,
TimeUtils.printDuration(taken, true));
+LOG.info("jOOR language compiled {} {} in {}", counter, counter ==
1 ? "script" : "scripts", TimeUtils.printDuration(taken, true));
}
}
[camel] branch main updated: Polished
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 d1118ecfb7c Polished
d1118ecfb7c is described below
commit d1118ecfb7c2fe8f54377007610a7844b7f300e1
Author: Claus Ibsen
AuthorDate: Wed Jun 29 13:51:50 2022 +0200
Polished
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index fad944e4d38..ebbdb77e7aa 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3384,7 +3384,8 @@ public abstract class AbstractCamelContext extends
BaseService
if (startupSummaryLevel != StartupSummaryLevel.Oneline &&
startupSummaryLevel != StartupSummaryLevel.Off) {
if (shutdownStrategy != null && shutdownStrategy.getTimeUnit() !=
null) {
long timeout =
shutdownStrategy.getTimeUnit().toMillis(shutdownStrategy.getTimeout());
-String to = TimeUtils.printDuration(timeout, true);
+// only use precise print duration if timeout is shorter than
10 seconds
+String to = TimeUtils.printDuration(timeout, timeout < 1);
LOG.info("Apache Camel {} ({}) shutting down (timeout:{})",
getVersion(), getName(), to);
} else {
LOG.info("Apache Camel {} ({}) shutting down", getVersion(),
getName());
[camel] branch main updated: Polished docs (#7925)
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 b504c1829d1 Polished docs (#7925) b504c1829d1 is described below commit b504c1829d1dbea37a7caf411dabf8dd38c52097 Author: llowinge AuthorDate: Wed Jun 29 12:47:39 2022 +0200 Polished docs (#7925) --- .../src/main/docs/modules/eips/pages/message-dispatcher.adoc| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-dispatcher.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-dispatcher.adoc index 695e9e647f1..a34c9b2ec16 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-dispatcher.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-dispatcher.adoc @@ -6,7 +6,7 @@ from the xref:enterprise-integration-patterns.adoc[EIP patterns] book. image::eip/MessageDispatcher.gif[image] -In Camel the Message Dispatcher can be archived in different ways such as: +In Camel the Message Dispatcher can be achieved in different ways such as: * You can use a component like xref:ROOT:jms-component.adoc[JMS] with selectors to implement a xref:selective-consumer.adoc[Selective Consumer] as the Message Dispatcher implementation.
[camel] branch main updated: Polished docs
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 409a122c9c8 Polished docs 409a122c9c8 is described below commit 409a122c9c80bddada7e075b5d1f2a4d60d73b1d Author: Claus Ibsen AuthorDate: Wed Jun 29 10:02:00 2022 +0200 Polished docs --- .../src/main/docs/modules/eips/pages/transactional-client.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc index 874e13372e0..91bd8e6f04b 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/transactional-client.adoc @@ -73,13 +73,13 @@ and the latter as global transactions If you only have a single resource (such as one database, or one messaging system) then transactions can be simpler to orchestrate by the transaction manager. This is known as local transactions. -The previous two examples above are both using a single resource, and are therefore using local transactions. -When using local transactions and Spring Transactions, then you can use the dedicated transaction manager for the resource type: +When using local transactions with Spring Transactions, then you can use the dedicated transaction manager +for the resource type such as: - org.springframework.jdbc.datasource.DataSourceTransactionManager - org.springframework.jms.connection.JmsTransactionManager -TIP: Consult the spring documentation for more local transaction managers. +TIP: Consult the Spring documentation for more local transaction managers. Global Transactions
[camel] branch main updated: Polished
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 525c97c0aff Polished 525c97c0aff is described below commit 525c97c0aff040a626b87d6e4c5ea704ed30bb8b Author: Claus Ibsen AuthorDate: Mon Jun 20 09:30:15 2022 +0200 Polished --- .../java/org/apache/camel/impl/engine/PrototypeExchangeFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/PrototypeExchangeFactory.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/PrototypeExchangeFactory.java index 63215d32a26..17ae924e77c 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/PrototypeExchangeFactory.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/PrototypeExchangeFactory.java @@ -158,10 +158,10 @@ public class PrototypeExchangeFactory extends PooledObjectFactorySupport
[camel] branch main updated: Polished
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 4634171a465 Polished
4634171a465 is described below
commit 4634171a4657affdeb4093f89ea13d7a1b0f53f8
Author: Claus Ibsen
AuthorDate: Fri Jun 17 10:02:01 2022 +0200
Polished
---
.../main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java | 2 --
.../java/org/apache/camel/main/download/MavenDependencyDownloader.java | 1 -
2 files changed, 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
index 83b3aec73aa..80730e68534 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
@@ -54,8 +54,6 @@ abstract class BaseExport extends CamelCommand {
"camel.jbang.classpathFiles"
};
-private static final String KAMELETS_VERSION = "0.8.1";
-
@CommandLine.Option(names = { "--gav" }, description = "The Maven
group:artifact:version", required = true)
protected String gav;
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
index 0bbd3ab4914..1e11eae6ddb 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
@@ -149,7 +149,6 @@ public class MavenDependencyDownloader extends
ServiceSupport implements Depende
}, gav);
}
-
public boolean alreadyOnClasspath(String groupId, String artifactId,
String version) {
return alreadyOnClasspath(groupId, artifactId, version, true);
}
[camel] branch main updated: Polished
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 3ea2a9a1d23 Polished 3ea2a9a1d23 is described below commit 3ea2a9a1d23a55b4b8f50153ec8eb88e04a08f94 Author: Claus Ibsen AuthorDate: Wed Jun 15 08:27:46 2022 +0200 Polished --- .../src/main/resources/application.properties | 25 +- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/application.properties b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/application.properties index 67a51e9b8b3..fe084828684 100644 --- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -16,33 +16,10 @@ ## --- # to configure camel main -# here you can configure options on camel main (see MainConfigurationProperties class) +# https://camel.apache.org/components/next/others/main.html camel.main.name = MyTimerCamel -camel.main.jmx-enabled = false -# you can also configure camel context directly -# camel.context.shutdown-strategy.shutdown-now-on-timeout = false - -# to configure the camel timer component -# here we can configure the options on the component level (and we can use dash-naming-style) -### camel.component.quartz.start-delayed-seconds = 3 - -# to configure Hystrix EIP (global and you need to add camel-hystrix to the classpath) -### camel.hystrix.group-key=myGroup -### camel.hystrix.execution-timeout-in-milliseconds=5000 - -# to configure Rest DSL (global and you need to add camel-undertow to the classpath) -### camel.rest.component=undertow -### camel.rest.port=8080 -### camel.rest.component-properties[host-options.buffer-size]=8192 - -# you can configure whether OS environment should override (=2 which is default) or as fallback (=1) -### camel.component.properties.environment-variable-mode=1 - -# properties used in the route myPeriod = 3000 - -# application properties hi = Hello bye = Goodbye
[camel] branch main updated: Polished
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 877195b791a Polished 877195b791a is described below commit 877195b791a23ab137a5aa5e3259dfcb5d3c790b Author: Claus Ibsen AuthorDate: Wed Jun 15 06:31:32 2022 +0200 Polished --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index ee3cd5b57b7..5d10e16088f 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -31,7 +31,7 @@ You can specify which Camel version to run as shown: [source,bash] -jbang run -Dcamel.jbang.version=3.16.0 camel@apache/camel [command] +jbang run -Dcamel.jbang.version=3.17.0 camel@apache/camel [command] And you can also try bleeding edge development by using SNAPSHOT such as: @@ -500,7 +500,6 @@ running on port 8080. For example the following route in a file named `server.ya [source,yaml] -#!/usr/bin/env jbang camel@apache/camel run - from: uri: "platform-http:/hello" steps: @@ -519,7 +518,7 @@ And you can call the HTTP service with: [source,bash] -curl http://localhost:8080/hello +$ curl http://localhost:8080/hello Hello World%
[camel] branch main updated: Polished
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 d5b0489434d Polished
d5b0489434d is described below
commit d5b0489434d48717222f33a04fbbd649468a4c58
Author: Claus Ibsen
AuthorDate: Thu Jun 9 10:12:05 2022 +0200
Polished
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 6815fcd7168..bb5b135f9dc 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2637,7 +2637,7 @@ public abstract class AbstractCamelContext extends
BaseService
// was the initialization vetoed?
if (vetoed != null) {
-LOG.info("CamelContext ({}) vetoed to not initialize due to {}",
getName(), vetoed.getMessage());
+LOG.info("CamelContext ({}) vetoed to not initialize due to: {}",
getName(), vetoed.getMessage());
failOnStartup(vetoed);
return;
}
@@ -2654,7 +2654,7 @@ public abstract class AbstractCamelContext extends
BaseService
// did the start veto?
if (vetoed != null) {
-LOG.info("CamelContext ({}) vetoed to not start due to {}",
getName(), vetoed.getMessage());
+LOG.info("CamelContext ({}) vetoed to not start due to: {}",
getName(), vetoed.getMessage());
failOnStartup(vetoed);
stop();
return;
[camel] branch main updated: Polished
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 1ab6c6f5713 Polished
1ab6c6f5713 is described below
commit 1ab6c6f5713ac6823c1e33cf6cfd78a7954e013d
Author: Claus Ibsen
AuthorDate: Thu May 26 13:55:02 2022 +0200
Polished
---
.../integration/SecretsManagerRotateSecretProducerLocalstackIT.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
index dd7f3e303bc..78de64d767b 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerRotateSecretProducerLocalstackIT.java
@@ -47,7 +47,7 @@ public class SecretsManagerRotateSecretProducerLocalstackIT
extends AwsSecretsMa
}
});
-CreateSecretResponse resultGet = (CreateSecretResponse)
exchange.getIn().getBody();
+CreateSecretResponse resultGet = (CreateSecretResponse)
exchange.getMessage().getBody();
assertNotNull(resultGet);
exchange = template.request("direct:rotateSecret", new Processor() {
@@ -57,7 +57,8 @@ public class SecretsManagerRotateSecretProducerLocalstackIT
extends AwsSecretsMa
}
});
-RotateSecretResponse resultRotate = (RotateSecretResponse)
exchange.getIn().getBody();
+RotateSecretResponse resultRotate = (RotateSecretResponse)
exchange.getMessage().getBody();
+assertNotNull(resultRotate);
assertTrue(resultRotate.sdkHttpResponse().isSuccessful());
assertEquals("TestSecret4", resultRotate.name());
[camel] branch main updated: Polished
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 4dc6c549882 Polished 4dc6c549882 is described below commit 4dc6c54988202e7e53c5325d237546ab9839d434 Author: Claus Ibsen AuthorDate: Mon May 23 15:51:16 2022 +0200 Polished --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 7da4467875b..a44a2e42b4f 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -387,9 +387,9 @@ works in two modes: - line mode (default) - reads input as single lines (separated by line breaks). Message body is a `String`. - raw mode - reads the entire stream until _end of stream_. - Mmessage body is a `byte[]`. + Message body is a `byte[]`. -The default mode is due to historically how the stream component as created. +IMPORTANT: The default mode is due to historically how the stream component was created. Therefore, you may want to set `stream:in?readLine=false` to use raw mode. === Running local Kamelets
[camel] branch main updated: Polished
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 7b8f0a3c124 Polished
7b8f0a3c124 is described below
commit 7b8f0a3c124a2d9dd2795efa2143b3da4545b62d
Author: Claus Ibsen
AuthorDate: Sat May 14 09:20:19 2022 +0200
Polished
---
.../java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 774c38f2591..3d6896eb5fb 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -44,7 +44,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("image", new Image()))
.addSubcommand("deploy", new CommandLine(new Deploy()))
.addSubcommand("undeploy", new CommandLine(new Undeploy()));
-/* // TODO: do not show commands that are deprecated and to be either removed
or reworked
+/* // TODO: do not show commands that are deprecated and to be either
removed or reworked
.addSubcommand("search", new CommandLine(new Search())
.addSubcommand("kamelets", new SearchKamelets())
.addSubcommand("components", new SearchComponents())
@@ -52,7 +52,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("others", new SearchOthers()))
.addSubcommand("create", new CommandLine(new Create())
.addSubcommand("project", new Project()));
-*/
+*/
commandLine.getCommandSpec().versionProvider(() -> {
CamelCatalog catalog = new DefaultCamelCatalog();
[camel] branch main updated: Polished
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 b85fed504c8 Polished
b85fed504c8 is described below
commit b85fed504c8ca9ca0360e6198f62a1582f0b6deb
Author: Claus Ibsen
AuthorDate: Sat May 14 09:19:04 2022 +0200
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java | 2 +-
.../java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 +++-
.../java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../main/java/org/apache/camel/dsl/jbang/core/commands/Package.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index e969d3122cb..eb0df0d8641 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -43,7 +43,7 @@ import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asStringS
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
-@Command(name = "bind", description = "Bind Kubernetes resources, such as
Kamelets, in an integration flow")
+@Command(name = "bind", description = "Bind source and sink Kamelets as a new
Camel integration")
class Bind implements Callable {
@CommandLine.Parameters(description = "Source such as a Kamelet or Camel
endpoint uri", arity = "1")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
index 2e3aa1669e1..0385a73c9f7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
@@ -22,7 +22,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "build", description = "Build Camel container image and
resources (use --help)")
+@Command(name = "build", description = "Build Camel container image and
resources")
class Build implements Callable {
//CHECKSTYLE:OFF
@Option(names = { "-h", "--help" }, usageHelp = true, description =
"Display the help and sub-commands")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 47d3ad10bdb..774c38f2591 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -43,7 +43,8 @@ public class CamelJBangMain implements Callable {
.addSubcommand("manifests", new Manifest())
.addSubcommand("image", new Image()))
.addSubcommand("deploy", new CommandLine(new Deploy()))
-.addSubcommand("undeploy", new CommandLine(new Undeploy()))
+.addSubcommand("undeploy", new CommandLine(new Undeploy()));
+/* // TODO: do not show commands that are deprecated and to be either removed
or reworked
.addSubcommand("search", new CommandLine(new Search())
.addSubcommand("kamelets", new SearchKamelets())
.addSubcommand("components", new SearchComponents())
@@ -51,6 +52,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("others", new SearchOthers()))
.addSubcommand("create", new CommandLine(new Create())
.addSubcommand("project", new Project()));
+*/
commandLine.getCommandSpec().versionProvider(() -> {
CamelCatalog catalog = new DefaultCamelCatalog();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
index f7a7e715c53..7ce03afb3f4 100644
---
[camel] branch main updated: Polished
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 91b2344cbdb Polished
91b2344cbdb is described below
commit 91b2344cbdb40214da8b6831211174688784166a
Author: Claus Ibsen
AuthorDate: Thu Apr 28 20:05:26 2022 +0200
Polished
---
.../camel-jbang-core/src/main/resources/templates/java.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
index 722e7fc0fe6..37bc087951e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
@@ -1,4 +1,4 @@
-// camel-k: language=java property=time=1000
+// camel-k: language=java
import org.apache.camel.builder.RouteBuilder;
@@ -8,7 +8,7 @@ public class {{ .Name }} extends RouteBuilder {
public void configure() throws Exception {
// Write your routes here, for example:
-from("timer:java?period={{time}}").routeId("java")
+from("timer:java?period={{time:1000}}").routeId("java")
.setBody()
.simple("Hello Camel from ${routeId}")
.log("${body}");
[camel] branch main updated: Polished
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 bc1a5aa Polished
bc1a5aa is described below
commit bc1a5aa2fc7a5efbaeabfa6ab78f83bb0bdbfb20
Author: Claus Ibsen
AuthorDate: Fri Mar 25 14:21:41 2022 +0100
Polished
---
.../org/apache/camel/health/HealthCheckHelper.java| 19 +++
.../java/org/apache/camel/main/VertxHttpServer.java | 9 +
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
index ba5c28d..431f09d 100644
---
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
+++
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
@@ -265,6 +265,25 @@ public final class HealthCheckHelper {
}
/**
+ * Checks the overall status of the results.
+ *
+ * @param results the results from the invoked health checks
+ * @param readiness readiness or liveness mode
+ * @return true if up, or false if down
+ */
+public static boolean isResultsUp(Collection results,
boolean readiness) {
+boolean up;
+if (readiness) {
+// readiness requires that all are UP
+up = results.stream().allMatch(r ->
r.getState().equals(HealthCheck.State.UP));
+} else {
+// liveness will fail if there is any down
+up = results.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
+}
+return up;
+}
+
+/**
* Get the group of the given check or an empty string if the group is not
set.
*
* @param check the health check
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
index adc3bf2..63d71b4 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
@@ -228,14 +228,7 @@ public final class VertxHttpServer {
}
// are we UP
-boolean up;
-if (rdy) {
-// readiness requires that all are UP
-up = res.stream().allMatch(r ->
r.getState().equals(HealthCheck.State.UP));
-} else {
-// liveness will fail if there is any down
-up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
-}
+boolean up = HealthCheckHelper.isResultsUp(res, rdy);
if ("oneline".equals(level)) {
// only brief status
[camel] branch main updated: Polished
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 f7f5573 Polished f7f5573 is described below commit f7f55732d47eabf15f241797451521040f25dfed Author: Claus Ibsen AuthorDate: Thu Mar 24 18:43:07 2022 +0100 Polished --- .../src/main/java/org/apache/camel/component/http/HttpComponent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java index 3382f73..5d3fd45 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java @@ -717,8 +717,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa } /** - * The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of - * zero is interpreted as an infinite timeout. + * The timeout in milliseconds used when requesting a connection from the connection manager. * * A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined * (system default).
[camel] branch main updated: Polished
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 6930024 Polished
6930024 is described below
commit 6930024be42f44743d5eef66b0483c59c5c20e50
Author: Claus Ibsen
AuthorDate: Sat Mar 19 18:23:27 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index cf7cb55..8d2b2c3 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -185,7 +185,7 @@ public abstract class BaseMainSupport extends BaseService {
}
/**
- * Adds a initial property for the properties component, which will be
used before any locations are resolved.
+ * Adds a property (initial) for the properties component, which will be
used before any locations are resolved.
*
* @param key the property key
* @param value the property value
@@ -775,6 +775,7 @@ public abstract class BaseMainSupport extends BaseService {
CamelContext camelContext, MainConfigurationProperties config,
Map autoConfiguredProperties)
throws Exception {
+
if (config.getFileConfigurations() != null) {
String[] locs = config.getFileConfigurations().split(",");
for (String loc : locs) {
[camel] branch main updated: Polished
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 f32cbcf Polished f32cbcf is described below commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 Author: Claus Ibsen AuthorDate: Sun Feb 27 10:41:59 2022 +0100 Polished --- components/camel-test/camel-test-cdi-junit5/pom.xml| 2 +- components/camel-test/camel-test-spring-junit5/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-test/camel-test-cdi-junit5/pom.xml b/components/camel-test/camel-test-cdi-junit5/pom.xml index 3d65788..daaac44 100644 --- a/components/camel-test/camel-test-cdi-junit5/pom.xml +++ b/components/camel-test/camel-test-cdi-junit5/pom.xml @@ -29,7 +29,7 @@ camel-test-cdi-junit5 jar -Camel :: Test :: CDI:: JUnit5 +Camel :: Test :: CDI :: JUnit5 Camel unit testing with CDI and JUnit5 diff --git a/components/camel-test/camel-test-spring-junit5/pom.xml b/components/camel-test/camel-test-spring-junit5/pom.xml index fefc7d5..5ee69cf 100644 --- a/components/camel-test/camel-test-spring-junit5/pom.xml +++ b/components/camel-test/camel-test-spring-junit5/pom.xml @@ -29,7 +29,7 @@ camel-test-spring-junit5 jar -Camel :: Test :: Spring:: JUnit5 +Camel :: Test :: Spring :: JUnit5 Camel unit testing with Spring and JUnit 5
[camel] branch main updated: Polished
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 80266dd Polished
80266dd is described below
commit 80266dd698dbbe8f83a993d770e5e8e980797b82
Author: Claus Ibsen
AuthorDate: Thu Feb 3 11:38:38 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java | 3 +--
.../src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java | 2 +-
.../src/test/java/org/apache/camel/dsl/jsh/JshSourceLoaderTest.java| 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
index e50009d..1a6d605 100644
---
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
+++
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
@@ -63,8 +63,7 @@ final class JshLoaderDelegate implements LoaderDelegate {
}
@Override
-public void addToClasspath(String cp)
-throws ExecutionControl.EngineTerminationException,
ExecutionControl.InternalException {
+public void addToClasspath(String cp) {
throw new UnsupportedOperationException("Not implemented");
}
diff --git
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
index 7e21669..a614a36 100644
---
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
+++
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
@@ -66,7 +66,7 @@ public class JshRoutesBuilderLoader extends
RoutesBuilderLoaderSupport {
// By default the jdk.jshell.execution.DefaultLoaderDelegate uses a
// custom URL class-loader and does not provide any option to set the
// parent which causes the ThreadLocal hack used to inject bindings
-// to fail as there are two copies fo the Jsh class (one from the
+// to fail as there are two copies of the JSH class (one from the
// Quarkus class loader and one for the custom one).
//
final JshClassLoader jshcl = new JshClassLoader(tccl);
diff --git
a/dsl/camel-jsh-dsl/src/test/java/org/apache/camel/dsl/jsh/JshSourceLoaderTest.java
b/dsl/camel-jsh-dsl/src/test/java/org/apache/camel/dsl/jsh/JshSourceLoaderTest.java
index e10859f..e4a8f8d 100644
---
a/dsl/camel-jsh-dsl/src/test/java/org/apache/camel/dsl/jsh/JshSourceLoaderTest.java
+++
b/dsl/camel-jsh-dsl/src/test/java/org/apache/camel/dsl/jsh/JshSourceLoaderTest.java
@@ -44,7 +44,7 @@ public class JshSourceLoaderTest {
assertThat(builders).hasSize(1);
RouteBuilder builder = (RouteBuilder) builders.iterator().next();
-builder.setContext(context);
+builder.setCamelContext(context);
builder.configure();
Assertions.assertThat(builder.getRouteCollection().getRoutes())
[camel] branch main updated: Polished
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 ed138f7 Polished
ed138f7 is described below
commit ed138f782ab4ac68ffb987280791b99abbe37009
Author: Claus Ibsen
AuthorDate: Thu Feb 3 11:16:05 2022 +0100
Polished
---
.../groovy/org/apache/camel/dsl/groovy/common/GroovyDSL.groovy | 1 -
.../camel/dsl/groovy/common/model/BeanConfiguration.groovy | 3 +--
.../dsl/groovy/common/model/DataFormatsConfiguration.groovy | 2 +-
.../camel/dsl/groovy/common/model/LanguagesConfiguration.groovy | 9 -
.../services/org.codehaus.groovy.runtime.ExtensionModule | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/GroovyDSL.groovy
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/GroovyDSL.groovy
index 9b7b9b0..2258c5e 100644
---
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/GroovyDSL.groovy
+++
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/GroovyDSL.groovy
@@ -38,7 +38,6 @@ import org.apache.camel.model.RouteDefinition
import org.apache.camel.model.rest.RestConfigurationDefinition
import org.apache.camel.model.rest.RestDefinition
import org.apache.camel.spi.Registry
-import org.apache.camel.support.builder.ExpressionBuilder
class GroovyDSL extends BuilderSupport implements EndpointBuilderFactory {
final Registry registry
diff --git
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/BeanConfiguration.groovy
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/BeanConfiguration.groovy
index 018e9c9..666c172 100644
---
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/BeanConfiguration.groovy
+++
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/BeanConfiguration.groovy
@@ -30,7 +30,7 @@ class BeanConfiguration {
}
def methodMissing(String name, arguments) {
-Object value = null
+Object value
final Object[] args = arguments as Object[]
if (args == null) {
@@ -45,7 +45,6 @@ class BeanConfiguration {
def m = this.target.metaClass.getMetaMethod(name, Closure.class)
if (m) {
m.invoke(target, args)
-
// done
return
}
diff --git
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/DataFormatsConfiguration.groovy
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/DataFormatsConfiguration.groovy
index 9c68712..c62455b 100644
---
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/DataFormatsConfiguration.groovy
+++
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/DataFormatsConfiguration.groovy
@@ -32,7 +32,7 @@ class DataFormatsConfiguration {
throw new IllegalArgumentException("Unable to find a dataformat
with name: ${name}")
}
-// Just make sure the closure context is belong to component
+// Just make sure the closure context is belong to dataformat
callable.resolveStrategy = Closure.DELEGATE_ONLY
callable.delegate = new BeanConfiguration(context, target)
callable.call()
diff --git
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/LanguagesConfiguration.groovy
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/LanguagesConfiguration.groovy
index ce23df9..0dcd7cb 100644
---
a/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/LanguagesConfiguration.groovy
+++
b/dsl/camel-groovy-dsl/camel-groovy-dsl-common/src/main/groovy/org/apache/camel/dsl/groovy/common/model/LanguagesConfiguration.groovy
@@ -32,12 +32,12 @@ class LanguagesConfiguration {
throw new IllegalArgumentException("Unable to find a language with
name: ${name}")
}
-// Just make sure the closure context is belong to component
+// Just make sure the closure context is belong to language
callable.resolveStrategy = Closure.DELEGATE_ONLY
callable.delegate = new BeanConfiguration(context, target)
callable.call()
-// let's the camel context be aware of the new dataformat
+// let's the camel
[camel] branch main updated: Polished
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 92d37d4 Polished
92d37d4 is described below
commit 92d37d4167e04f14dcbf2619024861f2f8d03f9b
Author: Claus Ibsen
AuthorDate: Thu Jan 27 09:27:18 2022 +0100
Polished
---
.../camel-dynamic-router/src/test/resources/log4j2.properties| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git
a/components/camel-dynamic-router/src/test/resources/log4j2.properties
b/components/camel-dynamic-router/src/test/resources/log4j2.properties
index d9f0508..19bccd1 100644
--- a/components/camel-dynamic-router/src/test/resources/log4j2.properties
+++ b/components/camel-dynamic-router/src/test/resources/log4j2.properties
@@ -15,9 +15,14 @@
## limitations under the License.
## ---
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-dynamic-router-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
appender.out.type = Console
appender.out.name = out
appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
+rootLogger.appenderRef.file.ref = file
[camel] branch main updated: Polished
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 33ce515 Polished
33ce515 is described below
commit 33ce515989d83dc2ec68309bba1cb00efe3dbd0f
Author: Claus Ibsen
AuthorDate: Tue Jan 25 13:58:01 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/support/LoggerHelper.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
index 5c7d836..7d37883 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
@@ -48,6 +48,8 @@ public final class LoggerHelper {
// is it a class or file?
name = loc;
if (loc.contains(":")) {
+// strip prefix
+loc = loc.substring(loc.indexOf(':') + 1);
// file based such as xml and yaml
name = FileUtil.stripPath(loc);
} else {
[camel] branch main updated: Polished title on JFR
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 fb83a04 Polished title on JFR
fb83a04 is described below
commit fb83a04b4e7c70d22e354023a170ef48693d1bd1
Author: Claus Ibsen
AuthorDate: Sun Jan 23 12:44:13 2022 +0100
Polished title on JFR
---
.../src/generated/resources/org/apache/camel/catalog/others/jfr.json | 2 +-
components/camel-jfr/pom.xml | 1 +
components/camel-jfr/src/generated/resources/jfr.json | 2 +-
components/camel-jfr/src/main/docs/jfr.adoc | 4 ++--
docs/components/modules/others/nav.adoc | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
index 98a6ad0..73d5944 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
@@ -2,7 +2,7 @@
"other": {
"kind": "other",
"name": "jfr",
-"title": "Jfr",
+"title": "JFR",
"description": "Diagnose Camel applications with Java Flight Recorder",
"deprecated": false,
"firstVersion": "3.8.0",
diff --git a/components/camel-jfr/pom.xml b/components/camel-jfr/pom.xml
index fb8b132..a384d4a 100644
--- a/components/camel-jfr/pom.xml
+++ b/components/camel-jfr/pom.xml
@@ -34,6 +34,7 @@
3.8.0
monitoring
+JFR
diff --git a/components/camel-jfr/src/generated/resources/jfr.json
b/components/camel-jfr/src/generated/resources/jfr.json
index 98a6ad0..73d5944 100644
--- a/components/camel-jfr/src/generated/resources/jfr.json
+++ b/components/camel-jfr/src/generated/resources/jfr.json
@@ -2,7 +2,7 @@
"other": {
"kind": "other",
"name": "jfr",
-"title": "Jfr",
+"title": "JFR",
"description": "Diagnose Camel applications with Java Flight Recorder",
"deprecated": false,
"firstVersion": "3.8.0",
diff --git a/components/camel-jfr/src/main/docs/jfr.adoc
b/components/camel-jfr/src/main/docs/jfr.adoc
index 7f716df..0c923ef 100644
--- a/components/camel-jfr/src/main/docs/jfr.adoc
+++ b/components/camel-jfr/src/main/docs/jfr.adoc
@@ -1,5 +1,5 @@
-= Jfr Component
-:doctitle: Jfr
+= JFR Component
+:doctitle: JFR
:shortname: jfr
:artifactid: camel-jfr
:description: Diagnose Camel applications with Java Flight Recorder
diff --git a/docs/components/modules/others/nav.adoc
b/docs/components/modules/others/nav.adoc
index d4130a2..6b35d0a 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -27,7 +27,7 @@
** xref:headersmap.adoc[Headersmap]
** xref:hystrix.adoc[Hystrix]
** xref:jasypt.adoc[Jasypt]
-** xref:jfr.adoc[Jfr]
+** xref:jfr.adoc[JFR]
** xref:jta.adoc[JTA]
** xref:knative-api.adoc[Knative Api]
** xref:knative-http.adoc[Knative Http]
[camel] branch main updated: Polished doc
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 400acbb Polished doc
400acbb is described below
commit 400acbbabcc1e88f1c1e048700adb39f120f1c86
Author: Claus Ibsen
AuthorDate: Thu Jan 13 22:24:50 2022 +0100
Polished doc
---
docs/user-manual/modules/ROOT/pages/tracer.adoc | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/tracer.adoc
b/docs/user-manual/modules/ROOT/pages/tracer.adoc
index 41403ba..a2845c7 100644
--- a/docs/user-manual/modules/ROOT/pages/tracer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/tracer.adoc
@@ -89,7 +89,7 @@ The default format can be customized using, for exameple to
use wider columns:
[source,java]
-context.setTracingLoggingFormat("%-4.4s [%-30.30s] [%-50.50s]);
+context.setTracingLoggingFormat("%-4.4s [%-30.30s] [%-50.50s]");
And in XML DSL:
@@ -103,9 +103,14 @@ And in XML DSL:
And in Spring Boot
-[source,text]
+[source,properties]
camel.springboot.tracing-logging-format = %-4.4s [%-30.30s] [%-50.50s]
+And in Camel Main / Quarkus
+[source,properties]
+
+camel.main.tracing-logging-format = %-4.4s [%-30.30s] [%-50.50s]
+
[camel] branch main updated: Polished
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 336ea17 Polished
336ea17 is described below
commit 336ea17f67c9d79b0c18965dcd9ba1ed03c4b844
Author: Claus Ibsen
AuthorDate: Sun Jan 9 10:00:54 2022 +0100
Polished
---
.../camel/dsl/jbang/core/generator/QuarkusGenerator.java | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/generator/QuarkusGenerator.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/generator/QuarkusGenerator.java
index 8bbebc4..a139d41 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/generator/QuarkusGenerator.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/generator/QuarkusGenerator.java
@@ -18,14 +18,13 @@ package org.apache.camel.dsl.jbang.core.generator;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
public class QuarkusGenerator implements CamelJbangGenerator {
-private List dependencies;
-private String bomVersion;
+private final List dependencies;
+private final String bomVersion;
public QuarkusGenerator(List dependencies, String bomVersion) {
this.dependencies = dependencies;
@@ -43,15 +42,13 @@ public class QuarkusGenerator implements
CamelJbangGenerator {
sb.append("quarkus.banner.enabled = false\n");
sb.append("quarkus.log.file.enable = true\n");
sb.append("camel.context.name = ").append(name).append("\n");
-sb.append("camel.main.routes-include-pattern= classpath:routes/*");
-
+sb.append("camel.main.routes-include-pattern = classpath:routes/*");
return sb.toString();
}
@Override
public List getPomProperties() {
-return Arrays.asList(
-new PomProperty("quarkus.platform.version", bomVersion));
+return List.of(new PomProperty("quarkus.platform.version",
bomVersion));
}
public String getTemplate() {
[camel] branch main updated: Polished
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 9126045 Polished
9126045 is described below
commit 9126045b6f10a797b474f0d5a38834a5f60f6dfe
Author: Claus Ibsen
AuthorDate: Sat Jan 8 21:23:17 2022 +0100
Polished
---
.../main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index e34c08c..de5750e 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -293,7 +293,7 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
line = node.getStartMark().get().getLine();
}
-ProcessorDefinition out;
+ProcessorDefinition out;
// if kamelet then use kamelet eip instead of to
boolean kamelet = uri.startsWith("kamelet:");
if (kamelet) {
[camel] branch main updated: Polished
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 c49633f Polished
c49633f is described below
commit c49633f7a9637c7c69abdb915353e30567fd516b
Author: Claus Ibsen
AuthorDate: Sat Jan 8 10:13:12 2022 +0100
Polished
---
core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 0c794ad..6acdb6c 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -110,7 +110,7 @@ public final class SensitiveUtils {
}
/**
- * Whether the given configuration property contains a sensitive a
sensitive key (such as password, accesstoken,
+ * Whether the given configuration property contains a sensitive key (such
as password, accesstoken,
* etc.)
*
* @param text the configuration property
[camel] branch main updated: Polished doc
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 12006fd Polished doc 12006fd is described below commit 12006fdf7e79b3d428d2a86f2511e33676f1d12b Author: Claus Ibsen AuthorDate: Tue Jan 4 16:45:42 2022 +0100 Polished doc --- components/camel-jfr/src/main/docs/jfr.adoc | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/components/camel-jfr/src/main/docs/jfr.adoc b/components/camel-jfr/src/main/docs/jfr.adoc index 4d07c6f..7f716df 100644 --- a/components/camel-jfr/src/main/docs/jfr.adoc +++ b/components/camel-jfr/src/main/docs/jfr.adoc @@ -17,19 +17,17 @@ This allows to monitor and troubleshoot your Camel applications with JFR. The camel-jfr component emits lifecycle events for startup to JFR. This can for example be used to pin-point which Camel routes may be slow to startup. -[[jfr-Options]] - See the __startupRecorder__ options from xref:components:others:main.adoc[Camel Main] -[[jfr-Example]] == Example To enable you just need to add `camel-jfr` to the classpath, and enable JFR recording. JFR recordings can be started either at: + - When running the JVM using JVM arguments - When starting Camel by setting `camel.main.startup-recorder-recording=true`. -See the `camel-example-flight-recorder` from the Camel Examples. +See the `flight-recorder` from the Camel Examples. include::spring-boot:partial$starter.adoc[]
[camel] branch main updated: Polished
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 b017a23 Polished b017a23 is described below commit b017a236b99b25e74227801aabf25e8f2c5956cf Author: Claus Ibsen AuthorDate: Sun Jan 2 14:52:03 2022 +0100 Polished --- .../src/main/java/org/apache/camel/reifier/InterceptFromReifier.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java index a216a99..3635838 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java @@ -31,7 +31,6 @@ public class InterceptFromReifier extends InterceptReifier
[camel] branch main updated: Polished
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 0b07598 Polished
0b07598 is described below
commit 0b07598f5a6de7a9b9e663fbce2b4aafaf3b66dd
Author: Claus Ibsen
AuthorDate: Fri Dec 17 13:53:55 2021 +0100
Polished
---
core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java
b/core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java
index 6d81ba4..1432edf 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java
@@ -26,7 +26,7 @@ import org.apache.camel.Service;
import org.apache.camel.spi.CamelEvent.ExchangeEvent;
/**
- * A debugger which allows tooling to attach breakpoints which is is being
invoked when {@link Exchange}s is being
+ * A debugger which allows tooling to attach breakpoints which is being
invoked when {@link Exchange}s is being
* routed.
*/
public interface Debugger extends Service, CamelContextAware {
[camel] branch main updated: Polished
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 a224cfa Polished
a224cfa is described below
commit a224cfafa52f5660bed1babac9d7aaffc70c75d7
Author: Claus Ibsen
AuthorDate: Thu Dec 16 14:41:08 2021 +0100
Polished
---
.../camel/management/mbean/ManagedBacklogDebugger.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
index 22184e0..da725db 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
@@ -17,7 +17,6 @@
package org.apache.camel.management.mbean;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.Map;
import java.util.Set;
@@ -303,13 +302,13 @@ public class ManagedBacklogDebugger implements
ManagedBacklogDebuggerMBean {
@Override
public Object evaluateExpressionAtBreakpoint(String id, String language,
String expression, String resultType) {
-Exchange suspendedExchange = null;
+Exchange suspendedExchange;
try {
Language lan = camelContext.resolveLanguage(language);
suspendedExchange = backlogDebugger.getSuspendedExchange(id);
if (suspendedExchange != null) {
-Object result = null;
-Class resultClass =
camelContext.getClassResolver().resolveClass(resultType);
+Object result;
+Class resultClass =
camelContext.getClassResolver().resolveMandatoryClass(resultType);
if (!Boolean.class.isAssignableFrom(resultClass)) {
Expression expr = lan.createExpression(expression);
expr.init(camelContext);
@@ -329,17 +328,17 @@ public class ManagedBacklogDebugger implements
ManagedBacklogDebuggerMBean {
return result;
}
} catch (Exception e) {
-return e;
+return e.getMessage();
}
return null;
}
-private boolean isSerializable(Object obj) {
+private static boolean isSerializable(Object obj) {
final ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
try (ObjectOutputStream out = new ObjectOutputStream(baos)) {
out.writeObject(obj);
return true;
-} catch (final IOException ex) {
+} catch (Exception e) {
return false;
}
}
[camel] branch main updated: Polished component description
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 55db43a Polished component description
55db43a is described below
commit 55db43a96b6b12f5fad18bf3178a1177eedeeebe
Author: Claus Ibsen
AuthorDate: Thu Dec 16 09:23:44 2021 +0100
Polished component description
---
.../resources/org/apache/camel/component/jsonpatch/json-patch.json | 2 +-
components/camel-json-patch/src/main/docs/json-patch-component.adoc | 2 +-
.../org/apache/camel/component/jsonpatch/JsonPatchEndpoint.java | 2 +-
.../apache/camel/builder/component/ComponentsBuilderFactory.java| 2 +-
.../builder/component/dsl/JsonPatchComponentBuilderFactory.java | 4 ++--
core/camel-componentdsl/src/generated/resources/metadata.json | 2 +-
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++--
.../camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java | 6 +++---
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/components/camel-json-patch/src/generated/resources/org/apache/camel/component/jsonpatch/json-patch.json
b/components/camel-json-patch/src/generated/resources/org/apache/camel/component/jsonpatch/json-patch.json
index b35fa00..90785b3 100644
---
a/components/camel-json-patch/src/generated/resources/org/apache/camel/component/jsonpatch/json-patch.json
+++
b/components/camel-json-patch/src/generated/resources/org/apache/camel/component/jsonpatch/json-patch.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "json-patch",
"title": "JsonPatch",
-"description": "JsonPatch component which transform JSON using JSON patch
(RFC 6902).",
+"description": "Transforms JSON using JSON patch (RFC 6902).",
"deprecated": false,
"firstVersion": "3.12.0",
"label": "transformation",
diff --git
a/components/camel-json-patch/src/main/docs/json-patch-component.adoc
b/components/camel-json-patch/src/main/docs/json-patch-component.adoc
index b62a1f7..9c3534a 100644
--- a/components/camel-json-patch/src/main/docs/json-patch-component.adoc
+++ b/components/camel-json-patch/src/main/docs/json-patch-component.adoc
@@ -2,7 +2,7 @@
:doctitle: JsonPatch
:shortname: json-patch
:artifactid: camel-json-patch
-:description: JsonPatch component which transform JSON using JSON patch (RFC
6902).
+:description: Transforms JSON using JSON patch (RFC 6902).
:since: 3.12
:supportlevel: Stable
:component-header: Only producer is supported
diff --git
a/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchEndpoint.java
b/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchEndpoint.java
index 2fedf45..fb584fd 100644
---
a/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchEndpoint.java
+++
b/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchEndpoint.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.spi.UriEndpoint;
/**
- * JsonPatch component which transform JSON using JSON patch (RFC 6902).
+ * Transforms JSON using JSON patch (RFC 6902).
*/
@UriEndpoint(firstVersion = "3.12.0", scheme = "json-patch", title =
"JsonPatch", syntax = "json-patch:resourceUri",
producerOnly = true,
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 9cec5f2..451b939 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -2535,7 +2535,7 @@ public interface ComponentsBuilderFactory {
}
/**
* JsonPatch (camel-json-patch)
- * JsonPatch component which transform JSON using JSON patch (RFC 6902).
+ * Transforms JSON using JSON patch (RFC 6902).
*
* Category: transformation
* Since: 3.12
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
index 767d541..350277b 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.jsonpatch.JsonPatchComponent;
/**
- *
[camel] branch main updated: Polished component description
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 1369dc9 Polished component description 1369dc9 is described below commit 1369dc9934862c1ed637c881b7790d8e5cec1d2c Author: Claus Ibsen AuthorDate: Thu Dec 16 09:19:36 2021 +0100 Polished component description --- .../component/azure/eventhubs/azure-eventhubs.json | 2 +- .../src/main/docs/azure-eventhubs-component.adoc | 2 +- .../azure/eventhubs/EventHubsEndpoint.java | 4 +-- .../azure/servicebus/azure-servicebus.json | 2 +- .../src/main/docs/azure-servicebus-component.adoc | 2 +- .../azure/servicebus/ServiceBusEndpoint.java | 5 +-- .../azure/storage/blob/azure-storage-blob.json | 2 +- .../main/docs/azure-storage-blob-component.adoc| 2 +- .../component/azure/storage/blob/BlobEndpoint.java | 2 +- .../storage/datalake/azure-storage-datalake.json | 4 +-- .../docs/azure-storage-datalake-component.adoc | 2 +- .../azure/storage/datalake/DataLakeEndpoint.java | 6 +++- .../azure/storage/queue/azure-storage-queue.json | 2 +- .../main/docs/azure-storage-queue-component.adoc | 2 +- .../azure/storage/queue/QueueEndpoint.java | 3 +- .../component/ComponentsBuilderFactory.java| 21 --- .../dsl/AzureEventhubsComponentBuilderFactory.java | 10 ++ .../AzureServicebusComponentBuilderFactory.java| 13 ++- .../AzureStorageBlobComponentBuilderFactory.java | 4 +-- ...zureStorageDatalakeComponentBuilderFactory.java | 6 ++-- .../AzureStorageQueueComponentBuilderFactory.java | 6 ++-- .../src/generated/resources/metadata.json | 12 +++ .../builder/endpoint/StaticEndpointBuilders.java | 42 +++--- .../endpoint/dsl/BlobEndpointBuilderFactory.java | 8 ++--- .../dsl/DataLakeEndpointBuilderFactory.java| 10 +++--- .../dsl/EventHubsEndpointBuilderFactory.java | 15 ++-- .../endpoint/dsl/QueueEndpointBuilderFactory.java | 9 ++--- .../dsl/ServiceBusEndpointBuilderFactory.java | 20 ++- 28 files changed, 72 insertions(+), 146 deletions(-) diff --git a/components/camel-azure/camel-azure-eventhubs/src/generated/resources/org/apache/camel/component/azure/eventhubs/azure-eventhubs.json b/components/camel-azure/camel-azure-eventhubs/src/generated/resources/org/apache/camel/component/azure/eventhubs/azure-eventhubs.json index b1cb1ad..ea105d6 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/generated/resources/org/apache/camel/component/azure/eventhubs/azure-eventhubs.json +++ b/components/camel-azure/camel-azure-eventhubs/src/generated/resources/org/apache/camel/component/azure/eventhubs/azure-eventhubs.json @@ -3,7 +3,7 @@ "kind": "component", "name": "azure-eventhubs", "title": "Azure Event Hubs", -"description": "The azure-eventhubs component that integrates Azure Event Hubs using AMQP protocol. Azure EventHubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers.", +"description": "Send and receive events to\/from Azure Event Hubs using AMQP protocol.", "deprecated": false, "firstVersion": "3.5.0", "label": "cloud,messaging", diff --git a/components/camel-azure/camel-azure-eventhubs/src/main/docs/azure-eventhubs-component.adoc b/components/camel-azure/camel-azure-eventhubs/src/main/docs/azure-eventhubs-component.adoc index 28cb9e7..3889748 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/main/docs/azure-eventhubs-component.adoc +++ b/components/camel-azure/camel-azure-eventhubs/src/main/docs/azure-eventhubs-component.adoc @@ -2,7 +2,7 @@ :doctitle: Azure Event Hubs :shortname: azure-eventhubs :artifactid: camel-azure-eventhubs -:description: The azure-eventhubs component that integrates Azure Event Hubs using AMQP protocol. Azure EventHubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers. +:description: Send and receive events to/from Azure Event Hubs using AMQP protocol. :since: 3.5 :supportlevel: Stable :component-header: Both producer and consumer are supported diff --git a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpoint.java b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpoint.java index b9010e8..6699aa1 100644 --- a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpoint.java +++ b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpoint.java @@ -26,9 +26,7 @@ import
[camel] branch main updated: Polished
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 c9230f4 Polished
c9230f4 is described below
commit c9230f44272310503dc3ccde49ac5ceefc19e4a9
Author: Claus Ibsen
AuthorDate: Thu Dec 16 08:39:02 2021 +0100
Polished
---
.../src/main/java/org/apache/camel/Exchange.java | 2 +-
.../apache/camel/support/DefaultExchangeHolder.java| 18 ++
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 5f34c55..52d4707 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -422,7 +422,7 @@ public interface Exchange {
Map getAllProperties();
/**
- * Returns whether any properties has been set
+ * Returns whether any properties have been set
*
* @return true if any properties has been set
*/
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
index 2436f04..405cd75 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
@@ -25,7 +25,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.WrappedFile;
import org.apache.camel.util.ObjectHelper;
@@ -231,25 +230,12 @@ public class DefaultExchangeHolder implements
Serializable {
}
private Map safeSetProperties(Exchange exchange, boolean
allowSerializedHeaders) {
-if (exchange.hasProperties()) {
-Map map =
checkValidExchangePropertyObjects("properties", exchange,
exchange.getProperties(),
-allowSerializedHeaders);
-if (map != null && !map.isEmpty()) {
-properties = new LinkedHashMap<>(map);
-}
-}
// also include the internal properties
-Map map =
checkValidExchangePropertyObjects("properties", exchange,
-exchange.adapt(ExtendedExchange.class).getInternalProperties(),
+Map map =
checkValidExchangePropertyObjects("properties", exchange,
exchange.getAllProperties(),
allowSerializedHeaders);
if (map != null && !map.isEmpty()) {
-if (properties == null) {
-properties = new LinkedHashMap<>(map);
-} else {
-properties.putAll(map);
-}
+properties = new LinkedHashMap<>(map);
}
-
return null;
}
[camel] branch main updated: Polished
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 3b36a12 Polished
3b36a12 is described below
commit 3b36a1269e8f894834db2c4a2d509eae801bcc2b
Author: Claus Ibsen
AuthorDate: Wed Dec 15 12:47:22 2021 +0100
Polished
---
.../src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
index 0951a5b..6534f4c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogDebugger.java
@@ -194,7 +194,7 @@ public final class BacklogDebugger extends ServiceSupport {
debugger.removeBreakpoint(breakpoint);
breakpoints.put(nodeId, breakpoint);
debugger.addBreakpoint(breakpoint, breakpoint);
-} else if (breakpoint.getCondition() != null) {
+} else {
logger.log("Updating conditional breakpoint " + nodeId + " [" +
predicate + "]");
breakpoint.setCondition(condition);
}
[camel] branch main updated: Polished
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 adc7aff Polished
adc7aff is described below
commit adc7aff50bc8122d099b7ce242663a1e41f99b75
Author: Claus Ibsen
AuthorDate: Wed Dec 15 12:43:45 2021 +0100
Polished
---
.../management/mbean/BacklogTracerEventMessage.java | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/BacklogTracerEventMessage.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/BacklogTracerEventMessage.java
index 8d48cbb..b295979 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/BacklogTracerEventMessage.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/BacklogTracerEventMessage.java
@@ -19,23 +19,41 @@ package org.apache.camel.api.management.mbean;
import java.io.Serializable;
/**
- * Represents a traced message by the {@link
org.apache.camel.processor.interceptor.BacklogTracer}.
+ * Represents a traced message by the BacklogTracer.
*/
public interface BacklogTracerEventMessage extends Serializable {
String ROOT_TAG = "backlogTracerEventMessage";
String TIMESTAMP_FORMAT = "-MM-dd'T'HH:mm:ss.SSSZ";
+/**
+ * Unique id of the traced message
+ */
long getUid();
+/**
+ * Timestamp of the traced event
+ */
long getTimestamp();
+/**
+ * Route id
+ */
String getRouteId();
+/**
+ * Node id where the message is being routed to
+ */
String getToNode();
+/**
+ * The exchange id
+ */
String getExchangeId();
+/**
+ * The content of the message as XML (body and headers)
+ */
String getMessageAsXml();
/**
[camel] branch main updated: Polished
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 146baa2 Polished
146baa2 is described below
commit 146baa2ebd8762898352a33fe718a821051279f3
Author: Claus Ibsen
AuthorDate: Sun Dec 12 10:24:47 2021 +0100
Polished
---
.../src/main/java/org/apache/camel/maven/DevMojo.java | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
index e34613a..b4316d4 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
@@ -38,16 +38,17 @@ public class DevMojo extends RunMojo {
*/
@Override
protected void beforeBootstrapCamel() throws Exception {
-String routesReloadDirectory = "src/main/resources";
-
+String dir;
if (routesDirectory != null) {
-routesReloadDirectory = routesDirectory;
-} else if (routesDirectory == null && project.getResources().size() ==
1) {
-routesReloadDirectory =
project.getResources().get(0).getDirectory();
+dir = routesDirectory;
+} else if (project.getResources().size() == 1) {
+dir = project.getResources().get(0).getDirectory();
+} else {
+dir = "src/main/resources";
}
System.setProperty("camel.main.routesReloadEnabled", "true");
-System.setProperty("camel.main.routesReloadDirectory",
routesReloadDirectory);
+System.setProperty("camel.main.routesReloadDirectory", dir);
System.setProperty("camel.main.routesReloadDirectoryRecursive",
"true");
System.setProperty("camel.main.durationMaxAction", "stop");
System.setProperty("camel.main.routesReloadPattern",
[camel] branch main updated: Polished
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 5a1caa9 Polished
5a1caa9 is described below
commit 5a1caa9c5c6f3f354de95ab3e3163051215d822c
Author: Claus Ibsen
AuthorDate: Fri Dec 3 14:31:50 2021 +0100
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
1 file changed, 1 insertion(+), 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 68da4c3..0c808ee 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
@@ -79,7 +79,7 @@ class Run implements Callable {
private boolean fileLock = true;
@Option(names = { "--local-kamelet-dir" },
-description = "Load Kamelets from a local directory instead of
resolving them from the classpath or GitHub")
+description = "Local directory to load Kamelets from (take
precedence))")
private String localKameletDir;
@Override
[camel] branch main updated: Polished
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 974ba7c Polished
974ba7c is described below
commit 974ba7c518063bcfd650644b4a11247337e059b1
Author: Claus Ibsen
AuthorDate: Fri Nov 26 09:42:55 2021 +0100
Polished
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 10 +-
.../camel/impl/engine/DefaultSupervisingRouteController.java | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 77a07b2..aaf9066 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3081,9 +3081,9 @@ public abstract class AbstractCamelContext extends
BaseService
}
}
if (disabled > 0) {
-LOG.info("Routes startup summary (total:{} started:{}
disabled:{})", total, started, disabled);
+LOG.info("Routes startup (total:{} started:{} disabled:{})",
total, started, disabled);
} else {
-LOG.info("Routes startup summary (total:{} started:{})",
total, started);
+LOG.info("Routes startup (total:{} started:{})", total,
started);
}
// if we are default/verbose then log each route line
if (startupSummaryLevel == StartupSummaryLevel.Default ||
startupSummaryLevel == StartupSummaryLevel.Verbose) {
@@ -3091,7 +3091,7 @@ public abstract class AbstractCamelContext extends
BaseService
LOG.info(line);
}
if (startupSummaryLevel == StartupSummaryLevel.Verbose) {
-LOG.info("Routes configuration summary");
+LOG.info("Routes configuration:");
for (String line : configs) {
LOG.info(line);
}
@@ -3493,9 +3493,9 @@ public abstract class AbstractCamelContext extends
BaseService
lines.add(String.format("%s %s (%s)", status, id, uri));
}
if (forced > 0) {
-logger.log(String.format("Routes stopped summary (total:%s
stopped:%s forced:%s)", total, stopped, forced));
+logger.log(String.format("Routes stopped (total:%s stopped:%s
forced:%s)", total, stopped, forced));
} else {
-logger.log(String.format("Routes stopped summary (total:%s
stopped:%s)", total, stopped));
+logger.log(String.format("Routes stopped (total:%s
stopped:%s)", total, stopped));
}
// if we are default/verbose then log each route line
if (startupSummaryLevel == StartupSummaryLevel.Default ||
startupSummaryLevel == StartupSummaryLevel.Verbose) {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index 158dbe3..a70ace4 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -530,9 +530,9 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
}
if (restarting == 0 && exhausted == 0) {
-LOG.info("Routes startup summary (total:{} started:{})", total,
started);
+LOG.info("Routes startup (total:{} started:{})", total, started);
} else {
-LOG.info("Routes startup summary (total:{} started:{}
restarting:{} exhausted:{})", total, started, restarting,
+LOG.info("Routes startup (total:{} started:{} restarting:{}
exhausted:{})", total, started, restarting,
exhausted);
}
if (getCamelContext().getStartupSummaryLevel() ==
StartupSummaryLevel.Default
@@ -541,7 +541,7 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
LOG.info(line);
}
if (getCamelContext().getStartupSummaryLevel() ==
StartupSummaryLevel.Verbose) {
-LOG.info("Routes configuration summary");
+LOG.info("Routes configuration:");
for (String line : configs) {
LOG.info(line);
}
[camel] branch main updated: Polished
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 bd364fe8 Polished
bd364fe8 is described below
commit bd364fe8cac16dedb45bc45dc5bdd29024610640
Author: Claus Ibsen
AuthorDate: Wed Nov 24 08:07:09 2021 +0100
Polished
---
catalog/camel-catalog/pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index d434a7e..d6c5982 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -160,14 +160,13 @@
-
+
org.apache.camel
sync-properties-maven-plugin
${project.version}
-
sync-properties
[camel] branch main updated: Polished
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 3b8710f Polished
3b8710f is described below
commit 3b8710f882ad15fd12ef75f45234176dbd0f3fac
Author: Claus Ibsen
AuthorDate: Tue Nov 23 14:06:19 2021 +0100
Polished
---
.../org/apache/camel/spring/xml/XmlCamelContextConfigurer.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
index dada06d..d595d4c 100644
---
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
+++
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/XmlCamelContextConfigurer.java
@@ -20,14 +20,14 @@ import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.ApplicationContext;
/**
- * Allows to do custom configuration when a new XML based {@link
org.apache.camel.spring.SpringCamelContext} has been
- * created. For example we use this to enable camel-spring-boot to configure
Camel created from XML files with the
- * existing Spring Boot auto configuration.
+ * Allows doing custom configuration when a new XML based {@link
org.apache.camel.spring.SpringCamelContext} has been
+ * created. For example, we use this to enable camel-spring-boot to configure
Camel created from XML files with the
+ * existing Spring Boot auto-configuration.
*/
public interface XmlCamelContextConfigurer {
/**
- * Configures XML based CamelContext with the given configuration
+ * Configures XML based CamelContext with the given configuration.
*
* @param applicationContext the Spring context
* @param camelContext the XML based CamelContext
[camel] branch main updated: Polished docs
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 1d3a2df Polished docs 1d3a2df is described below commit 1d3a2df46f593175f3acf713cabcbe12fd4512e8 Author: Claus Ibsen AuthorDate: Mon Nov 15 09:44:40 2021 +0100 Polished docs --- .../src/main/docs/modules/eips/pages/pollEnrich-eip.adoc| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc index 04de57e..65ad333 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc @@ -136,14 +136,16 @@ for example download a file from xref:ROOT:aws2-s3-component.adoc[AWS S3] as the Report REST API - - aws-s3:xavier-dev?amazonS3Client=#s3clientdeleteAfterRead=falsefileName=report-file.pdf + + aws-s3:xavier-dev?amazonS3Client=#s3clientdeleteAfterRead=falsefileName=report-file.pdf +Notice that the enriched endpoint is a constant, however Camel also supports dynamic endpoints which is covered next. + === Poll Enrich with Dynamic Endpoints Both `enrich` and `pollEnrich` supports using dynamic uris computed based on information from the current `Exchange`.
[camel] branch main updated: Polished
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 daf613d Polished
daf613d is described below
commit daf613d068a8fbe5ce93064e7b0ab573d9c328bc
Author: Claus Ibsen
AuthorDate: Wed Nov 10 16:40:18 2021 +0100
Polished
---
.../org/apache/camel/support/cache/DefaultProducerCache.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
index a5b0509..97152e4 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
@@ -133,13 +133,15 @@ public class DefaultProducerCache extends ServiceSupport
implements ProducerCach
.build())
.build();
-StopWatch watch = new StopWatch();
+StopWatch watch = LOG.isDebugEnabled() ? new StopWatch() : null;
if (!task.run(service::isStarting)) {
-LOG.warn("The producer did not finish starting");
+LOG.warn("The producer: {} did not finish starting in {} ms",
service, ACQUIRE_WAIT_TIME);
}
-LOG.debug("Waited {} ms for producer to finish starting: {} state:
{}", watch.taken(), service,
-service.getStatus());
+if (LOG.isDebugEnabled()) {
+LOG.debug("Waited {} ms for producer to finish starting: {} state:
{}", watch.taken(), service,
+service.getStatus());
+}
}
@Override
[camel] branch main updated: Polished
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 cf3b5c2 Polished
cf3b5c2 is described below
commit cf3b5c2b47542339649a29fe0f4b91da5d7bdfac
Author: Claus Ibsen
AuthorDate: Sat Oct 30 09:10:17 2021 +0200
Polished
---
.../org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
index 3d77a6a..a3f67db 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Default {@link ScheduledBatchPollingConsumer}.
+ * The default scheduler for {@link ScheduledPollConsumer}.
*/
public class DefaultScheduledPollConsumerScheduler extends ServiceSupport
implements ScheduledPollConsumerScheduler {
