[GitHub] [camel-kafka-connector] orpiske commented on issue #263: Camel HDFS: does not work due to dependencies conflicts
orpiske commented on issue #263: URL: https://github.com/apache/camel-kafka-connector/issues/263#issuecomment-651608151 > Maybe disable it for the moment I sent a PR that fixes the test execution, so we should be fine with regards to the dependencies conflicts. However I am not entirely sure if HDFS is working on some circumstances (specifically within kubernetes/openshift - I am investigating and I'll open a separate ticket if that's the case). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger opened a new issue #1433: Jolt: Remove the DeepCopySubstitution when/if graal supports Object serialization
aldettinger opened a new issue #1433: URL: https://github.com/apache/camel-quarkus/issues/1433 In #1421, the `DeepCopySubstitution` class was introduced to workaround [graal#460](https://github.com/oracle/graal/issues/460). Let's see what happen on the graal side, and remove the `DeepCopySubstitution` if possible. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger closed issue #1421: Jolt support
aldettinger closed issue #1421: URL: https://github.com/apache/camel-quarkus/issues/1421 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] orpiske commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
orpiske commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651636416 Strange error. It's unrelated to the change and I cannot reproduce it locally. Any ideas @oscerd ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] orpiske opened a new issue #310: CAMEL-15063 work-around may be removed
orpiske opened a new issue #310: URL: https://github.com/apache/camel-kafka-connector/issues/310 Since we have moved to 3.4, I think we can remove this workaround for the aforementioned issue: https://github.com/apache/camel-kafka-connector/blob/master/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java#L22 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
oscerd commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651648761 I'm re-running the test. No idea really. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
oscerd commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651649359 Maybe we could remove the workaround This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-14963 created (now 7406e84)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. at 7406e84 CAMEL-14963: Route Template. WIP This branch includes the following new commits: new 7406e84 CAMEL-14963: Route Template. WIP The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/01: CAMEL-14963: Route Template. WIP
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-14963
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7406e84d68bc01bbb01bc145762a07a25d33e375
Author: Claus Ibsen
AuthorDate: Tue Jun 30 10:46:01 2020 +0200
CAMEL-14963: Route Template. WIP
---
.../services/org/apache/camel/model.properties | 2 +
.../resources/org/apache/camel/model/jaxb.index| 2 +
.../org/apache/camel/model/routeTemplate.json | 31 +
.../org/apache/camel/model/routeTemplates.json | 17 +++
.../org/apache/camel/builder/RouteBuilder.java | 37 ++
.../org/apache/camel/impl/DefaultCamelContext.java | 31 +
.../java/org/apache/camel/impl/DefaultModel.java | 40 +++
.../camel/impl/lw/LightweightCamelContext.java | 31 +
.../main/java/org/apache/camel/model/Model.java| 69 +++
.../org/apache/camel/model/RouteDefinition.java| 2 +-
.../apache/camel/model/RouteTemplateContainer.java | 42 +++
.../camel/model/RouteTemplateDefinition.java | 72 +++
.../camel/model/RouteTemplatesDefinition.java | 133 +
.../apache/camel/builder/RouteTemplateTest.java| 46 +++
.../java/org/apache/camel/xml/in/ModelParser.java | 43 +--
15 files changed, 589 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties
b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties
index 9259476..1815052 100644
---
a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties
+++
b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties
@@ -131,6 +131,8 @@ roundRobin
route
routeBuilder
routeContextRef
+routeTemplate
+routeTemplates
routes
routingSlip
rss
diff --git
a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index
b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index
index d6c82d7..b57f01f 100644
---
a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index
+++
b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index
@@ -64,6 +64,8 @@ RollbackDefinition
RouteBuilderDefinition
RouteContextRefDefinition
RouteDefinition
+RouteTemplateDefinition
+RouteTemplatesDefinition
RoutesDefinition
RoutingSlipDefinition
SagaCompletionMode
diff --git
a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplate.json
b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplate.json
new file mode 100644
index 000..2a48fa2
--- /dev/null
+++
b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeTemplate.json
@@ -0,0 +1,31 @@
+{
+ "model": {
+"kind": "model",
+"name": "routeTemplate",
+"title": "Route Template",
+"description": "Defines a route template (parameterized routes)",
+"deprecated": false,
+"label": "configuration",
+"javaType": "org.apache.camel.model.RouteTemplateDefinition",
+"input": true,
+"output": true
+ },
+ "properties": {
+"properties": { "kind": "attribute", "displayName": "Properties",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Route properties.
Multiple keys can be separated by comma." },
+"group": { "kind": "attribute", "displayName": "Group", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "The group that this route belongs to; could be
the name of the RouteBuilder class or be explicitly configured in the XML. May
be null." },
+"streamCache": { "kind": "attribute", "displayName": "Stream Cache",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Whether stream caching is
enabled on this route." },
+"trace": { "kind": "attribute", "displayName": "Trace", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Whether tracing is enabled on this route." },
+"messageHistory": { "kind": "attribute", "displayName": "Message History",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "true", "description":
"Whether message history is enabled on this route." },
+"logMask": { "kind": "attribute", "displayName": "Log Mask", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "false", "description": "Whether security mask
for Logging is enabled on this route." },
+"delayer": { "kind": "attribute", "displayName": "Delayer", "required":
[GitHub] [camel] davsclaus opened a new pull request #3957: CAMEL-14963: Route Template. WIP
davsclaus opened a new pull request #3957: URL: https://github.com/apache/camel/pull/3957 Draft PR with work in progress. There is still a long way. See the RouteTemplateTest unit test as an example This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] orpiske commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
orpiske commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651654196 > Maybe we could remove the workaround +1. I logged an issue (#310) for this just in case we want to hold a bit on it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
oscerd commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651667756 The containerlifecycle error seems to be related to the cometd version used aganist Jetty9 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] mcrmfc opened a new pull request #3958: CAMEL-15230 - fixes bug in camel-opentracing (rabbitmq decorator) - don't rely on EXCHANGE_NAME header
mcrmfc opened a new pull request #3958: URL: https://github.com/apache/camel/pull/3958 The `EXCHANGE_NAME` header is not required and when it is missing this results in `null` operation names which in turn means collectors such as Jaeger will ignore the spans and ultimately you get broken traces with invalid parent spans reported. Fall through to base implementation which uses endpoint and has existing tests. [] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] orpiske commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
orpiske commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651693231 > The containerlifecycle error seems to be related to the cometd version used aganist Jetty9 Great catch, thanks! I am on it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] orpiske commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
orpiske commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651717087 That did the trick, but I'll squash it so we have a clean history. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/02: CAMEL-15230 - remove overriden method getDestination as exchange name header not required and absence results in null operation name
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 09e19e34e0c92fb5bb0e203f3205a463f496b397
Author: Matthew Robbins
AuthorDate: Tue Jun 30 09:46:37 2020 +0100
CAMEL-15230 - remove overriden method getDestination as exchange name
header not required and absence results in null operation name
---
.../camel/opentracing/decorators/RabbitmqSpanDecorator.java | 13 -
1 file changed, 13 deletions(-)
diff --git
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecorator.java
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecorator.java
index 1d47fb3..d741744 100644
---
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecorator.java
+++
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecorator.java
@@ -16,16 +16,8 @@
*/
package org.apache.camel.opentracing.decorators;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-
public class RabbitmqSpanDecorator extends AbstractMessagingSpanDecorator {
-/**
- * Constants copied from {@link
org.apache.camel.component.rabbitmq.RabbitMQConstants}
- */
-protected static final String EXCHANGE_NAME = "rabbitmq.EXCHANGE_NAME";
-
@Override
public String getComponent() {
return "rabbitmq";
@@ -36,9 +28,4 @@ public class RabbitmqSpanDecorator extends
AbstractMessagingSpanDecorator {
return "org.apache.camel.component.rabbitmq.RabbitMQComponent";
}
-@Override
-public String getDestination(Exchange exchange, Endpoint endpoint) {
-return (String)exchange.getIn().getHeader(EXCHANGE_NAME);
-}
-
}
[camel] branch master updated (8fcda73 -> 51a6140)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 8fcda73 Sync Properties new 09e19e3 CAMEL-15230 - remove overriden method getDestination as exchange name header not required and absence results in null operation name new 51a6140 CAMEL-15230 - remove redundant test The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../decorators/RabbitmqSpanDecorator.java | 13 --- .../decorators/RabbitmqSpanDecoratorTest.java | 41 -- 2 files changed, 54 deletions(-) delete mode 100644 components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecoratorTest.java
[camel] 02/02: CAMEL-15230 - remove redundant test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 51a6140e375e3d6b1e2aade2e840261171af7fed
Author: Matthew Robbins
AuthorDate: Tue Jun 30 11:15:19 2020 +0100
CAMEL-15230 - remove redundant test
---
.../decorators/RabbitmqSpanDecoratorTest.java | 41 --
1 file changed, 41 deletions(-)
diff --git
a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecoratorTest.java
b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecoratorTest.java
deleted file mode 100644
index c67c024..000
---
a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RabbitmqSpanDecoratorTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.camel.opentracing.decorators;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import static org.junit.Assert.assertEquals;
-
-public class RabbitmqSpanDecoratorTest {
-
-@Test
-public void testGetDestinationHeaderTopic() {
-Exchange exchange = Mockito.mock(Exchange.class);
-Message message = Mockito.mock(Message.class);
-
-Mockito.when(exchange.getIn()).thenReturn(message);
-
Mockito.when(message.getHeader(RabbitmqSpanDecorator.EXCHANGE_NAME)).thenReturn("test");
-
-RabbitmqSpanDecorator decorator = new RabbitmqSpanDecorator();
-
-assertEquals("test", decorator.getDestination(exchange, null));
-}
-
-}
[GitHub] [camel] oscerd merged pull request #3958: CAMEL-15230 - fixes bug in camel-opentracing (rabbitmq decorator) - don't rely on EXCHANGE_NAME header
oscerd merged pull request #3958: URL: https://github.com/apache/camel/pull/3958 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] akhileshacc opened a new issue #311: In S3 source connector, how to fetch only new files ?
akhileshacc opened a new issue #311:
URL: https://github.com/apache/camel-kafka-connector/issues/311
I am using S3 source connector tp fetch files from S3. It works fine and
gets back all records.
But on adding new files, it again gives all reacords.
Here is my configuration
```
{
"name": "s3-source",
"config": {
"name": "s3-source",
"connector.class":
"org.apache.camel.kafkaconnector.awss3.CamelAwss3SourceConnector",
"key.converter": "org.apache.kafka.connect.storage.StringConverter",
"value.converter":
"org.apache.camel.kafkaconnector.awss3.converters.S3ObjectConverter",
"topics": "mytopic",
"camel.source.path.bucketNameOrArn": "checkoutkafka",
"camel.component.aws-s3.accessKey": "accesskey",
"camel.component.aws-s3.secretKey": "secretkey",
"camel.component.aws-s3.region": "AP_SOUTH_1",
"camel.component.aws-s3.deleteAfterRead": false,
"camel.component.aws-s3.autocloseBody": false
}
}
```
How do i set this configuration ?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga opened a new pull request #1434: Add skip option to UpdateExtensionDocPageMojo to be able to workaroun…
ppalaga opened a new pull request #1434: URL: https://github.com/apache/camel-quarkus/pull/1434 …d https://github.com/quarkusio/quarkus/issues/10217 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-14963 updated (7406e84 -> fe18614)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from 7406e84 CAMEL-14963: Route Template. WIP add fe18614 CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../org/apache/camel/impl/DefaultCamelContext.java | 5 +++ .../java/org/apache/camel/impl/DefaultModel.java | 33 +++ .../camel/impl/lw/LightweightCamelContext.java | 5 +++ .../main/java/org/apache/camel/model/Model.java| 3 ++ .../camel/model/ProcessorDefinitionHelper.java | 30 ++ .../camel/model/RouteTemplateDefinition.java | 27 .../apache/camel/builder/RouteTemplateTest.java| 37 +- 7 files changed, 139 insertions(+), 1 deletion(-)
[GitHub] [camel-kafka-connector] oscerd commented on issue #311: In S3 source connector, how to fetch only new files ?
oscerd commented on issue #311: URL: https://github.com/apache/camel-kafka-connector/issues/311#issuecomment-651751593 You need to set the deleteAfterRead to true and the file will be deleted once consumed. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-14963 updated (fe18614 -> d0f960c)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-14963
in repository https://gitbox.apache.org/repos/asf/camel.git.
from fe18614 CAMEL-14963: Route Template. WIP
add d0f960c CAMEL-14963: Route Template. WIP
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/spi/PropertiesComponent.java | 11 +++
.../properties/DefaultPropertiesLookup.java| 11 ++-
.../component/properties/PropertiesComponent.java | 21
.../java/org/apache/camel/impl/DefaultModel.java | 15 +
.../camel/model/RouteTemplateDefinition.java | 4 +++
...java => RouteTemplateAndExistingRouteTest.java} | 38 --
.../apache/camel/builder/RouteTemplateTest.java| 6 ++--
7 files changed, 78 insertions(+), 28 deletions(-)
copy
core/camel-core/src/test/java/org/apache/camel/builder/{RouteTemplateTest.java
=> RouteTemplateAndExistingRouteTest.java} (65%)
[camel] 03/05: CAMEL-15191 - Docs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 21c6af683b038771988b54b9adc7fc946d93f0d7
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 14:18:39 2020 +0200
CAMEL-15191 - Docs
---
.../main/docs/aws2-kinesis-firehose-component.adoc | 32 ++
1 file changed, 32 insertions(+)
diff --git
a/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
b/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
index f423ce9..6c0212a 100644
---
a/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
+++
b/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
@@ -142,6 +142,38 @@ however, a
different
http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
can be specified when calling createClient(...).
+=== Kinesis Firehose Producer operations
+
+Camel-AWS s3 component provides the following operation on the producer side:
+
+- SendBatchRecord
+
+=== Send Batch Records Example
+
+You can send an iterable of Kinesis Record (as the following example shows) or
you can send directly a PutRecordBatchRequest POJO instance in the body.
+
+[source,java]
+
+@Test
+public void testFirehoseBatchRouting() throws Exception {
+Exchange exchange = template.send("direct:start",
ExchangePattern.InOnly, new Processor() {
+public void process(Exchange exchange) throws Exception {
+List recs = new ArrayList();
+Record rec =
Record.builder().data(SdkBytes.fromString("Test1",
Charset.defaultCharset())).build();
+Record rec1 =
Record.builder().data(SdkBytes.fromString("Test2",
Charset.defaultCharset())).build();
+recs.add(rec);
+recs.add(rec1);
+exchange.getIn().setBody(recs);
+}
+});
+assertNotNull(exchange.getIn().getBody());
+}
+
+from("direct:start").to("aws2-kinesis-firehose://cc?amazonKinesisFirehoseClient=#FirehoseClient&operation=sendBatchRecord");
+
+
+In the deliveryStream you'll find "Test1Test2".
+
=== Message headers set by the Kinesis producer on successful storage of a
Record
[width="100%",cols="10%,10%,80%",options="header",]
[camel] 05/05: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 268050b682ef90f395e0972041530ded094766cb
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 14:28:35 2020 +0200
Regen
---
.../catalog/components/aws2-kinesis-firehose.json | 2 ++
.../docs/aws2-kinesis-firehose-component.adoc | 38 --
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
index 3b0df6b..f4df3dd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
@@ -24,6 +24,7 @@
"amazonKinesisFirehoseClient": { "kind": "property", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis Firehose
client to use for all requests [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"deprecated": false, "secret": false, "description": "Component configuration"
},
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
+"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord" ], "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "The operation to do in
case the user don't [...]
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis Firehose client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the Kinesis Firehose client" },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the [...]
@@ -36,6 +37,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Name of the stream" },
"amazonKinesisFirehoseClient": { "kind": "parameter", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.
[camel] 04/05: CAMEL-15191 - Regen website docs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8b82c3c71ed979023416eac5414de2f3338fcb50
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 14:22:45 2020 +0200
CAMEL-15191 - Regen website docs
---
.../pages/aws2-kinesis-firehose-component.adoc | 38 --
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git
a/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
b/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
index d3d8ce6..e5cbeaf 100644
--- a/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
@@ -43,7 +43,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis Firehose component supports 10 options, which are listed
below.
+The AWS 2 Kinesis Firehose component supports 11 options, which are listed
below.
@@ -53,6 +53,7 @@ The AWS 2 Kinesis Firehose component supports 10 options,
which are listed below
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to
use for all requests for this endpoint | | FirehoseClient
| *configuration* (producer) | Component configuration | |
KinesisFirehose2Configuration
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
+| *operation* (producer) | The operation to do in case the user don't want to
send only a record. The value can be one of: sendBatchRecord | |
KinesisFirehose2Operations
| *proxyHost* (producer) | To define a proxy host when instantiating the
Kinesis Firehose client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the
Kinesis Firehose client | | Integer
| *proxyProtocol* (producer) | To define a proxy protocol when instantiating
the Kinesis Firehose client. The value can be one of: HTTP, HTTPS | HTTPS |
Protocol
@@ -88,7 +89,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (10 parameters):
+=== Query Parameters (11 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -96,6 +97,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to
use for all requests for this endpoint | | FirehoseClient
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
+| *operation* (producer) | The operation to do in case the user don't want to
send only a record. The value can be one of: sendBatchRecord | |
KinesisFirehose2Operations
| *proxyHost* (producer) | To define a proxy host when instantiating the
Kinesis Firehose client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the
Kinesis Firehose client | | Integer
| *proxyProtocol* (producer) | To define a proxy protocol when instantiating
the Kinesis Firehose client. The value can be one of: HTTP, HTTPS | HTTPS |
Protocol
@@ -142,6 +144,38 @@ however, a
different
http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
can be specified when calling createClient(...).
+=== Kinesis Firehose Producer operations
+
+Camel-AWS s3 component provides the following operation on the producer side:
+
+- SendBatchRecord
+
+=== Send Batch Records Example
+
+You can send an iterable of Kinesis Record (as the following example shows) or
you can send directly a PutRecordBatchRequest POJO instance in the body.
+
+[source,java]
+
+@Test
+public void testFirehoseBatchRouting() throws Exception {
+Exchange exchange = template.send("direct:start",
ExchangePattern.InOnly, new Processor() {
+public void process(Exchange exchange) throws Exception {
+List recs = new ArrayList();
+
[camel] 02/05: CAMEL-15191 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 40182ce0ea0bf0fef0a0fb12ab3e217f69ed6d71
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 14:12:11 2020 +0200
CAMEL-15191 - Fixed CS
---
...KinesisFirehose2ComponentVerifierExtension.java | 3 ++-
.../firehose/KinesisFirehose2Configuration.java| 14 +++---
.../aws2/firehose/KinesisFirehose2Endpoint.java| 3 ++-
.../aws2/firehose/KinesisFirehose2Producer.java| 22 +++---
.../KinesisFirehoseComponentIntegrationTest.java | 17 -
5 files changed, 30 insertions(+), 29 deletions(-)
diff --git
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentVerifierExtension.java
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentVerifierExtension.java
index 45d6f16..14e25f3 100644
---
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentVerifierExtension.java
+++
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentVerifierExtension.java
@@ -68,7 +68,8 @@ public class KinesisFirehose2ComponentVerifierExtension
extends DefaultComponent
try {
KinesisFirehose2Configuration configuration = setProperties(new
KinesisFirehose2Configuration(), parameters);
if
(!FirehoseClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion(
{
-ResultErrorBuilder errorBuilder =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER,
"The service is not supported in this region");
+ResultErrorBuilder errorBuilder =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER,
+
"The service is not supported in this region");
return builder.error(errorBuilder.build()).build();
}
AwsBasicCredentials cred =
AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
diff --git
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
index 03a5693..3c6b5d2 100644
---
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
+++
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
@@ -113,18 +113,18 @@ public class KinesisFirehose2Configuration implements
Cloneable {
}
public KinesisFirehose2Operations getOperation() {
- return operation;
- }
+return operation;
+}
+
+public void setOperation(KinesisFirehose2Operations operation) {
+this.operation = operation;
+}
- public void setOperation(KinesisFirehose2Operations operation) {
- this.operation = operation;
- }
-
// *
//
// *
- public KinesisFirehose2Configuration copy() {
+public KinesisFirehose2Configuration copy() {
try {
return (KinesisFirehose2Configuration)super.clone();
} catch (CloneNotSupportedException e) {
diff --git
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
index 6e427ce..d4c76ea 100644
---
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
+++
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
@@ -37,7 +37,8 @@ import
software.amazon.awssdk.services.firehose.FirehoseClientBuilder;
/**
* Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.
*/
-@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-kinesis-firehose", title =
"AWS 2 Kinesis Firehose", syntax = "aws2-kinesis-firehose:streamName",
producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
+@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-kinesis-firehose", title =
"AWS 2 Kinesis Firehose", syntax = "aws2-kinesis-firehose:streamName",
producerOnly = true, category = {Category.CLOUD,
+
[camel] 01/05: CAMEL-15191 - AWS2-Kinesis-Firehose: Support for RecordBatchRequest
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7a16cc4fad0fccd00264656f1192a41bdf9ebd9a
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 14:07:39 2020 +0200
CAMEL-15191 - AWS2-Kinesis-Firehose: Support for RecordBatchRequest
---
.../KinesisFirehose2ComponentConfigurer.java | 3 ++
.../KinesisFirehose2EndpointConfigurer.java| 3 ++
.../aws2/firehose/aws2-kinesis-firehose.json | 2 +
.../main/docs/aws2-kinesis-firehose-component.adoc | 6 ++-
.../firehose/KinesisFirehose2Configuration.java| 12 -
.../aws2/firehose/KinesisFirehose2Constants.java | 1 +
...stants.java => KinesisFirehose2Operations.java} | 4 +-
.../aws2/firehose/KinesisFirehose2Producer.java| 53 ++
.../KinesisFirehoseComponentIntegrationTest.java | 24 +-
...Aws2KinesisFirehoseComponentBuilderFactory.java | 15 ++
.../KinesisFirehose2EndpointBuilderFactory.java| 35 ++
11 files changed, 152 insertions(+), 6 deletions(-)
diff --git
a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
index 177dd52..97ea445 100644
---
a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
+++
b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
@@ -35,6 +35,7 @@ public class KinesisFirehose2ComponentConfigurer extends
PropertyConfigurerSuppo
case "configuration": target.setConfiguration(property(camelContext,
org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class,
value)); return true;
case "lazystartproducer":
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
+case "operation":
getOrCreateConfiguration(target).setOperation(property(camelContext,
org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class,
value)); return true;
case "proxyhost":
case "proxyHost":
getOrCreateConfiguration(target).setProxyHost(property(camelContext,
java.lang.String.class, value)); return true;
case "proxyport":
@@ -56,6 +57,7 @@ public class KinesisFirehose2ComponentConfigurer extends
PropertyConfigurerSuppo
answer.put("basicPropertyBinding", boolean.class);
answer.put("configuration",
org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class);
answer.put("lazyStartProducer", boolean.class);
+answer.put("operation",
org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class);
answer.put("proxyHost", java.lang.String.class);
answer.put("proxyPort", java.lang.Integer.class);
answer.put("proxyProtocol",
software.amazon.awssdk.core.Protocol.class);
@@ -77,6 +79,7 @@ public class KinesisFirehose2ComponentConfigurer extends
PropertyConfigurerSuppo
case "configuration": return target.getConfiguration();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
+case "operation": return
getOrCreateConfiguration(target).getOperation();
case "proxyhost":
case "proxyHost": return
getOrCreateConfiguration(target).getProxyHost();
case "proxyport":
diff --git
a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
index 36ac274..8359a42 100644
---
a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
+++
b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
@@ -27,6 +27,7 @@ public class KinesisFirehose2EndpointConfigurer extends
PropertyConfigurerSuppor
case "basicPropertyBinding":
target.setBasicPropertyBinding(property(camelContext, boolean.class, value));
return true;
case "lazystartproducer":
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
+case "operation":
target.getConfiguration().setOperation(property(camelContext,
org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class,
value)); return true;
case "proxyhost":
case "proxyHost":
target.getConfiguration().setProxyHost(property(camelContext,
java.lang.String.class, value));
[camel] branch master updated (51a6140 -> 268050b)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 51a6140 CAMEL-15230 - remove redundant test
new 7a16cc4 CAMEL-15191 - AWS2-Kinesis-Firehose: Support for
RecordBatchRequest
new 40182ce CAMEL-15191 - Fixed CS
new 21c6af6 CAMEL-15191 - Docs
new 8b82c3c CAMEL-15191 - Regen website docs
new 268050b Regen
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../catalog/components/aws2-kinesis-firehose.json | 2 +
.../docs/aws2-kinesis-firehose-component.adoc | 38 +++-
.../KinesisFirehose2ComponentConfigurer.java | 3 ++
.../KinesisFirehose2EndpointConfigurer.java| 3 ++
.../aws2/firehose/aws2-kinesis-firehose.json | 2 +
.../main/docs/aws2-kinesis-firehose-component.adoc | 38 +++-
...KinesisFirehose2ComponentVerifierExtension.java | 3 +-
.../firehose/KinesisFirehose2Configuration.java| 10
.../aws2/firehose/KinesisFirehose2Constants.java | 1 +
.../aws2/firehose/KinesisFirehose2Endpoint.java| 3 +-
...stants.java => KinesisFirehose2Operations.java} | 4 +-
.../aws2/firehose/KinesisFirehose2Producer.java| 53 ++
.../KinesisFirehoseComponentIntegrationTest.java | 23 +-
...Aws2KinesisFirehoseComponentBuilderFactory.java | 15 ++
.../KinesisFirehose2EndpointBuilderFactory.java| 35 ++
.../pages/aws2-kinesis-firehose-component.adoc | 38 +++-
16 files changed, 260 insertions(+), 11 deletions(-)
copy
components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/{KinesisFirehose2Constants.java
=> KinesisFirehose2Operations.java} (89%)
svn commit: r40233 - /release/camel/camel-k/
Author: nferraro Date: Tue Jun 30 12:32:12 2020 New Revision: 40233 Log: Camel K 1.0.1 Added: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz (with props) release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.asc (with props) release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz (with props) release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.asc (with props) release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz (with props) release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.asc (with props) release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512 release/camel/camel-k/camel-k-examples-1.0.1.tar.gz (with props) release/camel/camel-k/camel-k-examples-1.0.1.tar.gz.asc (with props) release/camel/camel-k/camel-k-examples-1.0.1.tar.gz.sha512 release/camel/camel-k/camel-k-sources-1.0.1.tar.gz (with props) release/camel/camel-k/camel-k-sources-1.0.1.tar.gz.asc (with props) release/camel/camel-k/camel-k-sources-1.0.1.tar.gz.sha512 Added: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 == --- release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 Tue Jun 30 12:32:12 2020 @@ -0,0 +1 @@ +07e003a61fe443bf94ed4bc0d1f6f8a2ec90012469c0318e849a4f01d7ca5e6b6aa28c351066645a262212e72f0b8e9c0ddc57febd78225302faab3c658e2756 *camel-k-client-1.0.1-linux-64bit.tar.gz Added: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 == --- release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 Tue Jun 30 12:32:12 2020 @@ -0,0 +1 @@ +1fdd4cd9ef34be43ccbc31939ecbe536476b92eb2c38855e94ac75dd7ac71ba3ef6d200d8b8649ccffcddaa8529b733402dbc6f98a555f7ae48b9b493add0099 *camel-k-client-1.0.1-mac-64bit.tar.gz Added: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512 == --- release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512 Tue Jun 30 12:32:12 2020 @@ -0,0 +1 @@ +6b73adde96f7297c0eee887e325853d2b9b7da33cc12680d3f238543d5ae221625dcc140e11732398d0a
svn commit: r40234 - /release/camel/camel-k/1.0.1/
Author: nferraro Date: Tue Jun 30 12:33:04 2020 New Revision: 40234 Log: Camel K 1.0.1 Added: release/camel/camel-k/1.0.1/
svn commit: r40235 - /release/camel/camel-k/camel-k-sources-1.0.1.tar.gz.sha512
Author: nferraro Date: Tue Jun 30 12:33:56 2020 New Revision: 40235 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-sources-1.0.1.tar.gz.sha512
svn commit: r40240 - /release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.asc
Author: nferraro Date: Tue Jun 30 12:34:37 2020 New Revision: 40240 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.asc
svn commit: r40241 - /release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512
Author: nferraro Date: Tue Jun 30 12:34:45 2020 New Revision: 40241 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512
[GitHub] [camel-kafka-connector] oscerd merged pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
oscerd merged pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
svn commit: r40236 - /release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz
Author: nferraro Date: Tue Jun 30 12:34:06 2020 New Revision: 40236 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz
svn commit: r40242 - /release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz
Author: nferraro Date: Tue Jun 30 12:34:51 2020 New Revision: 40242 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz
[camel-kafka-connector] branch master updated: Fix HDFS tests with Camel 3.4 (related to issue #263) (#309)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 6acdab1 Fix HDFS tests with Camel 3.4 (related to issue #263) (#309)
6acdab1 is described below
commit 6acdab10724bb5c691dd3aeceb4d5b24c0a40816
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 30 14:33:51 2020 +0200
Fix HDFS tests with Camel 3.4 (related to issue #263) (#309)
---
tests/itests-hdfs/pom.xml | 11 +++
.../camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java | 2 --
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/itests-hdfs/pom.xml b/tests/itests-hdfs/pom.xml
index c7de9fd..53c02f9 100644
--- a/tests/itests-hdfs/pom.xml
+++ b/tests/itests-hdfs/pom.xml
@@ -54,6 +54,17 @@
+
+
+org.eclipse.jetty
+jetty-util
+${jetty9-version}
+test
+
+
diff --git
a/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
b/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
index 8c3ce6b..e5a84b0 100644
---
a/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
+++
b/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -44,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-@Disabled("Disabled due to issue #263")
@Testcontainers
public class CamelSinkHDFSITCase extends AbstractKafkaTest {
@RegisterExtension
svn commit: r40239 - /release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz
Author: nferraro Date: Tue Jun 30 12:34:31 2020 New Revision: 40239 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-mac-64bit.tar.gz
svn commit: r40237 - /release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.asc
Author: nferraro Date: Tue Jun 30 12:34:16 2020 New Revision: 40237 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.asc
svn commit: r40238 - /release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512
Author: nferraro Date: Tue Jun 30 12:34:24 2020 New Revision: 40238 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512
[GitHub] [camel-kafka-connector] oscerd commented on pull request #309: Fix HDFS tests with Camel 3.4 (related to issue #263)
oscerd commented on pull request #309: URL: https://github.com/apache/camel-kafka-connector/pull/309#issuecomment-651762217 Squashed and merged. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
svn commit: r40247 - /release/camel/camel-k/camel-k-examples-1.0.1.tar.gz.asc
Author: nferraro Date: Tue Jun 30 12:35:24 2020 New Revision: 40247 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-examples-1.0.1.tar.gz.asc
svn commit: r40244 - /release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512
Author: nferraro Date: Tue Jun 30 12:35:05 2020 New Revision: 40244 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512
[GitHub] [camel-kafka-connector] oscerd commented on issue #311: In S3 source connector, how to fetch only new files ?
oscerd commented on issue #311: URL: https://github.com/apache/camel-kafka-connector/issues/311#issuecomment-651762657 Explained. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd commented on issue #310: CAMEL-15063 work-around may be removed
oscerd commented on issue #310: URL: https://github.com/apache/camel-kafka-connector/issues/310#issuecomment-651762889 @orpiske can you open a PR for this? Thanks. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
svn commit: r40245 - /release/camel/camel-k/camel-k-examples-1.0.1.tar.gz
Author: nferraro Date: Tue Jun 30 12:35:12 2020 New Revision: 40245 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-examples-1.0.1.tar.gz
svn commit: r40243 - /release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.asc
Author: nferraro Date: Tue Jun 30 12:34:58 2020 New Revision: 40243 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-client-1.0.1-windows-64bit.tar.gz.asc
svn commit: r40248 - /release/camel/camel-k/camel-k-sources-1.0.1.tar.gz
Author: nferraro Date: Tue Jun 30 12:35:31 2020 New Revision: 40248 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-sources-1.0.1.tar.gz
svn commit: r40249 - /release/camel/camel-k/camel-k-sources-1.0.1.tar.gz.asc
Author: nferraro Date: Tue Jun 30 12:35:38 2020 New Revision: 40249 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-sources-1.0.1.tar.gz.asc
[GitHub] [camel-kafka-connector] oscerd closed issue #311: In S3 source connector, how to fetch only new files ?
oscerd closed issue #311: URL: https://github.com/apache/camel-kafka-connector/issues/311 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
svn commit: r40246 - /release/camel/camel-k/camel-k-examples-1.0.1.tar.gz.sha512
Author: nferraro Date: Tue Jun 30 12:35:18 2020 New Revision: 40246 Log: Camel K 1.0.1 Removed: release/camel/camel-k/camel-k-examples-1.0.1.tar.gz.sha512
svn commit: r40250 - /release/camel/camel-k/1.0.1/
Author: nferraro Date: Tue Jun 30 12:36:26 2020 New Revision: 40250 Log: Camel K 1.0.1 Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz (with props) release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.asc (with props) release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz (with props) release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.asc (with props) release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz (with props) release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz.asc (with props) release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512 release/camel/camel-k/1.0.1/camel-k-examples-1.0.1.tar.gz (with props) release/camel/camel-k/1.0.1/camel-k-examples-1.0.1.tar.gz.asc (with props) release/camel/camel-k/1.0.1/camel-k-examples-1.0.1.tar.gz.sha512 release/camel/camel-k/1.0.1/camel-k-sources-1.0.1.tar.gz (with props) release/camel/camel-k/1.0.1/camel-k-sources-1.0.1.tar.gz.asc (with props) release/camel/camel-k/1.0.1/camel-k-sources-1.0.1.tar.gz.sha512 Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/1.0.1/camel-k-client-1.0.1-linux-64bit.tar.gz.sha512 Tue Jun 30 12:36:26 2020 @@ -0,0 +1 @@ +07e003a61fe443bf94ed4bc0d1f6f8a2ec90012469c0318e849a4f01d7ca5e6b6aa28c351066645a262212e72f0b8e9c0ddc57febd78225302faab3c658e2756 *camel-k-client-1.0.1-linux-64bit.tar.gz Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/1.0.1/camel-k-client-1.0.1-mac-64bit.tar.gz.sha512 Tue Jun 30 12:36:26 2020 @@ -0,0 +1 @@ +1fdd4cd9ef34be43ccbc31939ecbe536476b92eb2c38855e94ac75dd7ac71ba3ef6d200d8b8649ccffcddaa8529b733402dbc6f98a555f7ae48b9b493add0099 *camel-k-client-1.0.1-mac-64bit.tar.gz Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.0.1/camel-k-client-1.0.1-windows-64bit.ta
[camel-spring-boot] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 84cf654 Regen
84cf654 is described below
commit 84cf654102ef240a0560aa99fa815b02022055f4
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 14:36:15 2020 +0200
Regen
---
.../catalog/components/aws2-kinesis-firehose.json | 4 +++-
.../springboot/catalog/components/aws2-kinesis.json| 2 +-
.../apache/camel/springboot/catalog/others.properties | 18 ++
components-starter/README.adoc | 6 +++---
.../src/main/docs/aws2-kinesis-starter.adoc| 3 ++-
.../KinesisFirehose2ComponentConfiguration.java| 15 ++-
.../springboot/Kinesis2ComponentConfiguration.java | 4 ++--
components-starter/camel-corda-starter/pom.xml | 12
components-starter/camel-iota-starter/pom.xml | 12
docs/modules/ROOT/pages/aws2-kinesis-starter.adoc | 3 ++-
docs/modules/ROOT/pages/list.adoc | 6 +++---
11 files changed, 72 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
index 89c0db7..f734c54 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-kinesis-firehose",
"title": "AWS 2 Kinesis Firehose",
-"description": "Consume data from AWS Kinesis Firehose streams using AWS
SDK version 2.x.",
+"description": "Produce data to AWS Kinesis Firehose streams using AWS SDK
version 2.x.",
"deprecated": false,
"firstVersion": "3.2.0",
"label": "cloud,messaging",
@@ -24,6 +24,7 @@
"amazonKinesisFirehoseClient": { "kind": "property", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis Firehose
client to use for all requests [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"deprecated": false, "secret": false, "description": "Component configuration"
},
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
+"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord" ], "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "The operation to do in
case the user don't [...]
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis Firehose client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the Kinesis Firehose c
[camel] branch CAMEL-14963 updated (d0f960c -> 7d04b77)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from d0f960c CAMEL-14963: Route Template. WIP add 7d04b77 CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/CamelContext.java | 10 ++ .../java/org/apache/camel/impl/DefaultCamelContext.java | 5 ++--- .../main/java/org/apache/camel/impl/DefaultModel.java| 11 +++ .../apache/camel/impl/lw/LightweightCamelContext.java| 5 ++--- .../src/main/java/org/apache/camel/model/Model.java | 15 ++- .../camel/builder/RouteTemplateAndExistingRouteTest.java | 16 .../java/org/apache/camel/builder/RouteTemplateTest.java | 14 +++--- 7 files changed, 42 insertions(+), 34 deletions(-)
[camel] branch CAMEL-14963 updated (7d04b77 -> 3050adb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from 7d04b77 CAMEL-14963: Route Template. WIP add 3050adb CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/model/Model.java| 50 +- 1 file changed, 20 insertions(+), 30 deletions(-)
[GitHub] [camel-kafka-connector] orpiske commented on issue #310: CAMEL-15063 work-around may be removed
orpiske commented on issue #310: URL: https://github.com/apache/camel-kafka-connector/issues/310#issuecomment-651778466 @oscerd absolutely. I can take care of this. I'll send a PR tomorrow/after tomorrow after I finish the remaining HDFS checks :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch master updated: chore(release): publish helm chart for version 1.0.1
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new e2b550b chore(release): publish helm chart for version 1.0.1 e2b550b is described below commit e2b550b373993bad6929568848669ca557391319 Author: Nicola Ferraro AuthorDate: Tue Jun 30 15:12:47 2020 +0200 chore(release): publish helm chart for version 1.0.1 --- docs/charts/camel-k-0.3.1.tgz | Bin 0 -> 5183 bytes docs/charts/index.yaml| 35 ++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/docs/charts/camel-k-0.3.1.tgz b/docs/charts/camel-k-0.3.1.tgz new file mode 100644 index 000..d766d19 Binary files /dev/null and b/docs/charts/camel-k-0.3.1.tgz differ diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index 1182d05..86b2fda 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -2,8 +2,33 @@ apiVersion: v1 entries: camel-k: - apiVersion: v2 +appVersion: 1.0.1 +created: "2020-06-30T15:11:05.262183809+02:00" +description: A lightweight integration platform, born on Kubernetes, with serverless + superpowers +digest: d7453b9b6281355caad37896c6760be64735f69009bc312a54cbc17e8a1f6697 +home: https://camel.apache.org/camel-k/latest/ +icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png +keywords: +- serverless +- integration +- patterns +maintainers: +- email: nferr...@apache.org + name: nferraro +name: camel-k +sources: +- https://github.com/apache/camel-k +- https://github.com/apache/camel-k-runtime +- https://github.com/apache/camel-quarkus +- https://github.com/apache/camel +type: application +urls: +- https://apache.github.io/camel-k/charts/camel-k-0.3.1.tgz +version: 0.3.1 + - apiVersion: v2 appVersion: 1.0.0 -created: "2020-06-09T15:37:03.568735987+02:00" +created: "2020-06-30T15:11:05.261498828+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless superpowers digest: 610a2b024d539451ee278b72179f34c242a67b7949e2a4eae7b0fa2d8d3630e3 @@ -28,7 +53,7 @@ entries: version: 0.3.0 - apiVersion: v2 appVersion: 1.0.0-RC2 -created: "2020-06-09T15:37:03.568151315+02:00" +created: "2020-06-30T15:11:05.260853389+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless superpowers digest: 3d5397e111004a8735849dcebd55c9827e687aa3ab28b5c28de8fe69595e1b8f @@ -53,7 +78,7 @@ entries: version: 0.2.1 - apiVersion: v2 appVersion: 1.0.0-RC2 -created: "2020-06-09T15:37:03.546580246+02:00" +created: "2020-06-30T15:11:05.259950726+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless superpowers digest: 43fa5d9563ce76d25695e4132c5870279541b26be2ac8023537b587483853260 @@ -78,7 +103,7 @@ entries: version: 0.1.1 - apiVersion: v2 appVersion: 1.0.0-RC2 -created: "2020-06-09T15:37:03.544412453+02:00" +created: "2020-06-30T15:11:05.25844127+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless superpowers digest: 3bc8c53c4d781c4b4e4aac254d291339b348c2d8b4cf24b579ceb4330a48edd5 @@ -101,4 +126,4 @@ entries: urls: - https://apache.github.io/camel-k/charts/camel-k-0.1.0.tgz version: 0.1.0 -generated: "2020-06-09T15:37:03.54349627+02:00" +generated: "2020-06-30T15:11:05.257592115+02:00"
[GitHub] [camel-quarkus] ppalaga commented on pull request #1434: Add skip option to UpdateExtensionDocPageMojo to be able to workaroun…
ppalaga commented on pull request #1434: URL: https://github.com/apache/camel-quarkus/pull/1434#issuecomment-651788473 Has nothing to do with native tests - no need to wait for them to finish. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga merged pull request #1434: Add skip option to UpdateExtensionDocPageMojo to be able to workaroun…
ppalaga merged pull request #1434: URL: https://github.com/apache/camel-quarkus/pull/1434 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch master updated: Add skip option to UpdateExtensionDocPageMojo to be able to workaround https://github.com/quarkusio/quarkus/issues/10217
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 085984d Add skip option to UpdateExtensionDocPageMojo to be able to
workaround https://github.com/quarkusio/quarkus/issues/10217
085984d is described below
commit 085984d0a496cf9722a9c3b5b7ae06b2e2849663
Author: Peter Palaga
AuthorDate: Tue Jun 30 14:05:46 2020 +0200
Add skip option to UpdateExtensionDocPageMojo to be able to workaround
https://github.com/quarkusio/quarkus/issues/10217
---
.../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java| 8
1 file changed, 8 insertions(+)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index a37a62d..2af379f 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -49,6 +49,7 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
@Mojo(name = "update-extension-doc-page", threadSafe = true)
public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
@@ -57,8 +58,15 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
private static List list2;
private static final Map nativeSslActivators = new
ConcurrentHashMap<>();
+@Parameter(defaultValue = "false", property =
"camel-quarkus.update-extension-doc-page.skip")
+boolean skip = false;
+
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
+if (skip) {
+getLog().info("Skipping per user request");
+return;
+}
final Charset charset = Charset.forName(encoding);
final Path basePath = baseDir.toPath();
[GitHub] [camel] gnodet opened a new pull request #3959: Camel 11807
gnodet opened a new pull request #3959: URL: https://github.com/apache/camel/pull/3959 More junit5 migration This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-14963 updated (3050adb -> e44489c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from 3050adb CAMEL-14963: Route Template. WIP add e44489c CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/CamelContext.java | 2 ++ .../camel/impl/engine/AbstractCamelContext.java| 5 +-- .../camel/impl/engine/SimpleCamelContext.java | 6 .../org/apache/camel/model/routeTemplate.json | 2 +- .../impl/lw/LightweightRuntimeCamelContext.java| 5 +++ .../camel/model/RouteTemplateDefinition.java | 37 +++--- .../camel/model/RouteTemplatesDefinition.java | 4 +-- .../builder/RouteTemplateAndExistingRouteTest.java | 4 +-- .../apache/camel/builder/RouteTemplateTest.java| 4 +-- .../java/org/apache/camel/xml/in/ModelParser.java | 4 +-- 10 files changed, 49 insertions(+), 24 deletions(-)
[GitHub] [camel-k] doru1004 commented on issue #1579: Running YAML code
doru1004 commented on issue #1579:
URL: https://github.com/apache/camel-k/issues/1579#issuecomment-651809029
What I am trying to do is have a working application using Camel K. I have
managed to do a Java only application. What I would now want to do is rewrite
the Camel integration in Yaml.
Some initial features that I want to exercise are:
1. sending HTTP requests to some third-party service and getting a response
2. have a custom processor to process that response
I would like to do this from YAML to see how that can be done using YAML
instead of Camel Java code.
In this particular issue I am trying to handle point 2.
It seems that the problematic part is being able to include processor part.
This is my call right now after you telling me that the --property is not
required:
```
kamel run --name=test routes.yaml RegistryConfigurer.java --dev
```
routes contains this:
```
- from:
uri: "timer:clock"
parameters:
period: "1000"
steps:
- set-body:
constant: "foo"
- process:
ref: "myProcessor"
- to: log:info
```
Registry configurer file contains this:
```
...
class MyProcessor implements Processor {
void public process(...) {
...
}
}
public class RegistryConfigurer {
@BindToRegistry
public MyProcessor myProcessor() {
return new MyProcessor();
}
}
```
After eliminating the `--property` flag from the kamel run CLI, I get the
following error. Can this error be fixed if I publish my class in a maven repo?
```
[1] 2020-06-30 13:39:36.150 INFO [main] ApplicationRuntime - Listener
org.apache.camel.k.listener.RoutesConfigurer@51972dc7 executed in phase
ConfigureRoutes
[1] Exception in thread "main" java.lang.IllegalStateException:
com.fasterxml.jackson.databind.JsonMappingException: Step should not have more
tha one child (through reference chain:
org.apache.camel.k.loader.yaml.parser.FromStepParser$FromStepDefinition["steps"]->java.util.ArrayList[0])
[1] at
org.apache.camel.k.loader.yaml.spi.StepParser$Context.node(StepParser.java:83)
[1] at
org.apache.camel.k.loader.yaml.parser.FromStepParser.toStartProcessor(FromStepParser.java:38)
[1] at
org.apache.camel.k.loader.yaml.spi.StartStepParser.invoke(StartStepParser.java:29)
[1] at
org.apache.camel.k.loader.yaml.YamlSourceLoader$1.configure(YamlSourceLoader.java:93)
[1] at
org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:473)
[1] at
org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:421)
[1] at
org.apache.camel.builder.RouteBuilder.addRoutesToCamelContext(RouteBuilder.java:401)
[1] at
org.apache.camel.impl.engine.AbstractCamelContext.addRoutes(AbstractCamelContext.java:1190)
[1] at
org.apache.camel.main.RoutesConfigurer.configureRoutes(RoutesConfigurer.java:92)
[1] at
org.apache.camel.main.BaseMainSupport.configureRoutes(BaseMainSupport.java:552)
[1] at
org.apache.camel.main.BaseMainSupport.postProcessCamelContext(BaseMainSupport.java:572)
[1] at
org.apache.camel.main.BaseMainSupport.initCamelContext(BaseMainSupport.java:379)
[1] at
org.apache.camel.k.main.ApplicationRuntime$MainAdapter.doInit(ApplicationRuntime.java:197)
[1] at
org.apache.camel.support.service.BaseService.init(BaseService.java:83)
[1] at org.apache.camel.main.MainSupport.run(MainSupport.java:79)
[1] at
org.apache.camel.k.main.ApplicationRuntime.run(ApplicationRuntime.java:70)
[1] at org.apache.camel.k.main.Application.main(Application.java:42)
[1] Caused by: com.fasterxml.jackson.databind.JsonMappingException: Step
should not have more tha one child (through reference chain:
org.apache.camel.k.loader.yaml.parser.FromStepParser$FromStepDefinition["steps"]->java.util.ArrayList[0])
[1] at
com.fasterxml.jackson.databind.JsonMappingException.wrapWithPath(JsonMappingException.java:397)
[1] at
com.fasterxml.jackson.databind.JsonMappingException.wrapWithPath(JsonMappingException.java:368)
[1] at
com.fasterxml.jackson.databind.deser.std.CollectionDeserializer.deserialize(CollectionDeserializer.java:302)
[1] at
com.fasterxml.jackson.databind.deser.std.CollectionDeserializer.deserialize(CollectionDeserializer.java:245)
[1] at
com.fasterxml.jackson.databind.deser.std.CollectionDeserializer.deserialize(CollectionDeserializer.java:27)
[1] at
com.fasterxml.jackson.databind.deser.impl.FieldProperty.deserializeAndSet(FieldProperty.java:138)
[1] at
com.fasterxml.jackson.databind.deser.BeanDeserializer.vanillaDeserialize(BeanDeserializer.java:288)
[1] at
com.fasterxml.jackson.databind.deser.BeanDeserializer.deserialize(BeanDeserializer.java:151)
[1] at
com.fasterxml.jackson.databind.ObjectReader._bindAndClose(ObjectReader.java:1719)
[1] at
com.fasterxml.jackson.d
[GitHub] [camel-k] lburgazzoli commented on issue #1579: Running YAML code
lburgazzoli commented on issue #1579: URL: https://github.com/apache/camel-k/issues/1579#issuecomment-651813582 That error is probably about a wrong YAML indentation, as per the YAML guide, each step is represented by YAML map that has a single entry where the field name is the EIP name. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] gnodet merged pull request #3959: Camel 11807
gnodet merged pull request #3959: URL: https://github.com/apache/camel/pull/3959 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 20/23: [CAMEL-11807] Upgrade camel-jooq to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d52350da7a4de2db1adbafbc8e11c4d94eb58ba2
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 10:47:02 2020 +0200
[CAMEL-11807] Upgrade camel-jooq to junit5
---
components/camel-jooq/pom.xml | 11 ---
.../org/apache/camel/component/jooq/BaseJooqTest.java | 11 +--
.../apache/camel/component/jooq/JooqComponentTest.java | 10 +++---
.../apache/camel/component/jooq/JooqConsumerTest.java | 17 +
.../apache/camel/component/jooq/JooqPlainSQLTest.java | 14 --
.../apache/camel/component/jooq/JooqProducerTest.java | 14 +++---
.../org/apache/camel/component/jooq/JooqXMLTest.java| 7 ---
7 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index c0c54c0..390a822 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -67,12 +67,17 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
-junit
-junit
+org.apache.camel
+camel-test-spring-junit5
+test
+
+
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
index bb568dc..fe73d69 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/BaseJooqTest.java
@@ -19,17 +19,16 @@ package org.apache.camel.component.jooq;
import java.nio.file.Files;
import java.sql.Connection;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.jooq.DSLContext;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration(locations = {"/jooq-spring.xml"})
public abstract class BaseJooqTest extends CamelTestSupport {
@@ -39,7 +38,7 @@ public abstract class BaseJooqTest extends CamelTestSupport {
@Value("classpath:db-hsql.sql")
Resource ddlScriptFile;
-@Before
+@BeforeEach
public void init() throws Exception {
String sql = new
String(Files.readAllBytes(ddlScriptFile.getFile().toPath()));
Connection conn =
create.configuration().connectionProvider().acquire();
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
index d2e7269..ba137f4 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.jooq;
import org.apache.camel.PropertyBindingException;
import org.apache.camel.component.jooq.db.tables.records.BookStoreRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class JooqComponentTest extends BaseJooqTest {
@@ -39,9 +42,10 @@ public class JooqComponentTest extends BaseJooqTest {
assertEquals(BookStoreRecord.class,
ep3.getConfiguration().getEntityType());
}
-@Test(expected = PropertyBindingException.class)
+@Test
public void testNonDefaultConfig() throws Exception {
JooqComponent component = (JooqComponent)
context().getComponent("jooq");
-
component.createEndpoint("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=unexpectedOperation");
+assertThrows(PropertyBindingException.class,
+() ->
component.createEndpoint("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=unexpectedOperation"));
}
}
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java
[camel] 07/23: [CAMEL-11807] Upgrade camel-iota to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4b3bf4fbfccddc582994f5a6d07c620d8382e2b4
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:06:17 2020 +0200
[CAMEL-11807] Upgrade camel-iota to junit5
---
components/camel-iota/pom.xml | 6 +++---
.../apache/camel/component/iota/IOTAProducerTest.java | 18 +++---
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/components/camel-iota/pom.xml b/components/camel-iota/pom.xml
index 9a8dba8..dae98ab 100644
--- a/components/camel-iota/pom.xml
+++ b/components/camel-iota/pom.xml
@@ -57,7 +57,7 @@
org.apache.camel
-camel-test-spring
+camel-test-spring-junit5
test
@@ -66,8 +66,8 @@
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java
b/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java
index 39196b3..5860e02 100644
---
a/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java
+++
b/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java
@@ -18,10 +18,12 @@ package org.apache.camel.component.iota;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.iota.jota.error.InternalException;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IOTAProducerTest extends CamelTestSupport {
@@ -30,7 +32,9 @@ public class IOTAProducerTest extends CamelTestSupport {
private static final String IOTA_NODE_URL =
"https://nodes.thetangle.org:443";;
-@Ignore
+private static final Logger LOG =
LoggerFactory.getLogger(IOTAProducerTest.class);
+
+@Disabled
@Test
public void sendTransferTest() throws Exception {
final String message = "ILOVEAPACHECAMEL";
@@ -46,7 +50,7 @@ public class IOTAProducerTest extends CamelTestSupport {
if (!flaky) {
throw e;
} else {
-log.warn("Flaky test as IOTA is not online and returning a
response in time");
+LOG.warn("Flaky test as IOTA is not online and returning a
response in time");
return;
}
}
@@ -68,7 +72,7 @@ public class IOTAProducerTest extends CamelTestSupport {
if (!flaky) {
throw e;
} else {
-log.warn("Flaky test as IOTA is not online and returning a
response in time");
+LOG.warn("Flaky test as IOTA is not online and returning a
response in time");
return;
}
}
@@ -90,7 +94,7 @@ public class IOTAProducerTest extends CamelTestSupport {
if (!flaky) {
throw e;
} else {
-log.warn("Flaky test as IOTA is not online and returning a
response in time");
+LOG.warn("Flaky test as IOTA is not online and returning a
response in time");
return;
}
}
[camel] 16/23: [CAMEL-11807] Upgrade camel-jgroups-raft to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 92ab77fb712c34fac4f1f6ed7c145f5e231fb9a7
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 10:01:51 2020 +0200
[CAMEL-11807] Upgrade camel-jgroups-raft to junit5
---
components/camel-jgroups-raft/pom.xml| 6 +++---
.../camel/component/jgroups/raft/JGroupsRaftAbstractTest.java| 4 +++-
.../jgroups/raft/JGroupsRaftComponentConfiguredTest.java | 7 +--
.../component/jgroups/raft/JGroupsRaftComponentDefaultTest.java | 9 +++--
.../camel/component/jgroups/raft/JGroupsRaftConsumerTest.java| 2 +-
.../camel/component/jgroups/raft/JGroupsRaftEndpointTest.java| 7 +--
.../camel/component/jgroups/raft/JGroupsRaftProducerTest.java| 4 +++-
.../raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java| 4 ++--
.../component/jgroups/raft/cluster/JGroupsRaftMasterTest.java| 4 ++--
9 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/components/camel-jgroups-raft/pom.xml
b/components/camel-jgroups-raft/pom.xml
index 0f26856..ec341e5 100644
--- a/components/camel-jgroups-raft/pom.xml
+++ b/components/camel-jgroups-raft/pom.xml
@@ -52,13 +52,13 @@
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
org.apache.camel
-camel-test
+camel-test-junit5
test
diff --git
a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java
b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java
index 042e2cc..6f0af5f 100644
---
a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java
+++
b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.jgroups.raft;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jgroups.Address;
import org.jgroups.raft.RaftHandle;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public abstract class JGroupsRaftAbstractTest extends CamelTestSupport {
protected void checkHeaders(Exchange exchange) {
assertNotNull(exchange.getIn().getHeader(JGroupsRaftConstants.HEADER_JGROUPSRAFT_COMMIT_INDEX,
int.class));
diff --git
a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java
b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java
index d1db8fb..769f036 100644
---
a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java
+++
b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java
@@ -18,10 +18,13 @@ package org.apache.camel.component.jgroups.raft;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jgroups.raft.utils.NopStateMachine;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jgroups.JChannel;
import org.jgroups.raft.RaftHandle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JGroupsRaftComponentConfiguredTest extends CamelTestSupport {
diff --git
a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
index 0a4a577..c11d165 100644
---
a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
+++
b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
@@ -18,8 +18,13 @@ package org.apache.camel.component.jgroups.raft;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jgroups.raft.utils.NopStateMachine;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.a
[camel] 15/23: [CAMEL-11807] Upgrade camel-jcache to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0cc3c949eaa83d781c8498c22ce483bd8077224c
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:57:57 2020 +0200
[CAMEL-11807] Upgrade camel-jcache to junit5
---
components/camel-jcache/pom.xml| 8 +++
.../jcache/JCacheComponentTestSupport.java | 2 +-
.../component/jcache/JCacheConfigurationTest.java | 4 +++-
.../camel/component/jcache/JCacheConsumerTest.java | 2 +-
.../camel/component/jcache/JCacheManagerTest.java | 12 +-
.../component/jcache/JCacheProducerClearTest.java | 4 +++-
.../component/jcache/JCacheProducerGetTest.java| 13 +++
.../component/jcache/JCacheProducerInvokeTest.java | 5 -
.../component/jcache/JCacheProducerPutTest.java| 10 ++---
.../component/jcache/JCacheProducerRemoveTest.java | 5 -
.../jcache/JCacheProducerReplaceTest.java | 14 +++-
.../policy/CacheManagerFromRegistryTest.java | 9 +---
.../jcache/policy/JCachePolicyProcessorTest.java | 6 -
.../component/jcache/policy/JCachePolicyTest.java | 5 -
.../jcache/policy/JCachePolicyTestBase.java| 10 -
.../jcache/policy/SpringJCachePolicyTest.java | 21 +
.../JCacheAggregationRepositoryRoutesTest.java | 2 +-
.../aggregate/JCacheAggregationRepositoryTest.java | 26 +-
.../JCacheAggregationRepositoryTestSupport.java| 2 +-
.../idempotent/JCacheIdempotentRepositoryTest.java | 15 -
20 files changed, 110 insertions(+), 65 deletions(-)
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index b9658ec..8b615b9 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -57,12 +57,12 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
org.apache.camel
-camel-test-spring
+camel-test-spring-junit5
test
@@ -82,8 +82,8 @@
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
index c8e334c..931df55 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
@@ -22,7 +22,7 @@ import java.util.UUID;
import javax.cache.Cache;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
index 658d37a..9d83c2d 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
@@ -36,7 +36,9 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JCacheConfigurationTest extends JCacheComponentTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
index 3881024..49f3598 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JCacheConsumerTest extends JCacheComponentTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheManagerTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheManagerTest.java
index aad98d7..ca2f784 100644
---
a
[camel] 08/23: [CAMEL-11807] Upgrade camel-ipfs to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4cb2953e0a47bd4a1eaf679940cf1070e09804e9
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:06:26 2020 +0200
[CAMEL-11807] Upgrade camel-ipfs to junit5
---
components/camel-ipfs/pom.xml | 4 ++--
.../camel/component/ipfs/SimpleIPFSTest.java | 24 --
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index 95d843f..b776d33 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -47,8 +47,8 @@
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
index 3852173..fbb0c25 100644
---
a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
+++
b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
@@ -29,9 +29,11 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/*
@@ -72,7 +74,7 @@ public class SimpleIPFSTest {
try {
ProducerTemplate producer = camelctx.createProducerTemplate();
String resA = producer.requestBody("direct:startA", null,
String.class);
-Assert.assertTrue("Expecting 0.4 in: " + resA,
resA.startsWith("0.4"));
+assertTrue(resA.startsWith("0.4"), "Expecting 0.4 in: " +
resA);
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is
IPFS running");
Assume.assumeFalse("IPFS is running", notRunning);
@@ -98,7 +100,7 @@ public class SimpleIPFSTest {
Path path =
Paths.get("src/test/resources/html/etc/userfile.txt");
ProducerTemplate producer = camelctx.createProducerTemplate();
String res = producer.requestBody("direct:start", path,
String.class);
-Assert.assertEquals(SINGLE_HASH, res);
+assertEquals(SINGLE_HASH, res);
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is
IPFS running");
Assume.assumeFalse("IPFS is running", notRunning);
@@ -125,8 +127,8 @@ public class SimpleIPFSTest {
Path path = Paths.get("src/test/resources/html");
ProducerTemplate producer = camelctx.createProducerTemplate();
List res = producer.requestBody("direct:start", path,
List.class);
-Assert.assertEquals(10, res.size());
-Assert.assertEquals(RECURSIVE_HASH, res.get(9));
+assertEquals(10, res.size());
+assertEquals(RECURSIVE_HASH, res.get(9));
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is
IPFS running");
Assume.assumeFalse("IPFS is running", notRunning);
@@ -176,7 +178,7 @@ public class SimpleIPFSTest {
try {
ProducerTemplate producer = camelctx.createProducerTemplate();
Path res = producer.requestBody("direct:start", SINGLE_HASH,
Path.class);
-Assert.assertEquals(Paths.get("target", SINGLE_HASH), res);
+assertEquals(Paths.get("target", SINGLE_HASH), res);
verifyFileContent(new FileInputStream(res.toFile()));
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is
IPFS running");
@@ -202,9 +204,9 @@ public class SimpleIPFSTest {
try {
ProducerTemplate producer = camelctx.createProducerTemplate();
Path res = producer.requestBody("direct:start",
RECURSIVE_HASH, Path.class);
-Assert.assertEquals(Paths.get("target", RECURSIVE_HASH), res);
-Assert.assertTrue(res.toFile().isDirectory());
-Assert.assertTrue(res.resolve("index.html").toFile().exists());
+assertEquals(Paths.get("target", RECURSIVE_HASH), res);
+assertTrue(res.toFile().isDirectory());
+assertTrue(res.resolve("index.html").toFile().exists());
} catch (Exception e) {
boolean notRunning
[camel] 09/23: [CAMEL-11807] Upgrade camel-irc to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7a547bfb4672504e9f8daf5dadb6680d9397875a
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:09:50 2020 +0200
[CAMEL-11807] Upgrade camel-irc to junit5
---
components/camel-irc/pom.xml | 4 ++--
.../org/apache/camel/component/irc/IrcConfigurationTest.java | 7 +--
.../java/org/apache/camel/component/irc/IrcConsumerTest.java | 6 +++---
.../java/org/apache/camel/component/irc/IrcEndpointTest.java | 6 +++---
.../java/org/apache/camel/component/irc/IrcProducerTest.java | 12 +++-
.../camel/component/irc/it/IrcIntegrationTestSupport.java| 12
.../camel/component/irc/it/IrcMultiChannelRouteTest.java | 9 +++--
.../org/apache/camel/component/irc/it/IrcOnReplyTest.java| 9 +++--
.../org/apache/camel/component/irc/it/IrcPrivmsgTest.java| 9 +++--
.../java/org/apache/camel/component/irc/it/IrcRouteTest.java | 9 +++--
.../org/apache/camel/component/irc/it/IrcsListUsersTest.java | 6 --
.../component/irc/it/IrcsWithSslContextParamsRouteTest.java | 4 ++--
12 files changed, 62 insertions(+), 31 deletions(-)
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index e48b082..461dce1 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -86,7 +86,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
@@ -96,7 +96,7 @@
org.mockito
-mockito-core
+mockito-junit-jupiter
test
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
index e484927..0ca31cd 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.irc;
import java.util.List;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class IrcConfigurationTest extends CamelTestSupport {
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
index 67bd3f2..cfcb1da 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.Processor;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
@@ -38,7 +38,7 @@ public class IrcConsumerTest {
private IrcConsumer consumer;
private IRCEventAdapter listener;
-@Before
+@BeforeEach
public void doSetup() {
connection = mock(IRCConnection.class);
endpoint = mock(IrcEndpoint.class);
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
index 85762d2..9224704 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.irc;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCConstants;
@@ -36,7 +36,7 @@ public class IrcEndpointTest {
private IRCConnection connection;
private IrcEndpoint endpoint;
-@Before
+@BeforeEach
public void doSetup() {
component = mock(IrcComponent.class);
configuration = mock(IrcConfiguration.class);
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcProducerTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcProducerTest.java
index 3ad68cc..c6c8479 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/
[camel] 04/23: [CAMEL-11807] Upgrade camel-ignite to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2e8eca2df9d70965e282a9f807acd9cbb874f02
Author: Guillaume Nodet
AuthorDate: Mon Jun 29 19:19:08 2020 +0200
[CAMEL-11807] Upgrade camel-ignite to junit5
---
components/camel-ignite/pom.xml| 6 +++---
.../camel/component/ignite/AbstractIgniteTest.java | 22 ++
.../ignite/IgniteCacheContinuousQueryTest.java | 15 ++-
.../camel/component/ignite/IgniteCacheTest.java| 15 +++
.../camel/component/ignite/IgniteComputeTest.java | 17 -
.../camel/component/ignite/IgniteCreationTest.java | 15 +++
.../camel/component/ignite/IgniteEventsTest.java | 13 +
.../camel/component/ignite/IgniteIdGenTest.java| 13 +
.../component/ignite/IgniteMessagingTest.java | 13 +
.../camel/component/ignite/IgniteQueueTest.java| 13 +
.../camel/component/ignite/IgniteSetTest.java | 13 +
11 files changed, 66 insertions(+), 89 deletions(-)
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index c3bc28a..7a6792d 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -51,7 +51,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
@@ -62,8 +62,8 @@
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
index a860b6f..15ef216 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
@@ -16,23 +16,22 @@
*/
package org.apache.camel.component.ignite;
+import java.lang.reflect.Method;
import java.util.Collections;
import java.util.UUID;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.ignite.Ignite;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.EventType;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
-public abstract class AbstractIgniteTest extends CamelTestSupport {
+public abstract class AbstractIgniteTest extends CamelTestSupport implements
BeforeEachCallback {
/** Ip finder for TCP discovery. */
private static final TcpDiscoveryIpFinder LOCAL_IP_FINDER = new
TcpDiscoveryVmIpFinder(false) {
@@ -49,12 +48,11 @@ public abstract class AbstractIgniteTest extends
CamelTestSupport {
private Ignite ignite;
-@Rule
-public TestRule watcher = new TestWatcher() {
-protected void starting(Description description) {
-resourceUid = description.getMethodName() +
UUID.randomUUID().toString();
-}
-};
+@Override
+public void beforeEach(ExtensionContext context) throws Exception {
+super.beforeEach(context);
+resourceUid = context.getTestMethod().map(Method::getName).orElse("")
+ UUID.randomUUID().toString();
+}
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
index 6708d47..5ebe4bc 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
@@ -38,9 +38,11 @@ import
org.apache.ignite.cache.CacheEntryEventSerializableFilter;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public cl
[camel] 11/23: [CAMEL-11807] Upgrade camel-jbpm to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dd10aac4df16b23face61e17b088c1b638ee4962
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:35:36 2020 +0200
[CAMEL-11807] Upgrade camel-jbpm to junit5
---
components/camel-jbpm/pom.xml | 9 ++-
.../jbpm/JBPMComponentIntegrationTest.java | 11 ++--
.../jbpm/server/CamelKieServerExtensionTest.java | 12 ++--
.../CamelWorkItemHandlerIntegrationTests.java | 67 --
.../DeploymentContextCamelCommandTest.java | 16 +++---
.../workitem/GlobalContextCamelCommandTest.java| 17 +++---
6 files changed, 76 insertions(+), 56 deletions(-)
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index a6950b6..557cc72 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -128,12 +128,17 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
org.mockito
-mockito-core
+mockito-junit-jupiter
+test
+
+
+org.hamcrest
+hamcrest
test
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
index 58f8849..04c6c4a 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
@@ -22,18 +22,21 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jbpm.JBPMProducer.Operation;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.server.api.model.instance.TaskSummary;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* To run this example you need jBPM to run locally, easiest is to use single
* zip distribution - download from jbpm.org Next, start it and import
* Evaluation sample project, build and deploy. Once done this test can be ran
* out of the box.
*/
-@Ignore("This is an integration test that needs jBPM running on the local
machine")
+@Disabled("This is an integration test that needs jBPM running on the local
machine")
public class JBPMComponentIntegrationTest extends CamelTestSupport {
@SuppressWarnings("unchecked")
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
index 719ee7c..c20c06b 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
@@ -25,9 +25,9 @@ import
org.apache.camel.component.jbpm.config.CamelContextBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.jbpm.services.api.service.ServiceRegistry;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.kie.api.KieServices;
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.KieContainer;
@@ -36,7 +36,7 @@ import org.kie.internal.runtime.manager.RuntimeEnvironment;
import org.kie.internal.runtime.manager.RuntimeManagerRegistry;
import org.kie.server.services.api.KieContainerInstance;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CamelKieServerExtensionTest {
@Mock
InternalRuntimeManager runtimeManager;
@@ -62,7 +62,7 @@ public class CamelKieServerExtensionTest {
private String identifier = "test";
-@After
+@AfterEach
public void cleanup() {
RuntimeManagerRegistry.get().remove(identifier);
}
diff --git
a/components/camel-jbpm/src
[camel] 17/23: [CAMEL-11807] Upgrade camel-jgroups to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ae3a1cdacfbe76be69c248c79d1e622a90c46c1
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 10:30:53 2020 +0200
[CAMEL-11807] Upgrade camel-jgroups to junit5
---
components/camel-jgroups/pom.xml | 8
.../camel/component/jgroups/CamelJGroupsReceiverTest.java | 14 --
.../camel/component/jgroups/JGroupsClusterRouteTest.java | 9 -
.../apache/camel/component/jgroups/JGroupsClusterTest.java | 10 +-
.../camel/component/jgroups/JGroupsComponentTest.java | 11 +++
.../jgroups/JGroupsComponentWithChannelPropertiesTest.java | 11 +++
.../camel/component/jgroups/JGroupsConsumerTest.java | 8
.../camel/component/jgroups/JGroupsEndpointTest.java | 7 +--
.../camel/component/jgroups/JGroupsProducerTest.java | 11 +++
.../camel/component/jgroups/JGroupsSharedChannelTest.java | 4 ++--
.../component/jgroups/cluster/JGroupsLockMasterTest.java | 10 ++
11 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 9d53592..b0a2352 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -52,18 +52,18 @@
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
org.mockito
-mockito-core
+mockito-junit-jupiter
test
org.apache.camel
-camel-test
+camel-test-junit5
test
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
index d071bea..61e47b8 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
@@ -18,16 +18,17 @@ package org.apache.camel.component.jgroups;
import org.apache.camel.Processor;
import org.jgroups.Message;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.BDDMockito.willThrow;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CamelJGroupsReceiverTest {
// Fixtures
@@ -43,14 +44,15 @@ public class CamelJGroupsReceiverTest {
// Tests
-@Test(expected = JGroupsException.class)
+@Test
public void shouldHandleProcessingException() throws Exception {
// Given
willThrow(Exception.class).given(processor).process(ArgumentMatchers.isNull());
Message message = new Message(null, "someMessage");
message.setSrc(null);
// When
-receiver.receive(message);
+assertThrows(JGroupsException.class,
+() -> receiver.receive(message));
}
}
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
index e5a9e1a..87113dc 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
@@ -20,16 +20,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static java.util.UUID.randomUUID;
import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.apache.camel.component.jgroups.JGroupsExpressions.delayIfContextNotStarted;
import static
org.apache.camel.component.jgroups.JGroupsFilters.dropNonCoordinatorViews;
-public class JGroupsClusterRouteTest extends Assert {
+public class JGroupsClusterRouteTest {
// Routing fixtures
@@ -54,7 +53,7 @@ public class JGroupsClusterRouteTest extends Assert {
}
}
-@Before
+@BeforeEach
public void setUp() throws
[camel] 02/23: [CAMEL-11807] Upgrade camel-ical to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c3e170e059387dae969b399a20043b7ff93ec875
Author: Guillaume Nodet
AuthorDate: Mon Jun 29 18:31:49 2020 +0200
[CAMEL-11807] Upgrade camel-ical to junit5
---
components/camel-ical/pom.xml| 2 +-
.../org/apache/camel/component/ical/ICalDataFormatTest.java | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index a18fd77..c3583b2 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -52,7 +52,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
diff --git
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index 15df760..46a89a8 100644
---
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -44,10 +44,10 @@ import net.fortuna.ical4j.model.property.Version;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Small unit test which verifies ical data format.
@@ -57,7 +57,7 @@ public class ICalDataFormatTest extends CamelTestSupport {
private java.util.TimeZone defaultTimeZone;
@Override
-@Before
+@BeforeEach
public void setUp() throws Exception {
defaultTimeZone = java.util.TimeZone.getDefault();
java.util.TimeZone.setDefault(java.util.TimeZone.getTimeZone("America/New_York"));
@@ -66,7 +66,7 @@ public class ICalDataFormatTest extends CamelTestSupport {
}
@Override
-@After
+@AfterEach
public void tearDown() throws Exception {
java.util.TimeZone.setDefault(defaultTimeZone);
[camel] 06/23: [CAMEL-11807] Upgrade camel-infinispan to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 35582ed97d470c7dca7428acd70e661a5226a3d3
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 08:59:17 2020 +0200
[CAMEL-11807] Upgrade camel-infinispan to junit5
---
components/camel-infinispan/pom.xml | 13 +
.../infinispan/InfinispanAsyncConsumerTest.java | 2 +-
.../infinispan/InfinispanClusterTestSupport.java | 6 +++---
.../infinispan/InfinispanClusteredConsumerTest.java | 12 +++-
.../infinispan/InfinispanComponentTest.java | 6 --
.../infinispan/InfinispanConfigurationIT.java| 16
.../InfinispanConsumerEntryCreatedTest.java | 2 +-
.../InfinispanConsumerEntryRemovedTest.java | 2 +-
.../InfinispanConsumerEntryUpdatedTest.java | 2 +-
.../InfinispanConsumerEntryVisitedTest.java | 2 +-
.../infinispan/InfinispanContinuousQueryIT.java | 6 --
.../InfinispanLocalConsumerCustomListenerIT.java | 2 +-
.../infinispan/InfinispanLocalConsumerTest.java | 4 +++-
.../component/infinispan/InfinispanProducerTest.java | 6 +-
.../infinispan/InfinispanRemoteProducerTest.java | 10 ++
.../infinispan/InfinispanRemoteQueryProducerIT.java | 8 ++--
.../infinispan/InfinispanSyncConsumerTest.java | 2 +-
.../component/infinispan/InfinispanTestSupport.java | 6 +++---
.../infinispan/MyEmbeddedCustomListener.java | 2 +-
.../policy/InfinispanRemoteRoutePolicyTest.java | 4 ++--
.../policy/InfinispanRoutePolicyTestBase.java| 14 --
...spanLocalAggregationRepositoryOperationsTest.java | 20 ++--
.../InfinispanLocalAggregationRepositoryTest.java| 4 ++--
.../InfinispanRemoteAggregationRepositoryTest.java | 8
.../InfinispanDefaultIdempotentRepositoryTest.java | 2 +-
.../idempotent/InfinispanIdempotentRepositoryIT.java | 14 --
.../InfinispanIdempotentRepositoryTest.java | 10 +-
.../SpringInfinispanIdempotentRepositoryIT.java | 6 --
.../apache/camel/component/infinispan/util/Wait.java | 4 ++--
29 files changed, 112 insertions(+), 83 deletions(-)
diff --git a/components/camel-infinispan/pom.xml
b/components/camel-infinispan/pom.xml
index 91e5eb8..0171ec0 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -70,12 +70,12 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
org.apache.camel
-camel-test-spring
+camel-test-spring-junit5
test
@@ -126,8 +126,13 @@
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
+test
+
+
+org.hamcrest
+hamcrest
test
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
index cc78275..9ae9866 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.infinispan;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InfinispanAsyncConsumerTest extends InfinispanTestSupport {
@Test
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
index 0c67e08..c9e72d3 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
import java.util.List;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.Cache;
import org.infinispan.commons.api.BasicCacheContainer;
import org.infinispan.commons.time.TimeService;
@@ -31,7 +31,7 @@ import org.infinispan.test.TestDataSCI;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.TransactionMode;
import org.i
[camel] 21/23: [CAMEL-11807] Upgrade camel-jslt to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit afa2f46e2ce987b81deda5333f8997bd94ffde85
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 12:08:53 2020 +0200
[CAMEL-11807] Upgrade camel-jslt to junit5
---
components/camel-jslt/pom.xml | 2 +-
.../src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java | 4 ++--
.../test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java | 4 ++--
.../java/org/apache/camel/component/jslt/JsltObjectFilterTest.java| 4 ++--
.../src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java | 4 ++--
.../test/java/org/apache/camel/component/jslt/JsltVariablesTest.java | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/components/camel-jslt/pom.xml b/components/camel-jslt/pom.xml
index e6e4402..bb4dd75 100644
--- a/components/camel-jslt/pom.xml
+++ b/components/camel-jslt/pom.xml
@@ -57,7 +57,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
diff --git
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java
index 46081a2..b3aff9a 100644
---
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java
+++
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java
@@ -20,9 +20,9 @@ import java.util.Collections;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test based on the JSLT demo playground default values.
diff --git
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java
index bb58d80..bb74f64 100644
---
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java
+++
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java
@@ -23,8 +23,8 @@ import com.schibsted.spt.data.jslt.Function;
import com.schibsted.spt.data.jslt.FunctionUtils;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test using user defined functions
diff --git
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
index fc4f7a3..c7e284c 100644
---
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
+++
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
@@ -23,9 +23,9 @@ import com.schibsted.spt.data.jslt.filters.JsonFilter;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JsltObjectFilterTest extends CamelTestSupport {
diff --git
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
index a721d38..3a03688 100644
---
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
+++
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
@@ -20,9 +20,9 @@ import java.util.Collections;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test using query expressions
diff --git
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java
index bf51bce..eaf5fae 100644
---
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltVariablesTest.java
+++
b/components/camel-jslt/src/test/java/org/apache/cam
[camel] 12/23: [CAMEL-11807] Upgrade camel-jacksonxml to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 861e4a56d393c14aa5fd9b414d04e2c5c058e67d
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:38:09 2020 +0200
[CAMEL-11807] Upgrade camel-jacksonxml to junit5
---
components/camel-jacksonxml/pom.xml | 6 +++---
.../apache/camel/component/jacksonxml/JacksonConcurrentTest.java | 6 --
.../camel/component/jacksonxml/JacksonConversionsSimpleTest.java | 7 +--
.../camel/component/jacksonxml/JacksonConversionsTest.java | 6 --
.../camel/component/jacksonxml/JacksonIncludeDefaultTest.java| 4 ++--
.../camel/component/jacksonxml/JacksonIncludeNotNulllTest.java | 4 ++--
.../camel/component/jacksonxml/JacksonJAXBAnnotationTest.java| 6 --
.../component/jacksonxml/JacksonMarshalAllowJMSTypeTest.java | 7 +--
.../jacksonxml/JacksonMarshalContentTypeHeaderTest.java | 9 +++--
.../component/jacksonxml/JacksonMarshalDateTimezoneTest.java | 6 --
.../apache/camel/component/jacksonxml/JacksonMarshalTest.java| 8 ++--
.../component/jacksonxml/JacksonMarshalUnmarshalListTest.java| 7 +--
.../JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java | 4 ++--
.../jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java| 7 +--
.../camel/component/jacksonxml/JacksonMarshalViewTest.java | 6 --
.../org/apache/camel/component/jacksonxml/JacksonModuleTest.java | 4 ++--
.../camel/component/jacksonxml/JacksonObjectListSplitTest.java | 6 --
.../component/jacksonxml/SpringJacksonEnableFeatureTest.java | 6 --
.../component/jacksonxml/SpringJacksonJsonDataFormatTest.java| 8 ++--
.../jacksonxml/SpringJacksonMarshalUnmarshalListTest.java| 7 +--
20 files changed, 83 insertions(+), 41 deletions(-)
diff --git a/components/camel-jacksonxml/pom.xml
b/components/camel-jacksonxml/pom.xml
index 45f91f2..c0c5362 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -60,7 +60,7 @@
org.apache.camel
-camel-test-spring
+camel-test-spring-junit5
test
@@ -69,8 +69,8 @@
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java
b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java
index 619677e..846f41d 100644
---
a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java
+++
b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java
@@ -21,8 +21,10 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
public class JacksonConcurrentTest extends CamelTestSupport {
diff --git
a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java
b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java
index 6635abf..79c9d8b 100644
---
a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java
+++
b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java
@@ -22,8 +22,11 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class JacksonConversionsSimpleTest extends CamelTestSupport {
diff --git
a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java
b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java
index 3f751f8..92ff828 100644
---
a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java
+++
b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java
@@ -2
[camel] 13/23: [CAMEL-11807] Upgrade camel-jcr to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d156b4bd84b79ad3d5aaec8f6089d5176a927ecb
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:51:58 2020 +0200
[CAMEL-11807] Upgrade camel-jcr to junit5
---
components/camel-jcr/pom.xml | 6 +++---
.../apache/camel/component/jcr/JcrAuthLoginFailureTest.java | 10 +++---
.../org/apache/camel/component/jcr/JcrAuthLoginTest.java | 5 -
.../java/org/apache/camel/component/jcr/JcrAuthTestBase.java | 8 +---
.../org/apache/camel/component/jcr/JcrConverterTest.java | 12 +++-
.../org/apache/camel/component/jcr/JcrGetNodeByIdTest.java | 6 +++---
.../apache/camel/component/jcr/JcrNodePathCreationTest.java | 11 ---
.../component/jcr/JcrProducerDifferentWorkspaceTest.java | 5 -
.../apache/camel/component/jcr/JcrProducerSubNodeTest.java | 5 -
.../java/org/apache/camel/component/jcr/JcrProducerTest.java | 5 -
.../component/jcr/JcrRouteDifferentWorkspaceTestSupport.java | 8 +---
.../org/apache/camel/component/jcr/JcrRouteTestSupport.java | 8 +---
12 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index 8620b45..102cdc6 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -59,12 +59,12 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
index c2afebf..4b99c35 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
@@ -20,7 +20,11 @@ import javax.jcr.LoginException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JcrAuthLoginFailureTest extends JcrAuthTestBase {
@@ -30,8 +34,8 @@ public class JcrAuthLoginFailureTest extends JcrAuthTestBase {
Exchange out = template.send("direct:a", exchange);
assertNotNull(out);
String uuid = out.getOut().getBody(String.class);
-assertNull("Expected body to be null, found JCR node UUID", uuid);
-assertTrue("Wrong exception type", out.getException() instanceof
LoginException);
+assertNull(uuid, "Expected body to be null, found JCR node UUID");
+assertTrue(out.getException() instanceof LoginException, "Wrong
exception type");
}
@Override
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
index 52963e1..54ec67c 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
@@ -22,7 +22,10 @@ import javax.jcr.SimpleCredentials;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JcrAuthLoginTest extends JcrAuthTestBase {
diff --git
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
index 5e1a584..f0467e0 100644
---
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
+++
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
@@ -25,12 +25,14 @@ import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicyIterator;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.TransientRepository;
-import org.junit.Before;
+import org.junit.jup
[camel] 14/23: [CAMEL-11807] Upgrade camel-jclouds to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ef9b130fa0ba49eee5cc6da6088d7ec09708
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:54:31 2020 +0200
[CAMEL-11807] Upgrade camel-jclouds to junit5
---
components/camel-jclouds/pom.xml | 2 +-
.../jclouds/JcloudsBlobStoreConsumerTest.java | 4 +--
.../jclouds/JcloudsBlobStoreProducerTest.java | 6 +++--
.../JcloudsFileConsumerStreamCachingIssueTest.java | 10 +---
.../jclouds/JcloudsMultipleBlobStoreTest.java | 4 +--
.../jclouds/JcloudsSpringBlobstoreTest.java| 10 +---
.../jclouds/JcloudsSpringComputeTest.java | 29 --
7 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index c190e74..9075fa8 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -69,7 +69,7 @@
org.apache.camel
-camel-test-spring
+camel-test-spring-junit5
test
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
index 285c41a..9cc033a 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.jclouds;
import com.google.common.collect.Lists;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.io.payloads.StringPayload;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JcloudsBlobStoreConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
index 7c55b80..2061381 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
@@ -33,12 +33,14 @@ import org.apache.camel.StreamCache;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.xml.StreamSourceConverter;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
index 31c5a8f..6187d1d 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
@@ -19,9 +19,11 @@ package org.apache.camel.component.jclouds;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* There is a jclouds fallback type-converter that may cause issue when stream
caching is enabled.
@@ -29,7 +31,7 @@ import org.junit.Test;
public class JcloudsFileConsumerStreamCachingIssueTest extends
CamelTestSupport {
@Override
-@Before
+@BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/foo");
super.setUp();
diff --git
a/components/camel-jclouds/src/t
[camel] 19/23: [CAMEL-11807] Upgrade camel-jolt to junit5
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 3573bd93b6313c5fe85741ba87ac24ca85271498 Author: Guillaume Nodet AuthorDate: Tue Jun 30 10:43:23 2020 +0200 [CAMEL-11807] Upgrade camel-jolt to junit5 --- components/camel-jolt/pom.xml | 2 +- .../test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java | 6 -- .../java/org/apache/camel/component/jolt/JoltFirstSampleTest.java | 4 ++-- .../test/java/org/apache/camel/component/jolt/JoltRemovrTest.java | 6 -- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index 1f3535f..2cb6696 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -71,7 +71,7 @@ org.apache.camel -camel-test +camel-test-junit5 test diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java index 04acaed..d919ea7 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java @@ -21,8 +21,10 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test testing the Removr. diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java index bb226cf..9e0c98e 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java @@ -23,9 +23,9 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit test based on the first sample test from the JOLT project. diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java index 2ed030d..7faff6f 100644 --- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java +++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java @@ -21,8 +21,10 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test testing the Removr.
[camel] 18/23: [CAMEL-11807] Upgrade camel-jira to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9926ebcd2e56cad41fa427a2fcf61a78f6320946
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 10:38:49 2020 +0200
[CAMEL-11807] Upgrade camel-jira to junit5
---
components/camel-jira/pom.xml | 8 ++---
.../jira/JiraComponentConfigurationTest.java | 6 ++--
.../jira/consumer/NewCommentsConsumerTest.java | 14
.../jira/consumer/NewIssuesConsumerTest.java | 14
.../jira/producer/AddCommentProducerTest.java | 11 +++---
.../jira/producer/AddIssueLinkProducerTest.java| 18 ++
.../jira/producer/AddIssueProducerTest.java| 39 +-
.../jira/producer/AddWorkLogProducerTest.java | 20 ++-
.../jira/producer/AttachFileProducerTest.java | 11 +++---
.../jira/producer/DeleteIssueProducerTest.java | 12 ---
.../jira/producer/FetchCommentsProducerTest.java | 18 ++
.../jira/producer/FetchIssueProducerTest.java | 18 ++
.../jira/producer/TransitionIssueProducerTest.java | 11 +++---
.../jira/producer/UpdateIssueProducerTest.java | 21
.../jira/producer/WatcherProducerTest.java | 32 ++
15 files changed, 149 insertions(+), 104 deletions(-)
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index a23cff7..59d8dd2 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -84,17 +84,17 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
org.mockito
-mockito-core
+mockito-junit-jupiter
test
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
index 41c5211..5e7ee5c 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
@@ -17,8 +17,10 @@
package org.apache.camel.component.jira;
import com.google.common.base.Joiner;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JiraComponentConfigurationTest extends CamelTestSupport {
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
index 08d90fe0..a2fdec2 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
@@ -36,12 +36,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
@@ -54,7 +54,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class NewCommentsConsumerTest extends CamelTestSupport {
private static List issues = new ArrayList<>();
@@ -81,7 +81,7 @@ public class NewCommentsConsumerTest extends CamelTestSupport
{
registry.bind(JIRA_REST_CLIENT_FACTORY, jiraRestClientFactory);
}
-@BeforeClass
+@BeforeAll
public static void beforeAll() {
issues.add(createIssueWithComments(1L, 1));
issues.add(createIssueWithComments(2L, 1));
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerT
[camel] 03/23: [CAMEL-11807] Upgrade camel-iec60870 to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bcb801b82c9c110b51a72acd495c19bc2e95a582
Author: Guillaume Nodet
AuthorDate: Mon Jun 29 18:32:03 2020 +0200
[CAMEL-11807] Upgrade camel-iec60870 to junit5
---
components/camel-iec60870/pom.xml | 6 ++---
.../camel/component/iec60870/ConnectionIdTest.java | 28 --
.../camel/component/iec60870/ConnectionTest.java | 9 +--
3 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/components/camel-iec60870/pom.xml
b/components/camel-iec60870/pom.xml
index e21df3a..d52cb8a 100644
--- a/components/camel-iec60870/pom.xml
+++ b/components/camel-iec60870/pom.xml
@@ -101,12 +101,12 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
index 182bbe9..d67c9b0 100644
---
a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
+++
b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
@@ -16,49 +16,53 @@
*/
package org.apache.camel.component.iec60870;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class ConnectionIdTest {
@Test
public void testNotEqual1() {
ConnectionId id1 = new ConnectionId("host", 1202, "id1");
ConnectionId id2 = new ConnectionId("host", 1202, "id2");
-Assert.assertFalse("Must be different", id1.equals(id2));
+assertNotEquals(id1, id2, "Must be different");
}
@Test
public void testNotEqual2() {
ConnectionId id1 = new ConnectionId("host1", 1202, "id");
ConnectionId id2 = new ConnectionId("host2", 1202, "id");
-Assert.assertFalse("Must be different", id1.equals(id2));
+assertNotEquals(id1, id2, "Must be different");
}
@Test
public void testNotEqual3() {
ConnectionId id1 = new ConnectionId("host", 1202_1, "id");
ConnectionId id2 = new ConnectionId("host", 1202_2, "id");
-Assert.assertFalse("Must be different", id1.equals(id2));
+assertNotEquals(id1, id2, "Must be different");
}
-@Test(expected = IllegalArgumentException.class)
+@Test
public void testIllegal1() {
-new ConnectionId("host", -1, "id");
+assertThrows(IllegalArgumentException.class,
+() -> new ConnectionId("host", -1, "id"));
}
@Test
public void testGetters() {
ConnectionId id = new ConnectionId("host", 1202, "id");
-Assert.assertEquals("host", id.getHost());
-Assert.assertEquals(1202, id.getPort());
-Assert.assertEquals("id", id.getConnectionId());
+assertEquals("host", id.getHost());
+assertEquals(1202, id.getPort());
+assertEquals("id", id.getConnectionId());
}
@Test
public void testEqual1() {
ConnectionId id1 = new ConnectionId("host", 1202, "id");
ConnectionId id2 = new ConnectionId("host", 1202, "id");
-Assert.assertTrue("Must be equal", id1.equals(id2));
+assertEquals(id1, id2, "Must be equal");
}
@Test
@@ -66,6 +70,6 @@ public class ConnectionIdTest {
ConnectionId id1 = new ConnectionId("host", 1202, "id");
ConnectionId id2 = new ConnectionId("host", 1202, "id");
-Assert.assertTrue("Hash code must be equal", id1.hashCode() ==
id2.hashCode());
+assertEquals(id1.hashCode(), id2.hashCode(), "Hash code must be
equal");
}
}
diff --git
a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
index f7d68f8..ad732d0 100644
---
a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
+++
b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
@@ -27,10 +27,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.Cam
[camel] branch master updated (268050b -> 526fea5)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 268050b Regen new 02f1da2 Add the file name in case an artifact in the repo is corrupted new c3e170e [CAMEL-11807] Upgrade camel-ical to junit5 new bcb801b [CAMEL-11807] Upgrade camel-iec60870 to junit5 new c2e8eca [CAMEL-11807] Upgrade camel-ignite to junit5 new 6c6c997 [CAMEL-11807] Upgrade camel-influxdb to junit5 new 35582ed [CAMEL-11807] Upgrade camel-infinispan to junit5 new 4b3bf4f [CAMEL-11807] Upgrade camel-iota to junit5 new 4cb2953 [CAMEL-11807] Upgrade camel-ipfs to junit5 new 7a547bf [CAMEL-11807] Upgrade camel-irc to junit5 new c8b283d [CAMEL-11807] Upgrade camel-ironmq to junit5 new dd10aac [CAMEL-11807] Upgrade camel-jbpm to junit5 new 861e4a5 [CAMEL-11807] Upgrade camel-jacksonxml to junit5 new d156b4b [CAMEL-11807] Upgrade camel-jcr to junit5 new ef9b130 [CAMEL-11807] Upgrade camel-jclouds to junit5 new 0cc3c94 [CAMEL-11807] Upgrade camel-jcache to junit5 new 92ab77f [CAMEL-11807] Upgrade camel-jgroups-raft to junit5 new 5ae3a1c [CAMEL-11807] Upgrade camel-jgroups to junit5 new 9926ebc [CAMEL-11807] Upgrade camel-jira to junit5 new 3573bd9 [CAMEL-11807] Upgrade camel-jolt to junit5 new d52350d [CAMEL-11807] Upgrade camel-jooq to junit5 new afa2f46 [CAMEL-11807] Upgrade camel-jslt to junit5 new c77da7e [CAMEL-11807] Upgrade camel-jsch to junit5 new 526fea5 [CAMEL-11807] Upgrade camel-jpa to junit5 The 23 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: components/camel-ical/pom.xml | 2 +- .../camel/component/ical/ICalDataFormatTest.java | 12 ++-- components/camel-iec60870/pom.xml | 6 +- .../camel/component/iec60870/ConnectionIdTest.java | 28 + .../camel/component/iec60870/ConnectionTest.java | 9 ++- components/camel-ignite/pom.xml| 6 +- .../camel/component/ignite/AbstractIgniteTest.java | 22 --- .../ignite/IgniteCacheContinuousQueryTest.java | 15 ++--- .../camel/component/ignite/IgniteCacheTest.java| 15 +++-- .../camel/component/ignite/IgniteComputeTest.java | 17 +++--- .../camel/component/ignite/IgniteCreationTest.java | 15 +++-- .../camel/component/ignite/IgniteEventsTest.java | 13 ++--- .../camel/component/ignite/IgniteIdGenTest.java| 13 ++--- .../component/ignite/IgniteMessagingTest.java | 13 ++--- .../camel/component/ignite/IgniteQueueTest.java| 13 ++--- .../camel/component/ignite/IgniteSetTest.java | 13 ++--- components/camel-infinispan/pom.xml| 13 +++-- .../infinispan/InfinispanAsyncConsumerTest.java| 2 +- .../infinispan/InfinispanClusterTestSupport.java | 6 +- .../InfinispanClusteredConsumerTest.java | 12 ++-- .../infinispan/InfinispanComponentTest.java| 6 +- .../infinispan/InfinispanConfigurationIT.java | 16 +++--- .../InfinispanConsumerEntryCreatedTest.java| 2 +- .../InfinispanConsumerEntryRemovedTest.java| 2 +- .../InfinispanConsumerEntryUpdatedTest.java| 2 +- .../InfinispanConsumerEntryVisitedTest.java| 2 +- .../infinispan/InfinispanContinuousQueryIT.java| 6 +- .../InfinispanLocalConsumerCustomListenerIT.java | 2 +- .../infinispan/InfinispanLocalConsumerTest.java| 4 +- .../infinispan/InfinispanProducerTest.java | 6 +- .../infinispan/InfinispanRemoteProducerTest.java | 10 ++-- .../InfinispanRemoteQueryProducerIT.java | 8 ++- .../infinispan/InfinispanSyncConsumerTest.java | 2 +- .../infinispan/InfinispanTestSupport.java | 6 +- .../infinispan/MyEmbeddedCustomListener.java | 2 +- .../policy/InfinispanRemoteRoutePolicyTest.java| 4 +- .../policy/InfinispanRoutePolicyTestBase.java | 14 +++-- ...anLocalAggregationRepositoryOperationsTest.java | 20 +++ .../InfinispanLocalAggregationRepositoryTest.java | 4 +- .../InfinispanRemoteAggregationRepositoryTest.java | 8 +-- .../InfinispanDefaultIdempotentRepositoryTest.java | 2 +- .../InfinispanIdempotentRepositoryIT.java | 14 +++-- .../InfinispanIdempotentRepositoryTest.java| 10 ++-- .../SpringInfinispanIdempotentRepositoryIT.java| 6 +- .../camel/component/infinispan/util/Wait.java | 4 +- components/camel-influxdb/pom.xml | 8 +-- .../component/influxdb/AbstractInfluxDbTest.java | 3 +- .../influxdb/InfluxDbEnsureDatabaseExistsTest.java | 6 +- .../influxdb/InfluxDbProducerBatchTest.java| 6 +- .../influxdb/InfluxDbProducerPingTest.java | 6 +- .../influxdb/Influ
[camel] 23/23: [CAMEL-11807] Upgrade camel-jpa to junit5
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 526fea598efbea2948188d9d1279bc61c7395815 Author: Guillaume Nodet AuthorDate: Tue Jun 30 14:18:30 2020 +0200 [CAMEL-11807] Upgrade camel-jpa to junit5 --- components/camel-jpa/pom.xml | 11 +++-- .../camel-jpa/src/main/docs/jpa-component.adoc | 4 +- .../camel/component/jpa/AbstractJpaMethodTest.java | 15 -- .../camel/component/jpa/JpaComponentTest.java | 9 +++- .../camel/component/jpa/JpaEndpointTest.java | 8 +++- .../org/apache/camel/component/jpa/JpaTest.java| 45 + .../camel/component/jpa/JpaUseMergeTest.java | 5 +- .../camel/component/jpa/JpaUsePersistTest.java | 56 +- .../jpa/JpaWithNamedQueryAndParametersTest.java| 31 ++-- .../camel/component/jpa/JpaWithNamedQueryTest.java | 41 .../component/jpa/JpaWithNativeQueryTest.java | 7 ++- .../jpa/JpaWithNativeQueryWithResultClassTest.java | 7 ++- .../camel/component/jpa/JpaWithQueryTest.java | 2 + .../camel/component/jpa/QueryBuilderTest.java | 7 ++- .../java/org/apache/camel/examples/MultiSteps.java | 5 +- .../camel/processor/jpa/AbstractJpaTest.java | 13 +++-- .../jpa/FileConsumerJpaIdempotentTest.java | 8 ++-- .../camel/processor/jpa/JpaBatchConsumerTest.java | 2 +- .../camel/processor/jpa/JpaCronSchedulerTest.java | 4 +- .../camel/processor/jpa/JpaFlushOnSendTest.java| 5 +- .../processor/jpa/JpaIdempotentConsumerTest.java | 18 +++ .../camel/processor/jpa/JpaNonTXRollbackTest.java | 7 ++- .../jpa/JpaPollingConsumerLockEntityTest.java | 6 +-- .../processor/jpa/JpaPollingConsumerTest.java | 4 +- .../camel/processor/jpa/JpaPreConsumedTest.java| 4 +- .../processor/jpa/JpaProducerConcurrentTest.java | 13 - .../processor/jpa/JpaProducerFindEntityTest.java | 4 +- .../camel/processor/jpa/JpaProducerNoBodyTest.java | 5 +- .../jpa/JpaProducerPassingEntityManagerTest.java | 5 +- .../camel/processor/jpa/JpaProducerRemoveTest.java | 5 +- .../JpaProducerWithQueryParametersHeaderTest.java | 15 +++--- .../processor/jpa/JpaProducerWithQueryTest.java| 15 +++--- .../jpa/JpaRouteConsumeLockEntityTest.java | 2 +- .../processor/jpa/JpaRouteMaximumResultsTest.java | 6 ++- .../jpa/JpaRouteSharedEntityManagerTest.java | 11 +++-- .../jpa/JpaRouteSkipLockedEntityTest.java | 12 +++-- .../apache/camel/processor/jpa/JpaRouteTest.java | 8 ++-- .../jpa/JpaRoutemaxMessagesPerPollTest.java| 2 +- .../camel/processor/jpa/JpaTXRollbackTest.java | 8 ++-- .../apache/camel/processor/jpa/JpaWireTapTest.java | 8 ++-- 40 files changed, 275 insertions(+), 168 deletions(-) diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index 445d301..3a624bb 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -69,7 +69,7 @@ org.apache.camel -camel-test +camel-test-junit5 test @@ -88,8 +88,13 @@ test -junit -junit +org.junit.jupiter +junit-jupiter +test + + +org.hamcrest +hamcrest test diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc index cf9b60e..eee7d89 100644 --- a/components/camel-jpa/src/main/docs/jpa-component.adoc +++ b/components/camel-jpa/src/main/docs/jpa-component.adoc @@ -426,8 +426,8 @@ but the following listed types were not enhanced at build time or at class load at org.springframework.transaction.support.TransactionTemplate.execute(TransactionTemplate.java:127) at org.apache.camel.processor.jpa.JpaRouteTest.cleanupRepository(JpaRouteTest.java:96) at org.apache.camel.processor.jpa.JpaRouteTest.createCamelContext(JpaRouteTest.java:67) -at org.apache.camel.test.junit4.CamelTestSupport.doSetUp(CamelTestSupport.java:238) -at org.apache.camel.test.junit4.CamelTestSupport.setUp(CamelTestSupport.java:208) +at org.apache.camel.test.junit5.CamelTestSupport.doSetUp(CamelTestSupport.java:238) +at org.apache.camel.test.junit5.CamelTestSupport.setUp(CamelTestSupport.java:208) The problem here is that the source has been compiled or recompiled through diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java index ccab26a..9f85fb7 10064
[camel] 05/23: [CAMEL-11807] Upgrade camel-influxdb to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6c6c997b4b846f73201597e386fedecd1bd83257
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 08:54:35 2020 +0200
[CAMEL-11807] Upgrade camel-influxdb to junit5
---
components/camel-influxdb/pom.xml | 8
.../org/apache/camel/component/influxdb/AbstractInfluxDbTest.java | 3 +--
.../component/influxdb/InfluxDbEnsureDatabaseExistsTest.java | 6 +++---
.../camel/component/influxdb/InfluxDbProducerBatchTest.java | 6 +++---
.../apache/camel/component/influxdb/InfluxDbProducerPingTest.java | 6 +++---
.../camel/component/influxdb/InfluxDbProducerQueryTest.java | 6 +++---
.../org/apache/camel/component/influxdb/InfluxDbProducerTest.java | 6 +++---
.../component/influxdb/converters/CamelInfluxDbConverterTest.java | 6 +++---
8 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/components/camel-influxdb/pom.xml
b/components/camel-influxdb/pom.xml
index b3038e9..8ea4d99 100644
--- a/components/camel-influxdb/pom.xml
+++ b/components/camel-influxdb/pom.xml
@@ -61,12 +61,12 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
org.mockito
-mockito-core
+mockito-junit-jupiter
test
@@ -75,8 +75,8 @@
test
-junit
-junit
+org.junit.jupiter
+junit-jupiter
test
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
index b3570335..9951a8d 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
@@ -17,11 +17,10 @@
package org.apache.camel.component.influxdb;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.influxdb.InfluxDB;
import org.influxdb.impl.InfluxDBImpl;
-
import static org.mockito.Mockito.mock;
public class AbstractInfluxDbTest extends CamelTestSupport {
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
index 047872a..c96e89e 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.influxdb.dto.Point;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class InfluxDbEnsureDatabaseExistsTest extends AbstractInfluxDbTest {
@@ -54,7 +54,7 @@ public class InfluxDbEnsureDatabaseExistsTest extends
AbstractInfluxDbTest {
};
}
-@Before
+@BeforeEach
public void resetEndpoints() {
errorEndpoint.reset();
successEndpoint.reset();
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
index 26ddf11..8389ae6 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.influxdb.dto.BatchPoints;
import org.influxdb.dto.Point;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfluxDbProducerBatchTest extends AbstractInfluxDbTest {
@@ -49,7 +49,7 @@ public class InfluxDbProducerBatchTest extends
AbstractInfluxDbTest {
};
}
-@Before
+@BeforeEach
public void resetEndpoints() {
errorEndpoint.reset();
successEndpoint.reset();
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java
b/components/camel-influ
[camel] 01/23: Add the file name in case an artifact in the repo is corrupted
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 02f1da2d5f11923d824304450f3a91fb4efbece8
Author: Guillaume Nodet
AuthorDate: Mon Jun 29 18:21:59 2020 +0200
Add the file name in case an artifact in the repo is corrupted
---
.../java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index 340b838..c55cc08 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -162,6 +162,8 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
try (ZipFile zf = new ZipFile(file)) {
return zf.stream().filter(ze ->
!ze.isDirectory()).filter(ze -> ze.getLastModifiedTime().toMillis() > lastmod)
.map(ze -> file.toString() + "!" +
ze.getName()).collect(Collectors.toList()).stream();
+} catch (IOException e) {
+throw new IOException("Error reading zip file: " +
file, e);
}
} else {
return Stream.of(file.toString());
[camel] 10/23: [CAMEL-11807] Upgrade camel-ironmq to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c8b283dff1a6deea50c5ddeb4e2a3e4aef7c9d64
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 09:32:08 2020 +0200
[CAMEL-11807] Upgrade camel-ironmq to junit5
---
components/camel-ironmq/pom.xml | 7 ++-
.../component/ironmq/FromQueueToQueueTest.java | 6 --
.../component/ironmq/IronMQBatchConsumerTest.java | 4 ++--
.../ironmq/IronMQBatchDeleteConsumerTest.java | 4 ++--
.../component/ironmq/IronMQBatchProducerTest.java | 12
.../ironmq/IronMQComponentConfigurationTest.java| 19 +--
.../component/ironmq/IronMQComponentSpringTest.java | 7 +--
.../camel/component/ironmq/IronMQComponentTest.java | 14 --
.../component/ironmq/IronMQPreserveHeadersTest.java | 9 +
.../integrationtest/ConcurrentConsumerLoadTest.java | 21 -
.../ironmq/integrationtest/FileCopyExample.java | 15 +--
.../ironmq/integrationtest/IronMQComponentTest.java | 13 +++--
.../ironmq/integrationtest/IronMQFIFOTest.java | 14 --
.../IronMQRackspaceComponentTest.java | 13 +++--
.../component/ironmq/integrationtest/LoadTest.java | 12 ++--
.../ironmq/integrationtest/Queue2QueueExample.java | 12 ++--
16 files changed, 108 insertions(+), 74 deletions(-)
diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml
index 5bdd45b..95fa51e 100644
--- a/components/camel-ironmq/pom.xml
+++ b/components/camel-ironmq/pom.xml
@@ -66,7 +66,7 @@
org.apache.camel
-camel-test-spring
+camel-test-spring-junit5
test
@@ -74,6 +74,11 @@
camel-dataset
test
+
+org.hamcrest
+hamcrest
+test
+
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
index 2c28fb7..27ab3bd 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
public class FromQueueToQueueTest extends CamelTestSupport {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
index 27cbc28..573d750 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class IronMQBatchConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
index 4be3621..25e96e0 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class IronMQBatchDeleteConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/compone
[camel] 22/23: [CAMEL-11807] Upgrade camel-jsch to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c77da7ea69fd7b0de3c486c7d110b854a41f3c73
Author: Guillaume Nodet
AuthorDate: Tue Jun 30 12:09:01 2020 +0200
[CAMEL-11807] Upgrade camel-jsch to junit5
---
components/camel-jsch/pom.xml | 2 +-
.../camel/component/scp/ScpServerTestSupport.java | 17 +++--
.../camel/component/scp/ScpSimpleProduceTest.java | 29 +++---
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index 165da7d..62697f3 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -51,7 +51,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
diff --git
a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
index 12bda8b..37a5ef4 100644
---
a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
+++
b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
@@ -29,7 +29,7 @@ import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.UserInfo;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.password.PasswordAuthenticator;
@@ -37,12 +37,15 @@ import
org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.server.scp.ScpCommandFactory;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public abstract class ScpServerTestSupport extends CamelTestSupport {
protected static final Logger LOG =
LoggerFactory.getLogger(ScpServerTestSupport.class);
protected static final String SCP_ROOT_DIR = "target/test-classes/scp";
@@ -71,13 +74,13 @@ public abstract class ScpServerTestSupport extends
CamelTestSupport {
return sshd;
}
-@BeforeClass
+@BeforeAll
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
}
@Override
-@Before
+@BeforeEach
public void setUp() throws Exception {
deleteDirectory(getScpPath());
createDirectory(getScpPath());
@@ -88,7 +91,7 @@ public abstract class ScpServerTestSupport extends
CamelTestSupport {
}
@Override
-@After
+@AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git
a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
index cbc8855..8da38c8 100644
---
a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
+++
b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
@@ -22,9 +22,10 @@ import java.nio.file.Files;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class ScpSimpleProduceTest extends ScpServerTestSupport {
@@ -42,7 +43,7 @@ public class ScpSimpleProduceTest extends
ScpServerTestSupport {
@Test
public void testScpSimpleProduce() throws Exception {
-Assume.assumeTrue(this.isSetupComplete());
+assumeTrue(this.isSetupComplete());
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
@@ -54,7 +55,7 @@ public class ScpSimpleProduceTest extends
ScpServerTestSupport {
@Test
public void testScpSimpleProduceTwoTimes() throws Exception {
-Assume.assumeTrue(this.isSetupComplete());
+assumeTrue(this.isSetupComplete());
getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("Hello
World", "Bye Wor
[GitHub] [camel-k] lburgazzoli commented on issue #1579: Running YAML code
lburgazzoli commented on issue #1579:
URL: https://github.com/apache/camel-k/issues/1579#issuecomment-651820735
Here an example of a working code:
```yaml
- from:
uri: "timer:clock"
parameters:
period: "1000"
steps:
- set-body:
constant: "foo"
- process:
ref: "toUpper"
- to: log:info
```
```java
import org.apache.camel.Processor;
import org.apache.camel.BindToRegistry;
public class MyConfigurer {
@BindToRegistry
public Processor toUpper() {
return e -> e.getMessage().setBody(
e.getMessage().getBody(String.class).toUpperCase()
);
}
}
```
tested on OpenShift with the following command:
kamel run --dev --name example routes.yaml MyConfigurer.java
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] 7thbit-com opened a new pull request #3960: CAMEL-15228: add end signal for polls
7thbit-com opened a new pull request #3960: URL: https://github.com/apache/camel/pull/3960 [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-14963 updated (e44489c -> 748f741)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from e44489c CAMEL-14963: Route Template. WIP add 748f741 CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/CamelContext.java | 7 +++--- .../camel/impl/engine/SimpleCamelContext.java | 2 +- .../org/apache/camel/impl/DefaultCamelContext.java | 4 ++-- .../java/org/apache/camel/impl/DefaultModel.java | 7 +- .../camel/impl/lw/LightweightCamelContext.java | 4 ++-- .../impl/lw/LightweightRuntimeCamelContext.java| 2 +- .../main/java/org/apache/camel/model/Model.java| 7 +++--- .../apache/camel/builder/RouteTemplateTest.java| 25 ++ 8 files changed, 44 insertions(+), 14 deletions(-)
[GitHub] [camel-k] apupier opened a new issue #1584: Improve description of "dependency" run and modeline option to inlucde case of Camel components artifactId
apupier opened a new issue #1584: URL: https://github.com/apache/camel-k/issues/1584 it is currently `An external library that should be included. E.g. for Maven dependencies "dependency=mvn:org.my/app:1.0"` it can also be used for specifying Camel components, using artifact ids. For instance, in case a toD is used in the route and cannot be determined automatically. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] omarsmak opened a new pull request #3961: CAMEL-15261: Handle fields with unwanted chars and upgrade Debezium to 1.2.0.Final
omarsmak opened a new pull request #3961: URL: https://github.com/apache/camel/pull/3961 [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-14963 updated (748f741 -> e9e7762)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from 748f741 CAMEL-14963: Route Template. WIP add e9e7762 CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/impl/DefaultModel.java | 31 +++--- .../apache/camel/model/RouteDefinitionHelper.java | 6 ++-- .../camel/model/RouteTemplateDefinition.java | 2 +- .../apache/camel/builder/RouteTemplateTest.java| 37 -- 4 files changed, 67 insertions(+), 9 deletions(-)
[camel] branch CAMEL-14963 updated (e9e7762 -> a731f84)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-14963 in repository https://gitbox.apache.org/repos/asf/camel.git. from e9e7762 CAMEL-14963: Route Template. WIP add a731f84 CAMEL-14963: Route Template. WIP No new revisions were added by this update. Summary of changes: .../camel/spi/XMLRoutesDefinitionLoader.java | 5 +++ .../java/org/apache/camel/xml/in/ModelParser.java | 5 +++ .../in/ModelParserXMLRoutesDefinitionLoader.java | 6 .../org/apache/camel/xml/in/ModelParserTest.java | 6 .../src/test/resources/barTemplate.xml | 7 +++- .../xml/jaxb/JaxbXMLRoutesDefinitionLoader.java| 38 ++ .../packaging/ModelXmlParserGeneratorMojo.java | 4 ++- 7 files changed, 69 insertions(+), 2 deletions(-) copy archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml => core/camel-xml-io/src/test/resources/barTemplate.xml (80%)
[camel] 01/04: CAMEL-15192 - AWS2-Kinesis-Firehose: Support creation of deliveryStream
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2458679ebd525f5eb23a41f8c5468afe83d6e070
Author: Andrea Cosentino
AuthorDate: Tue Jun 30 18:57:43 2020 +0200
CAMEL-15192 - AWS2-Kinesis-Firehose: Support creation of deliveryStream
---
.../aws2/firehose/KinesisFirehose2Operations.java | 2 +-
.../aws2/firehose/KinesisFirehose2Producer.java | 17 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Operations.java
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Operations.java
index 3fee7ae..4703837 100644
---
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Operations.java
+++
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Operations.java
@@ -18,5 +18,5 @@ package org.apache.camel.component.aws2.firehose;
public enum KinesisFirehose2Operations {
-sendBatchRecord
+sendBatchRecord, createDeliveryStream
}
diff --git
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Producer.java
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Producer.java
index 6792bdb..8874daa 100644
---
a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Producer.java
+++
b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Producer.java
@@ -27,6 +27,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.firehose.FirehoseClient;
+import
software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamRequest;
+import
software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamResponse;
import software.amazon.awssdk.services.firehose.model.PutRecordBatchRequest;
import software.amazon.awssdk.services.firehose.model.PutRecordBatchResponse;
import software.amazon.awssdk.services.firehose.model.PutRecordRequest;
@@ -56,12 +58,27 @@ public class KinesisFirehose2Producer extends
DefaultProducer {
case sendBatchRecord:
sendBatchRecord(getClient(), exchange);
break;
+case createDeliveryStream:
+createDeliveryStream(getClient(), exchange);
+break;
default:
throw new IllegalArgumentException("Unsupported
operation");
}
}
}
+private void createDeliveryStream(FirehoseClient client, Exchange
exchange) {
+if (exchange.getIn().getBody() instanceof CreateDeliveryStreamRequest)
{
+CreateDeliveryStreamRequest req =
exchange.getIn().getBody(CreateDeliveryStreamRequest.class);
+CreateDeliveryStreamResponse result =
client.createDeliveryStream(req);
+Message message = getMessageForResponse(exchange);
+message.setBody(result);
+} else {
+throw new IllegalArgumentException("The createDeliveryStream
operation expects a CreateDeliveryStream instance as body");
+}
+
+}
+
private void sendBatchRecord(FirehoseClient client, Exchange exchange) {
if (exchange.getIn().getBody() instanceof Iterable) {
Iterable c = exchange.getIn().getBody(Iterable.class);
[camel] branch master updated (e7a7522 -> 64cc2ac2)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from e7a7522 CAMEL-15261: Handle fields with unwanted chars and upgrade Debezium to 1.2.0.Final (#3961) new 2458679 CAMEL-15192 - AWS2-Kinesis-Firehose: Support creation of deliveryStream new 85871fe CAMEL-15192 - Regen and add docs new a26b49f Regen docs new 64cc2ac2 Regen The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/catalog/components/aws2-kinesis-firehose.json | 4 ++-- .../catalog/docs/aws2-kinesis-firehose-component.adoc | 5 +++-- .../component/aws2/firehose/aws2-kinesis-firehose.json | 4 ++-- .../src/main/docs/aws2-kinesis-firehose-component.adoc | 5 +++-- .../aws2/firehose/KinesisFirehose2Operations.java | 2 +- .../aws2/firehose/KinesisFirehose2Producer.java | 17 + .../dsl/KinesisFirehose2EndpointBuilderFactory.java | 3 ++- .../ROOT/pages/aws2-kinesis-firehose-component.adoc | 5 +++-- 8 files changed, 33 insertions(+), 12 deletions(-)
