You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/05/19 12:46:11 UTC
[camel-quarkus] 01/01: Upgrade to Camel 3.4.0 (WiP)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit de0cbcc97bc86650cb1d8c5d850d856b0614c312
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon May 18 21:53:01 2020 +0200
Upgrade to Camel 3.4.0 (WiP)
---
.../pages/list-of-camel-quarkus-extensions.adoc | 70 +++++++++++-----------
.../camel/quarkus/core/FastCamelContext.java | 5 --
.../component/qute/QuteEndpointConfigurer.java | 5 ++
.../org/apache/camel/component/qute/qute.json | 1 +
.../apache/camel/component/qute/QuteEndpoint.java | 2 +-
pom.xml | 2 +-
6 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index 02a909d..b809a1a 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -29,19 +29,19 @@ Level | Since | Description
`activemq:destinationType:destinationName` | Native +
Stable | 1.0.0-M5 | Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component.
-| xref:extensions/ahc.adoc[AHC] (camel-quarkus-ahc) +
+| link:https://camel.apache.org/components/latest/amqp-component.html[AMQP] (camel-quarkus-amqp) +
+`amqp:destinationType:destinationName` | Native +
+ Stable | 1.0.0-M6 | Messaging with AMQP protocol using Apache QPid Client.
+
+| xref:extensions/ahc.adoc[Async HTTP Client (AHC)] (camel-quarkus-ahc) +
`ahc:httpUri` | Native +
Stable | 1.0.0-M3 | Call external HTTP services using Async Http Client.
-| link:https://camel.apache.org/components/latest/ahc-ws-component.html[AHC Websocket] (camel-quarkus-ahc-ws) +
+| link:https://camel.apache.org/components/latest/ahc-ws-component.html[Async HTTP Client (AHC) Websocket] (camel-quarkus-ahc-ws) +
`ahc-ws:httpUri` | Native +
Stable | 1.0.0-M3 | Exchange data with external Websocket servers using Async Http Client.
-| link:https://camel.apache.org/components/latest/amqp-component.html[AMQP] (camel-quarkus-amqp) +
-`amqp:destinationType:destinationName` | Native +
- Stable | 1.0.0-M6 | Messaging with AMQP protocol using Apache QPid Client.
-
-| link:https://camel.apache.org/components/latest/avro-component.html[Avro] (camel-quarkus-avro-rpc) +
+| link:https://camel.apache.org/components/latest/avro-component.html[Avro RPC] (camel-quarkus-avro-rpc) +
`avro:transport:host:port/messageName` | JVM +
Preview | 1.0.0-M6 | Produce or consume Apache Avro RPC services.
@@ -57,47 +57,47 @@ Level | Since | Description
`aws2-ddbstream:tableName` | JVM +
Preview | 1.0.0-M6 | Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-ec2-component.html[AWS 2 EC2] (camel-quarkus-aws2-ec2) +
+| link:https://camel.apache.org/components/latest/aws2-ec2-component.html[AWS 2 Elastic Compute Cloud (EC2)] (camel-quarkus-aws2-ec2) +
`aws2-ec2:label` | JVM +
Preview | 1.0.0-M6 | Manage AWS EC2 instances using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-ecs-component.html[AWS 2 ECS] (camel-quarkus-aws2-ecs) +
+| link:https://camel.apache.org/components/latest/aws2-ecs-component.html[AWS 2 Elastic Container Service (ECS)] (camel-quarkus-aws2-ecs) +
`aws2-ecs:label` | JVM +
Preview | 1.0.0-M6 | Manage AWS ECS cluster instances using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-eks-component.html[AWS 2 EKS] (camel-quarkus-aws2-eks) +
+| link:https://camel.apache.org/components/latest/aws2-eks-component.html[AWS 2 Elastic Kubernetes Service (EKS)] (camel-quarkus-aws2-eks) +
`aws2-eks:label` | JVM +
Preview | 1.0.0-M6 | Manage AWS EKS cluster instances using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 IAM] (camel-quarkus-aws2-iam) +
+| link:https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 Identity and Access Management (IAM)] (camel-quarkus-aws2-iam) +
`aws2-iam:label` | JVM +
Preview | 1.0.0-M6 | Manage AWS IAM instances using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-kms-component.html[AWS 2 KMS] (camel-quarkus-aws2-kms) +
+| link:https://camel.apache.org/components/latest/aws2-kms-component.html[AWS 2 Key Management Service (KMS)] (camel-quarkus-aws2-kms) +
`aws2-kms:label` | JVM +
Preview | 1.0.0-M6 | Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+| link:https://camel.apache.org/components/latest/aws2-msk-component.html[AWS 2 Managed Streaming for Apache Kafka (MSK)] (camel-quarkus-aws2-msk) +
+`aws2-msk:label` | JVM +
+ Preview | 1.0.0-M6 | Manage AWS MSK instances using AWS SDK version 2.x.
+
| link:https://camel.apache.org/components/latest/aws2-mq-component.html[AWS 2 MQ] (camel-quarkus-aws2-mq) +
`aws2-mq:label` | JVM +
Preview | 1.0.0-M6 | Manage AWS MQ instances using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-msk-component.html[AWS 2 MSK] (camel-quarkus-aws2-msk) +
-`aws2-msk:label` | JVM +
- Preview | 1.0.0-M6 | Manage AWS MSK instances using AWS SDK version 2.x.
-
| link:https://camel.apache.org/components/latest/aws2-s3-component.html[AWS 2 S3 Storage Service] (camel-quarkus-aws2-s3) +
`aws2-s3://bucketNameOrArn` | Native +
Stable | 1.0.0-M7 | Store and retrie objects from AWS S3 Storage Service using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-ses-component.html[AWS 2 Simple Email Service] (camel-quarkus-aws2-ses) +
+| link:https://camel.apache.org/components/latest/aws2-ses-component.html[AWS 2 Simple Email Service (SES)] (camel-quarkus-aws2-ses) +
`aws2-ses:from` | JVM +
Preview | 1.0.0-M6 | Send e-mails through AWS SES service using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-sns-component.html[AWS 2 Simple Notification System] (camel-quarkus-aws2-sns) +
+| link:https://camel.apache.org/components/latest/aws2-sns-component.html[AWS 2 Simple Notification System (SNS)] (camel-quarkus-aws2-sns) +
`aws2-sns:topicNameOrArn` | Native +
Stable | 1.0.0-M6 | Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws2-sqs-component.html[AWS 2 Simple Queue Service] (camel-quarkus-aws2-sqs) +
+| link:https://camel.apache.org/components/latest/aws2-sqs-component.html[AWS 2 Simple Queue Service (SQS)] (camel-quarkus-aws2-sqs) +
`aws2-sqs:queueNameOrArn` | Native +
Stable | 1.0.0-M6 | Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x.
@@ -105,22 +105,26 @@ Level | Since | Description
`aws2-translate:label` | JVM +
Preview | 1.0.0-M6 | Translate texts using AWS Translate and AWS SDK version 2.x.
-| link:https://camel.apache.org/components/latest/aws-ec2-component.html[AWS EC2] (camel-quarkus-aws-ec2) +
+| link:https://camel.apache.org/components/latest/aws-ec2-component.html[AWS Elastic Compute Cloud (EC2)] (camel-quarkus-aws-ec2) +
`aws-ec2:label` | Native +
Stable | 1.0.0-M3 | Manage AWS EC2 instances.
-| link:https://camel.apache.org/components/latest/aws-ecs-component.html[AWS ECS] (camel-quarkus-aws-ecs) +
+| link:https://camel.apache.org/components/latest/aws-ecs-component.html[AWS Elastic Container Service (ECS)] (camel-quarkus-aws-ecs) +
`aws-ecs:label` | Native +
Stable | 1.0.0-M1 | Manage AWS ECS cluster instances.
-| link:https://camel.apache.org/components/latest/aws-eks-component.html[AWS EKS] (camel-quarkus-aws-eks) +
+| link:https://camel.apache.org/components/latest/aws-eks-component.html[AWS Elastic Kubernetes Service (EKS)] (camel-quarkus-aws-eks) +
`aws-eks:label` | Native +
Stable | 0.2.0 | Manage AWS EKS cluster instances.
-| link:https://camel.apache.org/components/latest/aws-iam-component.html[AWS IAM] (camel-quarkus-aws-iam) +
+| link:https://camel.apache.org/components/latest/aws-iam-component.html[AWS Identity and Access Management (IAM)] (camel-quarkus-aws-iam) +
`aws-iam:label` | Native +
Stable | 1.1.0 | Manage AWS IAM instances.
+| link:https://camel.apache.org/components/latest/aws-kms-component.html[AWS Key Management Service (KMS)] (camel-quarkus-aws-kms) +
+`aws-kms:label` | Native +
+ Stable | 1.0.0-M1 | Manage keys stored in AWS KMS instances.
+
| link:https://camel.apache.org/components/latest/aws-kinesis-component.html[AWS Kinesis] (camel-quarkus-aws-kinesis) +
`aws-kinesis:streamName` | Native +
Stable | 1.0.0-M3 | Consume and produce records from AWS Kinesis Streams.
@@ -129,10 +133,6 @@ Level | Since | Description
`aws-kinesis-firehose:streamName` | Native +
Stable | 1.0.0-M3 | Consume data from AWS Kinesis Firehose streams.
-| link:https://camel.apache.org/components/latest/aws-kms-component.html[AWS KMS] (camel-quarkus-aws-kms) +
-`aws-kms:label` | Native +
- Stable | 1.0.0-M1 | Manage keys stored in AWS KMS instances.
-
| link:https://camel.apache.org/components/latest/aws-lambda-component.html[AWS Lambda] (camel-quarkus-aws-lambda) +
`aws-lambda:function` | Native +
Stable | 1.0.0-M3 | Manage and invoke AWS Lambda functions.
@@ -141,15 +141,15 @@ Level | Since | Description
`aws-s3://bucketNameOrArn` | Native +
Stable | 0.2.0 | Store and retrie objects from AWS S3 Storage Service.
-| link:https://camel.apache.org/components/latest/aws-sns-component.html[AWS Simple Notification System] (camel-quarkus-aws-sns) +
+| link:https://camel.apache.org/components/latest/aws-sns-component.html[AWS Simple Notification System (SNS)] (camel-quarkus-aws-sns) +
`aws-sns:topicNameOrArn` | Native +
Stable | 0.2.0 | Send messages to an AWS Simple Notification Topic.
-| link:https://camel.apache.org/components/latest/aws-sqs-component.html[AWS Simple Queue Service] (camel-quarkus-aws-sqs) +
+| link:https://camel.apache.org/components/latest/aws-sqs-component.html[AWS Simple Queue Service (SQS)] (camel-quarkus-aws-sqs) +
`aws-sqs:queueNameOrArn` | Native +
Stable | 0.2.0 | Sending and receive messages to/from AWS SQS service.
-| link:https://camel.apache.org/components/latest/aws-swf-component.html[AWS Simple Workflow] (camel-quarkus-aws-swf) +
+| link:https://camel.apache.org/components/latest/aws-swf-component.html[AWS Simple Workflow (SWF)] (camel-quarkus-aws-swf) +
`aws-swf:type` | Native +
Stable | 1.0.0-M6 | Manage workflows in the AWS Simple Workflow service.
@@ -666,16 +666,16 @@ Level | Since | Description
| link:https://camel.apache.org/components/latest/jaxb-dataformat.html[JAXB] (camel-quarkus-jaxb) | Native +
Stable | 1.0.0-M5 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
-| link:https://camel.apache.org/components/latest/json-gson-dataformat.html[JSon GSon] (camel-quarkus-gson) | Native +
+| link:https://camel.apache.org/components/latest/json-gson-dataformat.html[JSON Gson] (camel-quarkus-gson) | Native +
Stable | 1.0.0-M4 | Marshal POJOs to JSON and back.
-| link:https://camel.apache.org/components/latest/json-jackson-dataformat.html[JSon Jackson] (camel-quarkus-jackson) | Native +
+| link:https://camel.apache.org/components/latest/json-jackson-dataformat.html[JSON Jackson] (camel-quarkus-jackson) | Native +
Stable | 0.3.0 | Marshal POJOs to JSON and back.
-| link:https://camel.apache.org/components/latest/json-johnzon-dataformat.html[JSon Johnzon] (camel-quarkus-johnzon) | Native +
+| link:https://camel.apache.org/components/latest/json-johnzon-dataformat.html[JSON Johnzon] (camel-quarkus-johnzon) | Native +
Stable | 1.0.0-M5 | Marshal POJOs to JSON and back.
-| link:https://camel.apache.org/components/latest/json-xstream-dataformat.html[JSon XStream] (camel-quarkus-xstream) | Native +
+| link:https://camel.apache.org/components/latest/json-xstream-dataformat.html[JSON XStream] (camel-quarkus-xstream) | Native +
Stable | 1.0.0-M5 | Marshal POJOs to JSON and back.
| link:https://camel.apache.org/components/latest/lzf-dataformat.html[LZF Deflate Compression] (camel-quarkus-lzf) | Native +
@@ -771,7 +771,7 @@ Number of miscellaneous extensions: 12 in 12 JAR artifacts (0 deprecated)
| Extension | Target Level | Since | Description
| (camel-quarkus-attachments) | Native +
- Stable | 0.3.0 | Java Attachments support for Camel Message
+ Stable | 0.3.0 | Support for attachments on Camel messages
| (camel-quarkus-caffeine-lrucache) | Native +
Stable | 1.0.0-M5 | An LRUCacheFactory implementation based on Caffeine
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index bfe39a7..cfc7c8e 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -356,11 +356,6 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
}
@Override
- protected SupervisingRouteController createSupervisingRouteController() {
- return new DefaultSupervisingRouteController();
- }
-
- @Override
public void setTypeConverterRegistry(TypeConverterRegistry typeConverterRegistry) {
super.setTypeConverterRegistry(typeConverterRegistry);
diff --git a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java
index f4ca33c..22e72c7 100644
--- a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java
+++ b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java
@@ -19,6 +19,8 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements
public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
QuteEndpoint target = (QuteEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+ case "allowcontextmapall":
+ case "allowContextMapAll": target.setAllowContextMapAll(property(camelContext, boolean.class, value)); return true;
case "allowtemplatefromheader":
case "allowTemplateFromHeader": target.setAllowTemplateFromHeader(property(camelContext, boolean.class, value)); return true;
case "basicpropertybinding":
@@ -36,6 +38,7 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements
@Override
public Map<String, Object> getAllOptions(Object target) {
Map<String, Object> answer = new CaseInsensitiveMap();
+ answer.put("allowContextMapAll", boolean.class);
answer.put("allowTemplateFromHeader", boolean.class);
answer.put("basicPropertyBinding", boolean.class);
answer.put("contentCache", boolean.class);
@@ -49,6 +52,8 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
QuteEndpoint target = (QuteEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+ case "allowcontextmapall":
+ case "allowContextMapAll": return target.isAllowContextMapAll();
case "allowtemplatefromheader":
case "allowTemplateFromHeader": return target.isAllowTemplateFromHeader();
case "basicpropertybinding":
diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
index 6642da3..8a28402 100644
--- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
+++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
@@ -28,6 +28,7 @@
},
"properties": {
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a [...]
+ "allowContextMapAll": { "kind": "parameter", "displayName": "Allow Context Map All", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a [...]
"allowTemplateFromHeader": { "kind": "parameter", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the h [...]
"contentCache": { "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether to use resource content cache or not" },
"encoding": { "kind": "parameter", "displayName": "Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Character encoding of the resource content." },
diff --git a/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java b/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java
index 9da90a3..615f9c6 100644
--- a/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java
+++ b/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java
@@ -194,7 +194,7 @@ public class QuteEndpoint extends ResourceEndpoint {
instance = template.instance();
}
- ExchangeHelper.createVariableMap(exchange).forEach(instance::data);
+ ExchangeHelper.createVariableMap(exchange, isAllowContextMapAll()).forEach(instance::data);
Map<String, Object> map = exchange.getIn().getHeader(QuteConstants.QUTE_TEMPLATE_DATA, Map.class);
if (map != null) {
diff --git a/pom.xml b/pom.xml
index 629781b..6ceaa5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<awssdk1.version>1.11.714</awssdk1.version>
<awssdk1-swf-libs.version>1.11.22</awssdk1-swf-libs.version>
<awssdk2.version>2.13.8</awssdk2.version>
- <camel.version>3.3.0</camel.version>
+ <camel.version>3.4.0-SNAPSHOT</camel.version>
<debezium.version>1.1.0.Final</debezium.version>
<elasticsearch.version>7.6.1</elasticsearch.version>
<freemarker.version>2.3.30</freemarker.version>