This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 30b94b20dea8671c47710da013afcd9af6444703 Author: James Netherton <[email protected]> AuthorDate: Tue Apr 14 09:34:35 2020 +0100 Upgrade to Camel 3.3.0 - WIP --- .../pages/list-of-camel-quarkus-extensions.adoc | 2 +- .../org/apache/camel/quarkus/core/BaseModel.java | 29 ++++++++++++++++++++++ .../camel/quarkus/core/FastCamelContext.java | 20 +++++++++++++++ .../org/apache/camel/component/qute/qute.json | 21 ++++++++-------- pom.xml | 4 +-- 5 files changed, 63 insertions(+), 13 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 f26e8a1..eb70431 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -161,7 +161,7 @@ Level | Since | Description `aws2-s3://bucketNameOrArn` | Native + Stable | 1.0.0-M7 | The aws2-s3 component is used for storing and retrieving object from Amazon S3 Storage Service. -| link:https://camel.apache.org/components/latest/azure-blob-component.html[Azure Storage Blob Service] (camel-quarkus-azure) + +| link:https://camel.apache.org/components/latest/azure-blob-component.html[Azure Storage Blob Service (Legacy)] (camel-quarkus-azure) + `azure-blob:containerOrBlobUri` | Native + Stable | 1.0.0-M4 | The azure-blob component is used for storing and retrieving blobs from Azure Storage Blob Service. diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java index 2ccfc61..9bd3b06 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java @@ -40,6 +40,7 @@ public abstract class BaseModel implements Model { private Map<String, ServiceCallConfigurationDefinition> serviceCallConfigurations = new ConcurrentHashMap<>(); private Map<String, HystrixConfigurationDefinition> hystrixConfigurations = new ConcurrentHashMap<>(); private Map<String, Resilience4jConfigurationDefinition> resilience4jConfigurations = new ConcurrentHashMap<>(); + private Map<String, FaultToleranceConfigurationDefinition> faultToleranceConfigurations = new ConcurrentHashMap<>(); private Function<RouteDefinition, Boolean> routeFilter; public BaseModel(CamelContext camelContext) { @@ -216,6 +217,34 @@ public abstract class BaseModel implements Model { } @Override + public FaultToleranceConfigurationDefinition getFaultToleranceConfiguration(String id) { + if (id == null) { + id = ""; + } + + return faultToleranceConfigurations.get(id); + } + + @Override + public void setFaultToleranceConfiguration(FaultToleranceConfigurationDefinition configuration) { + faultToleranceConfigurations.put("", configuration); + } + + @Override + public void setFaultToleranceConfigurations(List<FaultToleranceConfigurationDefinition> configurations) { + if (configurations != null) { + for (FaultToleranceConfigurationDefinition configuration : configurations) { + faultToleranceConfigurations.put(configuration.getId(), configuration); + } + } + } + + @Override + public void addFaultToleranceConfiguration(String id, FaultToleranceConfigurationDefinition configuration) { + faultToleranceConfigurations.put(id, configuration); + } + + @Override public DataFormatDefinition resolveDataFormatDefinition(String name) { // lookup type and create the data format from it DataFormatDefinition type = lookup(camelContext, name, DataFormatDefinition.class); 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 768a48f..152ebb0 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 @@ -593,6 +593,26 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam } @Override + public FaultToleranceConfigurationDefinition getFaultToleranceConfiguration(String id) { + return model.getFaultToleranceConfiguration(id); + } + + @Override + public void setFaultToleranceConfiguration(FaultToleranceConfigurationDefinition configuration) { + model.setFaultToleranceConfiguration(configuration); + } + + @Override + public void setFaultToleranceConfigurations(List<FaultToleranceConfigurationDefinition> configurations) { + model.setFaultToleranceConfigurations(configurations); + } + + @Override + public void addFaultToleranceConfiguration(String id, FaultToleranceConfigurationDefinition configuration) { + model.addFaultToleranceConfiguration(id, configuration); + } + + @Override public List<ValidatorDefinition> getValidators() { return model.getValidators(); } 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 486d247..b2dd9db 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 @@ -2,22 +2,23 @@ "component": { "kind": "component", "name": "qute", - "scheme": "qute", - "extendsScheme": "", - "syntax": "qute:resourceUri", "title": "Qute", "description": "Transforms the message using a Quarkus Qute template.", - "label": "transformation", "deprecated": false, - "async": false, - "consumerOnly": false, - "producerOnly": true, - "lenientProperties": false, - "javaType": "org.apache.camel.component.qute.QuteComponent", "firstVersion": "3.2.0", + "label": "transformation", + "javaType": "org.apache.camel.component.qute.QuteComponent", + "supportLevel": "Stable", "groupId": "org.apache.camel.quarkus", "artifactId": "camel-quarkus-qute-component", - "version": "1.1.0-SNAPSHOT" + "version": "1.1.0-SNAPSHOT", + "scheme": "qute", + "extendsScheme": "", + "syntax": "qute:resourceUri", + "async": false, + "consumerOnly": false, + "producerOnly": true, + "lenientProperties": false }, "componentProperties": { "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 [...] diff --git a/pom.xml b/pom.xml index d778d7d..3920134 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,8 @@ <ahc.version>2.10.4</ahc.version> <awssdk1.version>1.11.714</awssdk1.version> <awssdk1-swf-libs.version>1.11.22</awssdk1-swf-libs.version> - <awssdk2.version>2.11.5</awssdk2.version> - <camel.version>3.2.0</camel.version> + <awssdk2.version>2.11.14</awssdk2.version> + <camel.version>3.3.0-SNAPSHOT</camel.version> <freemarker.version>2.3.30</freemarker.version> <github-api.version>1.111</github-api.version> <google-http-client.version>1.22.0</google-http-client.version>
