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:31:23 UTC

[camel] 01/02: Camel-AWS2-CW: 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 80b79d302aac654828c404e173a4d579f817cbbc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 6 16:29:22 2020 +0100

    Camel-AWS2-CW: Fixed CS
---
 .../apache/camel/component/aws/cw/CwComponent.java | 10 ++---
 .../aws/cw/CwComponentVerifierExtension.java       |  1 -
 .../camel/component/aws/cw/CwConfiguration.java    | 12 +++---
 .../apache/camel/component/aws/cw/CwConstants.java |  2 +-
 .../apache/camel/component/aws/cw/CwEndpoint.java  |  3 +-
 .../apache/camel/component/aws/cw/CwProducer.java  | 18 ++++-----
 .../component/aws/cw/CloudWatchClientMock.java     | 45 ++++++++++++++--------
 .../aws/cw/CwComponentConfigurationTest.java       | 27 +++++++------
 .../aws/cw/CwComponentRegistryClientTest.java      | 12 ++----
 .../camel/component/aws/cw/CwComponentTest.java    | 20 ++--------
 .../cw/integration/CwComponentIntegrationTest.java |  4 +-
 11 files changed, 71 insertions(+), 83 deletions(-)

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/aws/cw/CwComponent.java
index f76b499..b8bab2f 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/aws/cw/CwComponent.java
@@ -24,7 +24,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 
 @Component("aws2-cw")
@@ -36,9 +35,9 @@ public class CwComponent extends DefaultComponent {
     private String secretKey;
     @Metadata
     private String region;
-    @Metadata(label = "advanced")    
+    @Metadata(label = "advanced")
     private CwConfiguration configuration;
-    
+
     public CwComponent() {
         this(null);
     }
@@ -58,7 +57,8 @@ public class CwComponent extends DefaultComponent {
         configuration.setNamespace(remaining);
 
         CwEndpoint endpoint = new CwEndpoint(uri, this, configuration);
-        // set component level options before overriding from endpoint parameters
+        // set component level options before overriding from endpoint
+        // parameters
         endpoint.getConfiguration().setAccessKey(accessKey);
         endpoint.getConfiguration().setSecretKey(secretKey);
         endpoint.getConfiguration().setRegion(region);
@@ -115,7 +115,7 @@ public class CwComponent extends DefaultComponent {
     public void setRegion(String region) {
         this.region = region;
     }
-    
+
     private void checkAndSetRegistryClient(CwConfiguration configuration) {
         Set<CloudWatchClient> clients = getCamelContext().getRegistry().findByType(CloudWatchClient.class);
         if (clients.size() == 1) {
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/aws/cw/CwComponentVerifierExtension.java
index ad360d0..6b384f2 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/aws/cw/CwComponentVerifierExtension.java
@@ -22,7 +22,6 @@ import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExt
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
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/aws/cw/CwConfiguration.java
index c72b51a..c8e9c96 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/aws/cw/CwConfiguration.java
@@ -17,21 +17,20 @@
 package org.apache.camel.component.aws.cw;
 
 import java.time.Instant;
-import java.util.Date;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
-
 import software.amazon.awssdk.core.Protocol;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 
 @UriParams
 public class CwConfiguration implements Cloneable {
 
-    @UriPath @Metadata(required = true)
+    @UriPath
+    @Metadata(required = true)
     private String namespace;
     @UriParam
     private CloudWatchClient amazonCwClient;
@@ -143,7 +142,7 @@ public class CwConfiguration implements Cloneable {
     public void setAmazonCwClient(CloudWatchClient amazonCwClient) {
         this.amazonCwClient = amazonCwClient;
     }
-    
+
     public Protocol getProxyProtocol() {
         return proxyProtocol;
     }
@@ -182,8 +181,9 @@ public class CwConfiguration implements Cloneable {
     }
 
     /**
-     * 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)
-     * You'll need to use the name Regions.EU_WEST_1.name()
+     * 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) You'll need to use the name Regions.EU_WEST_1.name()
      */
     public void setRegion(String region) {
         this.region = region;
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/aws/cw/CwConstants.java
index 09d7bcc..7d4cb3d 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/aws/cw/CwConstants.java
@@ -28,4 +28,4 @@ public interface CwConstants {
     String METRIC_DIMENSIONS = "CamelAwsCwMetricDimensions";
     String METRIC_DIMENSION_NAME = "CamelAwsCwMetricDimensionName";
     String METRIC_DIMENSION_VALUE = "CamelAwsCwMetricDimensionValue";
-}
\ No newline at end of file
+}
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/aws/cw/CwEndpoint.java
index 8e88012..bffabea 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/aws/cw/CwEndpoint.java
@@ -26,7 +26,6 @@ import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
@@ -66,7 +65,7 @@ public class CwEndpoint extends DefaultEndpoint {
 
         cloudWatchClient = configuration.getAmazonCwClient() != null ? configuration.getAmazonCwClient() : createCloudWatchClient();
     }
-    
+
     @Override
     public void doStop() throws Exception {
         if (ObjectHelper.isEmpty(configuration.getAmazonCwClient())) {
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/aws/cw/CwProducer.java
index 72fe64a..5bce3ef 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/aws/cw/CwProducer.java
@@ -30,7 +30,6 @@ import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import software.amazon.awssdk.services.cloudwatch.model.Dimension;
 import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;
 import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataRequest;
@@ -44,7 +43,7 @@ public class CwProducer extends DefaultProducer {
     private static final Logger LOG = LoggerFactory.getLogger(CwProducer.class);
 
     private transient String cwProducerToString;
-    
+
     public CwProducer(Endpoint endpoint) {
         super(endpoint);
     }
@@ -54,7 +53,7 @@ public class CwProducer extends DefaultProducer {
         List<MetricDatum> metricData = getMetricData(exchange);
 
         PutMetricDataRequest.Builder builder = PutMetricDataRequest.builder();
-                builder.metricData(metricData).namespace(determineNameSpace(exchange));
+        builder.metricData(metricData).namespace(determineNameSpace(exchange));
 
         PutMetricDataRequest request = builder.build();
         LOG.info("Sending request [{}] from exchange [{}]...", request, exchange);
@@ -64,18 +63,15 @@ public class CwProducer extends DefaultProducer {
     private List<MetricDatum> getMetricData(Exchange exchange) {
         Object body = exchange.getIn().getBody();
         if (body instanceof List) {
-            return CastUtils.cast((List<?>) body);
+            return CastUtils.cast((List<?>)body);
         }
 
         if (body instanceof MetricDatum) {
-            return Arrays.asList((MetricDatum) body);
+            return Arrays.asList((MetricDatum)body);
         }
 
-        MetricDatum.Builder metricDatum = MetricDatum.builder()
-                .metricName(determineName(exchange))
-                .value(determineValue(exchange))
-                .unit(determineUnit(exchange))
-                .timestamp(determineTimestamp(exchange));
+        MetricDatum.Builder metricDatum = MetricDatum.builder().metricName(determineName(exchange)).value(determineValue(exchange)).unit(determineUnit(exchange))
+            .timestamp(determineTimestamp(exchange));
         setDimension(metricDatum, exchange);
         return Arrays.asList(metricDatum.build());
     }
@@ -152,6 +148,6 @@ public class CwProducer extends DefaultProducer {
 
     @Override
     public CwEndpoint getEndpoint() {
-        return (CwEndpoint) super.getEndpoint();
+        return (CwEndpoint)super.getEndpoint();
     }
 }
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/aws/cw/CloudWatchClientMock.java
index aefa813..cede931 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/aws/cw/CloudWatchClientMock.java
@@ -1,3 +1,19 @@
+/*
+ * 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.component.aws.cw;
 
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
@@ -6,22 +22,19 @@ import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataResponse;
 
 public class CloudWatchClientMock implements CloudWatchClient {
 
-	@Override
-	public String serviceName() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    @Override
+    public String serviceName() {
+        return null;
+    }
 
-	@Override
-	public void close() {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	@Override
-	public PutMetricDataResponse putMetricData(PutMetricDataRequest request)  {
-		PutMetricDataResponse.Builder builder = PutMetricDataResponse.builder();
-		return builder.build();
-	}
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public PutMetricDataResponse putMetricData(PutMetricDataRequest request) {
+        PutMetricDataResponse.Builder builder = PutMetricDataResponse.builder();
+        return builder.build();
+    }
 
 }
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/aws/cw/CwComponentConfigurationTest.java
index 4f4d2a5..d10346f 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/aws/cw/CwComponentConfigurationTest.java
@@ -21,24 +21,22 @@ import java.time.Instant;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
-
 import software.amazon.awssdk.core.Protocol;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 
-import static org.mockito.Mockito.mock;
-
 public class CwComponentConfigurationTest extends CamelTestSupport {
-    
+
     @BindToRegistry("now")
     private static final Instant NOW = Instant.now();
 
     @Test
     public void createEndpointWithAllOptions() throws Exception {
-        CloudWatchClient cloudWatchClient = mock(CloudWatchClient.class);
+        CloudWatchClient cloudWatchClient = new CloudWatchClientMock();
         context.getRegistry().bind("amazonCwClient", cloudWatchClient);
         CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
-        CwEndpoint endpoint = (CwEndpoint) component.createEndpoint("aws2-cw://camel.apache.org/test?amazonCwClient=#amazonCwClient&name=testMetric&value=2&unit=Count&timestamp=#now");
+        CwEndpoint endpoint = (CwEndpoint)component
+            .createEndpoint("aws2-cw://camel.apache.org/test?amazonCwClient=#amazonCwClient&name=testMetric&value=2&unit=Count&timestamp=#now");
 
         assertEquals("camel.apache.org/test", endpoint.getConfiguration().getNamespace());
         assertEquals("testMetric", endpoint.getConfiguration().getName());
@@ -58,25 +56,25 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
         CwComponent component = context.getComponent("aws2-cw", CwComponent.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);
         component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx");
     }
-    
+
     @Test
     public void createEndpointWithComponentElements() throws Exception {
         CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
         component.setAccessKey("XXX");
         component.setSecretKey("YYY");
         CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test");
-        
+
         assertEquals("camel.apache.org/test", endpoint.getConfiguration().getNamespace());
         assertEquals("XXX", endpoint.getConfiguration().getAccessKey());
         assertEquals("YYY", endpoint.getConfiguration().getSecretKey());
     }
-    
+
     @Test
     public void createEndpointWithComponentAndEndpointElements() throws Exception {
         CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
@@ -84,21 +82,22 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
         component.setSecretKey("YYY");
         component.setRegion(Region.US_WEST_1.toString());
         CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxxxxx&secretKey=yyyyy&region=US_EAST_1");
-        
+
         assertEquals("camel.apache.org/test", endpoint.getConfiguration().getNamespace());
         assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
         assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
         assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
     }
-    
+
     @Test
     public void createEndpointWithComponentEndpointOptionsAndProxy() throws Exception {
         CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
         component.setAccessKey("XXX");
         component.setSecretKey("YYY");
         component.setRegion(Region.US_WEST_1.id());
-        CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxxxxx&secretKey=yyyyy&region=US_EAST_1&proxyHost=localhost&proxyPort=9000");
-        
+        CwEndpoint endpoint = (CwEndpoint)component
+            .createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxxxxx&secretKey=yyyyy&region=US_EAST_1&proxyHost=localhost&proxyPort=9000");
+
         assertEquals("camel.apache.org/test", endpoint.getConfiguration().getNamespace());
         assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
         assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
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/aws/cw/CwComponentRegistryClientTest.java
index 7e7348f..044e810 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/aws/cw/CwComponentRegistryClientTest.java
@@ -17,27 +17,23 @@
 package org.apache.camel.component.aws.cw;
 
 import java.time.Instant;
-import java.util.Date;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 
-import static org.mockito.Mockito.mock;
-
 public class CwComponentRegistryClientTest extends CamelTestSupport {
-    
+
     @BindToRegistry("now")
     private static final Instant NOW = Instant.now();
 
     @Test
     public void createEndpointWithAllOptions() throws Exception {
-        CloudWatchClient cloudWatchClient = mock(CloudWatchClient.class);
+        CloudWatchClient cloudWatchClient = new CloudWatchClientMock();
         context.getRegistry().bind("amazonCwClient", cloudWatchClient);
         CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
-        CwEndpoint endpoint = (CwEndpoint) component.createEndpoint("aws2-cw://camel.apache.org/test?name=testMetric&value=2&unit=Count&timestamp=#now");
+        CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws2-cw://camel.apache.org/test?name=testMetric&value=2&unit=Count&timestamp=#now");
 
         assertEquals("camel.apache.org/test", endpoint.getConfiguration().getNamespace());
         assertEquals("testMetric", endpoint.getConfiguration().getName());
@@ -45,7 +41,7 @@ public class CwComponentRegistryClientTest extends CamelTestSupport {
         assertEquals("Count", endpoint.getConfiguration().getUnit());
         assertEquals(NOW, endpoint.getConfiguration().getTimestamp());
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void createEndpointWithMinimalS3ClientMisconfiguration() throws Exception {
         CwComponent component = context.getComponent("aws2-cw", CwComponent.class);
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/aws/cw/CwComponentTest.java
index 6f2277b..ef97a86 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/aws/cw/CwComponentTest.java
@@ -17,27 +17,16 @@
 package org.apache.camel.component.aws.cw;
 
 import java.time.Instant;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.camel.BindToRegistry;
 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.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
-import software.amazon.awssdk.services.cloudwatch.model.Dimension;
-import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;
-import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataRequest;
-import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataResponse;
 import software.amazon.awssdk.services.cloudwatch.model.StandardUnit;
 
 public class CwComponentTest extends CamelTestSupport {
@@ -49,14 +38,14 @@ public class CwComponentTest extends CamelTestSupport {
 
     @BindToRegistry("amazonCwClient")
     private CloudWatchClient cloudWatchClient = new CloudWatchClientMock();
-    
+
     @EndpointInject("mock:result")
     private MockEndpoint mock;
 
     @Test
     public void sendMetricFromHeaderValues() throws Exception {
-    	mock.expectedMessageCount(1);
-    	Exchange exchange = template.request("direct:start", new Processor() {
+        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");
@@ -74,8 +63,7 @@ public class CwComponentTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:start")
-                        .to("aws2-cw://camel.apache.org/test?amazonCwClient=#amazonCwClient&name=testMetric&unit=BYTES&timestamp=#now").to("mock:result");
+                from("direct:start").to("aws2-cw://camel.apache.org/test?amazonCwClient=#amazonCwClient&name=testMetric&unit=BYTES&timestamp=#now").to("mock:result");
             }
         };
     }
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/aws/cw/integration/CwComponentIntegrationTest.java
index 755bed0..1b8f36c 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/aws/cw/integration/CwComponentIntegrationTest.java
@@ -53,9 +53,7 @@ public class CwComponentIntegrationTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:start")
-                        .to("aws2-cw://http://camel.apache.org/aws-cw?accessKey=XXX&secretKey=XXX")
-                        .to("mock:result");
+                from("direct:start").to("aws2-cw://http://camel.apache.org/aws-cw?accessKey=XXX&secretKey=XXX").to("mock:result");
             }
         };
     }