You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/02/06 15:39:13 UTC
[camel] branch master updated: CAMEL-14509 - Create an
AWS-CloudWatch component based on SDK v2, Rename the packages
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
The following commit(s) were added to refs/heads/master by this push:
new bbc2f90 CAMEL-14509 - Create an AWS-CloudWatch component based on SDK v2, Rename the packages
bbc2f90 is described below
commit bbc2f90b3099590499e09e2445a24fcc112d429d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 6 16:37:13 2020 +0100
CAMEL-14509 - Create an AWS-CloudWatch component based on SDK v2, Rename the packages
---
.../cw/Cw2ComponentConfigurer.java} | 8 +++----
.../{aws => aws2}/cw/CwEndpointConfigurer.java | 2 +-
.../services/org/apache/camel/component/aws2-cw | 2 +-
.../org/apache/camel/configurer/aws2-cw-component | 2 +-
.../org/apache/camel/configurer/aws2-cw-endpoint | 2 +-
.../camel/component/{aws => aws2}/cw/aws2-cw.json | 28 +++++++++++-----------
.../src/main/docs/aws2-cw-component.adoc | 4 ++--
.../CwComponent.java => aws2/cw/Cw2Component.java} | 20 ++++++++--------
.../cw/Cw2ComponentVerifierExtension.java} | 10 ++++----
.../cw/Cw2Configuration.java} | 8 +++----
.../CwConstants.java => aws2/cw/Cw2Constants.java} | 4 ++--
.../component/{aws => aws2}/cw/CwEndpoint.java | 10 ++++----
.../component/{aws => aws2}/cw/CwProducer.java | 20 ++++++++--------
.../{aws => aws2}/cw/CloudWatchClientMock.java | 2 +-
.../cw/CwComponentConfigurationTest.java | 18 +++++++-------
.../cw/CwComponentRegistryClientTest.java | 8 ++++---
.../{aws => aws2}/cw/CwComponentTest.java | 13 +++++-----
.../cw/CwComponentVerifierExtensionTest.java | 2 +-
.../cw/integration/CwComponentIntegrationTest.java | 10 ++++----
.../dsl/Aws2CwComponentBuilderFactory.java | 27 +++++++++++----------
.../src/generated/resources/metadata.json | 2 +-
21 files changed, 104 insertions(+), 98 deletions(-)
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
similarity index 81%
rename from components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
rename to components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
index 1fee35a..07e16f1 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.GeneratedPropertyConfigurer;
@@ -9,13 +9,13 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
* Generated by camel build tools - do NOT edit this file!
*/
@SuppressWarnings("unchecked")
-public class CwComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
+public class Cw2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
@Override
public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- CwComponent target = (CwComponent) obj;
+ Cw2Component target = (Cw2Component) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
- case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws.cw.CwConfiguration.class, value)); return true;
+ case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws2.cw.Cw2Configuration.class, value)); return true;
case "accesskey":
case "accessKey": target.setAccessKey(property(camelContext, java.lang.String.class, value)); return true;
case "secretkey":
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/CwEndpointConfigurer.java
similarity index 98%
rename from components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
rename to components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/CwEndpointConfigurer.java
index 401271b..3e38e16 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/CwEndpointConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.GeneratedPropertyConfigurer;
diff --git a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component/aws2-cw b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component/aws2-cw
index b6084c2..6d173f6 100644
--- a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component/aws2-cw
+++ b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component/aws2-cw
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.cw.CwComponent
+class=org.apache.camel.component.aws2.cw.Cw2Component
diff --git a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-component b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-component
index 39894df..7cd2e95 100644
--- a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-component
+++ b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-component
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.cw.CwComponentConfigurer
+class=org.apache.camel.component.aws2.cw.Cw2ComponentConfigurer
diff --git a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-endpoint b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-endpoint
index a42cd28..be4c01a 100644
--- a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-endpoint
+++ b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/configurer/aws2-cw-endpoint
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aws.cw.CwEndpointConfigurer
+class=org.apache.camel.component.aws2.cw.CwEndpointConfigurer
diff --git a/components/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws/cw/aws2-cw.json b/components/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
similarity index 78%
rename from components/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws/cw/aws2-cw.json
rename to components/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
index e917368..aedf129 100644
--- a/components/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws/cw/aws2-cw.json
+++ b/components/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
@@ -12,14 +12,14 @@
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false,
- "javaType": "org.apache.camel.component.aws.cw.CwComponent",
+ "javaType": "org.apache.camel.component.aws2.cw.Cw2Component",
"firstVersion": "3.1.0",
"groupId": "org.apache.camel",
"artifactId": "camel-aws2-cw",
"version": "3.1.0-SNAPSHOT"
},
"componentProperties": {
- "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.cw.CwConfiguration", "deprecated": false, "secret": false, "description": "The AWS CW default configuration" },
+ "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.cw.Cw2Configuration", "deprecated": false, "secret": false, "description": "The AWS CW default configuration" },
"accessKey": { "kind": "property", "displayName": "Access Key", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
"region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which CW client needs to work" },
@@ -27,20 +27,20 @@
"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 [...]
},
"properties": {
- "namespace": { "kind": "path", "displayName": "Namespace", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "The metric namespace" },
- "amazonCwClient": { "kind": "parameter", "displayName": "Amazon Cw Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.cloudwatch.CloudWatchClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "To use the AmazonCloudWatch as the client" },
+ "namespace": { "kind": "path", "displayName": "Namespace", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "The metric namespace" },
+ "amazonCwClient": { "kind": "parameter", "displayName": "Amazon Cw Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.cloudwatch.CloudWatchClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "To use the AmazonCloudWatch as the client" },
"lazyStartProducer": { "kind": "parameter", "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 [...]
- "name": { "kind": "parameter", "displayName": "Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "The metric name" },
- "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the CW client" },
- "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the CW client" },
- "proxyProtocol": { "kind": "parameter", "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.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the CW client" },
- "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "The region in which CW client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1 [...]
- "timestamp": { "kind": "parameter", "displayName": "Timestamp", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.time.Instant", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "The metric timestamp" },
- "unit": { "kind": "parameter", "displayName": "Unit", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "The metric unit" },
- "value": { "kind": "parameter", "displayName": "Value", "group": "producer", "label": "", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "The metric value" },
+ "name": { "kind": "parameter", "displayName": "Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "The metric name" },
+ "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the CW client" },
+ "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the CW client" },
+ "proxyProtocol": { "kind": "parameter", "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.cw.Cw2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the CW client" },
+ "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "The region in which CW client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST [...]
+ "timestamp": { "kind": "parameter", "displayName": "Timestamp", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.time.Instant", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "The metric timestamp" },
+ "unit": { "kind": "parameter", "displayName": "Unit", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "The metric unit" },
+ "value": { "kind": "parameter", "displayName": "Value", "group": "producer", "label": "", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "The metric value" },
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
- "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
- "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.cw.CwConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
+ "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
+ "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
}
}
diff --git a/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc b/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
index f95d3932..5458ae4 100644
--- a/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
+++ b/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
@@ -40,7 +40,7 @@ The AWS 2 CloudWatch component supports 6 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *configuration* (advanced) | The AWS CW default configuration | | CwConfiguration
+| *configuration* (advanced) | The AWS CW default configuration | | Cw2Configuration
| *accessKey* (producer) | Amazon AWS Access Key | | String
| *secretKey* (producer) | Amazon AWS Secret Key | | String
| *region* (producer) | The region in which CW client needs to work | | String
@@ -163,4 +163,4 @@ Maven users will need to add the following dependency to their pom.xml.
</dependency>
---------------------------------------
-where `${camel-version`} must be replaced by the actual version of Camel.
\ No newline at end of file
+where `${camel-version`} must be replaced by the actual version of Camel.
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
similarity index 85%
rename from components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
rename to components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
index b8bab2f..64124d6c 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.util.Map;
import java.util.Set;
@@ -27,7 +27,7 @@ import org.apache.camel.support.DefaultComponent;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
@Component("aws2-cw")
-public class CwComponent extends DefaultComponent {
+public class Cw2Component extends DefaultComponent {
@Metadata
private String accessKey;
@@ -36,15 +36,15 @@ public class CwComponent extends DefaultComponent {
@Metadata
private String region;
@Metadata(label = "advanced")
- private CwConfiguration configuration;
+ private Cw2Configuration configuration;
- public CwComponent() {
+ public Cw2Component() {
this(null);
}
- public CwComponent(CamelContext context) {
+ public Cw2Component(CamelContext context) {
super(context);
- registerExtension(new CwComponentVerifierExtension());
+ registerExtension(new Cw2ComponentVerifierExtension());
}
@Override
@@ -53,7 +53,7 @@ public class CwComponent extends DefaultComponent {
throw new IllegalArgumentException("Metric namespace must be specified.");
}
- CwConfiguration configuration = this.configuration != null ? this.configuration.copy() : new CwConfiguration();
+ Cw2Configuration configuration = this.configuration != null ? this.configuration.copy() : new Cw2Configuration();
configuration.setNamespace(remaining);
CwEndpoint endpoint = new CwEndpoint(uri, this, configuration);
@@ -72,14 +72,14 @@ public class CwComponent extends DefaultComponent {
return endpoint;
}
- public CwConfiguration getConfiguration() {
+ public Cw2Configuration getConfiguration() {
return configuration;
}
/**
* The AWS CW default configuration
*/
- public void setConfiguration(CwConfiguration configuration) {
+ public void setConfiguration(Cw2Configuration configuration) {
this.configuration = configuration;
}
@@ -116,7 +116,7 @@ public class CwComponent extends DefaultComponent {
this.region = region;
}
- private void checkAndSetRegistryClient(CwConfiguration configuration) {
+ private void checkAndSetRegistryClient(Cw2Configuration configuration) {
Set<CloudWatchClient> clients = getCamelContext().getRegistry().findByType(CloudWatchClient.class);
if (clients.size() == 1) {
configuration.setAmazonCwClient(clients.stream().findFirst().get());
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ComponentVerifierExtension.java
similarity index 91%
rename from components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java
rename to components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ComponentVerifierExtension.java
index 6b384f2..128f61e 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ComponentVerifierExtension.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.util.Map;
@@ -29,13 +29,13 @@ import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
-public class CwComponentVerifierExtension extends DefaultComponentVerifierExtension {
+public class Cw2ComponentVerifierExtension extends DefaultComponentVerifierExtension {
- public CwComponentVerifierExtension() {
+ public Cw2ComponentVerifierExtension() {
this("aws2-cw");
}
- public CwComponentVerifierExtension(String scheme) {
+ public Cw2ComponentVerifierExtension(String scheme) {
super(scheme);
}
@@ -65,7 +65,7 @@ public class CwComponentVerifierExtension extends DefaultComponentVerifierExtens
ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
try {
- CwConfiguration configuration = setProperties(new CwConfiguration(), parameters);
+ Cw2Configuration configuration = setProperties(new Cw2Configuration(), parameters);
AwsBasicCredentials cred = AwsBasicCredentials.create(configuration.getAccessKey(), configuration.getSecretKey());
CloudWatchClientBuilder clientBuilder = CloudWatchClient.builder();
CloudWatchClient client = clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)).region(Region.of(configuration.getRegion())).build();
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
similarity index 96%
rename from components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
rename to components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
index c8e9c96..384b4a6 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.time.Instant;
@@ -27,7 +27,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
@UriParams
-public class CwConfiguration implements Cloneable {
+public class Cw2Configuration implements Cloneable {
@UriPath
@Metadata(required = true)
@@ -193,9 +193,9 @@ public class CwConfiguration implements Cloneable {
//
// *************************************************
- public CwConfiguration copy() {
+ public Cw2Configuration copy() {
try {
- return (CwConfiguration)super.clone();
+ return (Cw2Configuration)super.clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwConstants.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Constants.java
similarity index 94%
rename from components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwConstants.java
rename to components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Constants.java
index 7d4cb3d..c19cd49 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwConstants.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Constants.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
/**
* Constants used in Camel AWS CW module
*/
-public interface CwConstants {
+public interface Cw2Constants {
String METRIC_NAMESPACE = "CamelAwsCwMetricNamespace";
String METRIC_NAME = "CamelAwsCwMetricName";
String METRIC_VALUE = "CamelAwsCwMetricValue";
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/CwEndpoint.java
similarity index 94%
rename from components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
rename to components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/CwEndpoint.java
index bffabea..375cf63 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/CwEndpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.net.URI;
@@ -41,10 +41,10 @@ import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
public class CwEndpoint extends DefaultEndpoint {
@UriParam
- private CwConfiguration configuration;
+ private Cw2Configuration configuration;
private CloudWatchClient cloudWatchClient;
- public CwEndpoint(String uri, Component component, CwConfiguration configuration) {
+ public CwEndpoint(String uri, Component component, Cw2Configuration configuration) {
super(uri, component);
this.configuration = configuration;
}
@@ -76,11 +76,11 @@ public class CwEndpoint extends DefaultEndpoint {
super.doStop();
}
- public CwConfiguration getConfiguration() {
+ public Cw2Configuration getConfiguration() {
return configuration;
}
- public void setConfiguration(CwConfiguration configuration) {
+ public void setConfiguration(Cw2Configuration configuration) {
this.configuration = configuration;
}
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/CwProducer.java
similarity index 86%
rename from components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
rename to components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/CwProducer.java
index 5bce3ef..2d2bd57 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/CwProducer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.time.Instant;
import java.util.ArrayList;
@@ -77,12 +77,12 @@ public class CwProducer extends DefaultProducer {
}
private void setDimension(MetricDatum.Builder metricDatum, Exchange exchange) {
- String name = exchange.getIn().getHeader(CwConstants.METRIC_DIMENSION_NAME, String.class);
- String value = exchange.getIn().getHeader(CwConstants.METRIC_DIMENSION_VALUE, String.class);
+ String name = exchange.getIn().getHeader(Cw2Constants.METRIC_DIMENSION_NAME, String.class);
+ String value = exchange.getIn().getHeader(Cw2Constants.METRIC_DIMENSION_VALUE, String.class);
if (name != null && value != null) {
metricDatum.dimensions(Dimension.builder().name(name).value(value).build());
} else {
- Map<String, String> dimensions = exchange.getIn().getHeader(CwConstants.METRIC_DIMENSIONS, Map.class);
+ Map<String, String> dimensions = exchange.getIn().getHeader(Cw2Constants.METRIC_DIMENSIONS, Map.class);
if (dimensions != null) {
Collection<Dimension> dimensionCollection = new ArrayList<>();
for (Map.Entry<String, String> dimensionEntry : dimensions.entrySet()) {
@@ -95,7 +95,7 @@ public class CwProducer extends DefaultProducer {
}
private Instant determineTimestamp(Exchange exchange) {
- Instant timestamp = exchange.getIn().getHeader(CwConstants.METRIC_TIMESTAMP, Instant.class);
+ Instant timestamp = exchange.getIn().getHeader(Cw2Constants.METRIC_TIMESTAMP, Instant.class);
if (timestamp == null) {
timestamp = getConfiguration().getTimestamp();
}
@@ -103,7 +103,7 @@ public class CwProducer extends DefaultProducer {
}
private String determineNameSpace(Exchange exchange) {
- String namespace = exchange.getIn().getHeader(CwConstants.METRIC_NAMESPACE, String.class);
+ String namespace = exchange.getIn().getHeader(Cw2Constants.METRIC_NAMESPACE, String.class);
if (namespace == null) {
namespace = getConfiguration().getNamespace();
}
@@ -111,7 +111,7 @@ public class CwProducer extends DefaultProducer {
}
private String determineName(Exchange exchange) {
- String name = exchange.getIn().getHeader(CwConstants.METRIC_NAME, String.class);
+ String name = exchange.getIn().getHeader(Cw2Constants.METRIC_NAME, String.class);
if (name == null) {
name = getConfiguration().getName();
}
@@ -119,7 +119,7 @@ public class CwProducer extends DefaultProducer {
}
private Double determineValue(Exchange exchange) {
- Double value = exchange.getIn().getHeader(CwConstants.METRIC_VALUE, Double.class);
+ Double value = exchange.getIn().getHeader(Cw2Constants.METRIC_VALUE, Double.class);
if (value == null) {
value = getConfiguration().getValue();
}
@@ -127,14 +127,14 @@ public class CwProducer extends DefaultProducer {
}
private StandardUnit determineUnit(Exchange exchange) {
- String unit = exchange.getIn().getHeader(CwConstants.METRIC_UNIT, String.class);
+ String unit = exchange.getIn().getHeader(Cw2Constants.METRIC_UNIT, String.class);
if (unit == null) {
unit = getConfiguration().getUnit();
}
return unit != null ? StandardUnit.fromValue(unit) : StandardUnit.COUNT;
}
- protected CwConfiguration getConfiguration() {
+ protected Cw2Configuration getConfiguration() {
return getEndpoint().getConfiguration();
}
diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CloudWatchClientMock.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CloudWatchClientMock.java
similarity index 97%
rename from components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CloudWatchClientMock.java
rename to components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CloudWatchClientMock.java
index cede931..998c318 100644
--- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CloudWatchClientMock.java
+++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CloudWatchClientMock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataRequest;
diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java
similarity index 86%
rename from components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
rename to components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java
index d10346f..b96fed7 100644
--- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
+++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.time.Instant;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.component.aws2.cw.Cw2Component;
+import org.apache.camel.component.aws2.cw.CwEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import software.amazon.awssdk.core.Protocol;
@@ -34,7 +36,7 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
public void createEndpointWithAllOptions() throws Exception {
CloudWatchClient cloudWatchClient = new CloudWatchClientMock();
context.getRegistry().bind("amazonCwClient", cloudWatchClient);
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
CwEndpoint endpoint = (CwEndpoint)component
.createEndpoint("aws2-cw://camel.apache.org/test?amazonCwClient=#amazonCwClient&name=testMetric&value=2&unit=Count×tamp=#now");
@@ -47,25 +49,25 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
component.createEndpoint("aws2-cw://camel.apache.org/test?secretKey=yyy");
}
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx");
}
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx");
}
@Test
public void createEndpointWithComponentElements() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test");
@@ -77,7 +79,7 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentAndEndpointElements() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.toString());
@@ -91,7 +93,7 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentEndpointOptionsAndProxy() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.id());
diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java
similarity index 87%
rename from components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
rename to components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java
index 044e810..c729f63 100644
--- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
+++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.time.Instant;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.component.aws2.cw.Cw2Component;
+import org.apache.camel.component.aws2.cw.CwEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
@@ -32,7 +34,7 @@ public class CwComponentRegistryClientTest extends CamelTestSupport {
public void createEndpointWithAllOptions() throws Exception {
CloudWatchClient cloudWatchClient = new CloudWatchClientMock();
context.getRegistry().bind("amazonCwClient", cloudWatchClient);
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test?name=testMetric&value=2&unit=Count×tamp=#now");
assertEquals("camel.apache.org/test", endpoint.getConfiguration().getNamespace());
@@ -44,7 +46,7 @@ public class CwComponentRegistryClientTest extends CamelTestSupport {
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithMinimalS3ClientMisconfiguration() throws Exception {
- CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
+ Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class);
CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test");
}
}
diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
similarity index 81%
rename from components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
rename to components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
index ef97a86..0db9082 100644
--- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
+++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.time.Instant;
@@ -23,6 +23,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.cw.Cw2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -47,11 +48,11 @@ public class CwComponentTest extends CamelTestSupport {
mock.expectedMessageCount(1);
Exchange exchange = template.request("direct:start", new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getIn().setHeader(CwConstants.METRIC_NAMESPACE, "camel.apache.org/overriden");
- exchange.getIn().setHeader(CwConstants.METRIC_NAME, "OverridenMetric");
- exchange.getIn().setHeader(CwConstants.METRIC_VALUE, Double.valueOf(3));
- exchange.getIn().setHeader(CwConstants.METRIC_UNIT, StandardUnit.BYTES.toString());
- exchange.getIn().setHeader(CwConstants.METRIC_TIMESTAMP, LATER);
+ exchange.getIn().setHeader(Cw2Constants.METRIC_NAMESPACE, "camel.apache.org/overriden");
+ exchange.getIn().setHeader(Cw2Constants.METRIC_NAME, "OverridenMetric");
+ exchange.getIn().setHeader(Cw2Constants.METRIC_VALUE, Double.valueOf(3));
+ exchange.getIn().setHeader(Cw2Constants.METRIC_UNIT, StandardUnit.BYTES.toString());
+ exchange.getIn().setHeader(Cw2Constants.METRIC_TIMESTAMP, LATER);
}
});
diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentVerifierExtensionTest.java
similarity index 98%
rename from components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.java
rename to components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentVerifierExtensionTest.java
index 0a04e3e..ac50810 100644
--- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.java
+++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentVerifierExtensionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw;
+package org.apache.camel.component.aws2.cw;
import java.util.HashMap;
import java.util.Map;
diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIntegrationTest.java
similarity index 85%
rename from components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
rename to components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIntegrationTest.java
index 1b8f36c..34c815a 100644
--- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
+++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIntegrationTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.aws.cw.integration;
+package org.apache.camel.component.aws2.cw.integration;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws.cw.CwConstants;
+import org.apache.camel.component.aws2.cw.Cw2Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -39,9 +39,9 @@ public class CwComponentIntegrationTest extends CamelTestSupport {
template.send("direct:start", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getIn().setHeader(CwConstants.METRIC_NAME, "ExchangesCompleted");
- exchange.getIn().setHeader(CwConstants.METRIC_VALUE, "2.0");
- exchange.getIn().setHeader(CwConstants.METRIC_UNIT, "Count");
+ exchange.getIn().setHeader(Cw2Constants.METRIC_NAME, "ExchangesCompleted");
+ exchange.getIn().setHeader(Cw2Constants.METRIC_VALUE, "2.0");
+ exchange.getIn().setHeader(Cw2Constants.METRIC_UNIT, "Count");
}
});
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java
index 6da7ebf..81eac45 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java
@@ -20,7 +20,7 @@ import javax.annotation.Generated;
import org.apache.camel.Component;
import org.apache.camel.builder.component.AbstractComponentBuilder;
import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.aws.cw.CwComponent;
+import org.apache.camel.component.aws2.cw.Cw2Component;
/**
* The aws-cw component is used for sending metrics to an Amazon CloudWatch.
@@ -45,17 +45,18 @@ public interface Aws2CwComponentBuilderFactory {
/**
* Builder for the AWS 2 CloudWatch component.
*/
- interface Aws2CwComponentBuilder extends ComponentBuilder<CwComponent> {
+ interface Aws2CwComponentBuilder extends ComponentBuilder<Cw2Component> {
/**
* The AWS CW default configuration.
*
* The option is a:
- * <code>org.apache.camel.component.aws.cw.CwConfiguration</code> type.
+ * <code>org.apache.camel.component.aws2.cw.Cw2Configuration</code>
+ * type.
*
* Group: advanced
*/
default Aws2CwComponentBuilder configuration(
- org.apache.camel.component.aws.cw.CwConfiguration configuration) {
+ org.apache.camel.component.aws2.cw.Cw2Configuration configuration) {
doSetProperty("configuration", configuration);
return this;
}
@@ -131,12 +132,12 @@ public interface Aws2CwComponentBuilderFactory {
class Aws2CwComponentBuilderImpl
extends
- AbstractComponentBuilder<CwComponent>
+ AbstractComponentBuilder<Cw2Component>
implements
Aws2CwComponentBuilder {
@Override
- protected CwComponent buildConcreteComponent() {
- return new CwComponent();
+ protected Cw2Component buildConcreteComponent() {
+ return new Cw2Component();
}
@Override
protected boolean setPropertyOnComponent(
@@ -144,12 +145,12 @@ public interface Aws2CwComponentBuilderFactory {
String name,
Object value) {
switch (name) {
- case "configuration": ((CwComponent) component).setConfiguration((org.apache.camel.component.aws.cw.CwConfiguration) value); return true;
- case "accessKey": ((CwComponent) component).setAccessKey((java.lang.String) value); return true;
- case "secretKey": ((CwComponent) component).setSecretKey((java.lang.String) value); return true;
- case "region": ((CwComponent) component).setRegion((java.lang.String) value); return true;
- case "basicPropertyBinding": ((CwComponent) component).setBasicPropertyBinding((boolean) value); return true;
- case "lazyStartProducer": ((CwComponent) component).setLazyStartProducer((boolean) value); return true;
+ case "configuration": ((Cw2Component) component).setConfiguration((org.apache.camel.component.aws2.cw.Cw2Configuration) value); return true;
+ case "accessKey": ((Cw2Component) component).setAccessKey((java.lang.String) value); return true;
+ case "secretKey": ((Cw2Component) component).setSecretKey((java.lang.String) value); return true;
+ case "region": ((Cw2Component) component).setRegion((java.lang.String) value); return true;
+ case "basicPropertyBinding": ((Cw2Component) component).setBasicPropertyBinding((boolean) value); return true;
+ case "lazyStartProducer": ((Cw2Component) component).setLazyStartProducer((boolean) value); return true;
default: return false;
}
}
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 7fe7905..3d0ed38 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -375,7 +375,7 @@
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false,
- "javaType": "org.apache.camel.component.aws.cw.CwComponent",
+ "javaType": "org.apache.camel.component.aws2.cw.Cw2Component",
"firstVersion": "3.1.0",
"groupId": "org.apache.camel",
"artifactId": "camel-aws2-cw",