Repository: camel Updated Branches: refs/heads/master 6de742bdb -> 864bb35d7
CAMEL-8922: Camel-Jclouds: Use ObjectHelper to check if headers exists, use overloaded getHeader with specified type Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/864bb35d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/864bb35d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/864bb35d Branch: refs/heads/master Commit: 864bb35d7b48b42dfbf49933082cb0ca063d4ae9 Parents: 6de742b Author: Andrea Cosentino <anco...@gmail.com> Authored: Wed Jul 1 18:17:16 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Wed Jul 1 18:17:16 2015 +0200 ---------------------------------------------------------------------- .../component/jclouds/JcloudsBlobStoreProducer.java | 10 +++++----- .../component/jclouds/JcloudsComputeProducer.java | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/864bb35d/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java index 01a42b2..bf837cf 100644 --- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java +++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java @@ -83,7 +83,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer { protected String getBlobName(Exchange exchange) { String blobName = ((JcloudsBlobStoreEndpoint) getEndpoint()).getBlobName(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME))) { - blobName = (String) exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME); + blobName = exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME, String.class); } return blobName; } @@ -94,7 +94,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer { protected String getContainerName(Exchange exchange) { String containerName = ((JcloudsBlobStoreEndpoint) getEndpoint()).getContainer(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.CONTAINER_NAME))) { - containerName = (String) exchange.getIn().getHeader(JcloudsConstants.CONTAINER_NAME); + containerName = exchange.getIn().getHeader(JcloudsConstants.CONTAINER_NAME, String.class); } return containerName; } @@ -106,7 +106,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer { String operation = ((JcloudsBlobStoreEndpoint) getEndpoint()).getOperation(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.OPERATION))) { - operation = (String) exchange.getIn().getHeader(JcloudsConstants.OPERATION); + operation = exchange.getIn().getHeader(JcloudsConstants.OPERATION, String.class); } return operation; } @@ -118,7 +118,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer { String operation = ((JcloudsBlobStoreEndpoint) getEndpoint()).getLocationId(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.LOCATION_ID))) { - operation = (String) exchange.getIn().getHeader(JcloudsConstants.LOCATION_ID); + operation = exchange.getIn().getHeader(JcloudsConstants.LOCATION_ID, String.class); } return operation; } @@ -130,7 +130,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer { List blobNames = new ArrayList<>(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME_LIST))) { - blobNames = (List) exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME_LIST); + blobNames = exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME_LIST, List.class); } return blobNames; } http://git-wip-us.apache.org/repos/asf/camel/blob/864bb35d/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java index 4bc01d8..b730595f 100644 --- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java +++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java @@ -264,7 +264,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String operation = getEndpoint().getOperation(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.OPERATION))) { - operation = (String) exchange.getIn().getHeader(JcloudsConstants.OPERATION); + operation = exchange.getIn().getHeader(JcloudsConstants.OPERATION, String.class); } return operation; } @@ -300,7 +300,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String imageId = getEndpoint().getImageId(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.IMAGE_ID))) { - imageId = (String) exchange.getIn().getHeader(JcloudsConstants.IMAGE_ID); + imageId = exchange.getIn().getHeader(JcloudsConstants.IMAGE_ID, String.class); } return imageId; } @@ -312,7 +312,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String hardwareId = getEndpoint().getHardwareId(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.HARDWARE_ID))) { - hardwareId = (String) exchange.getIn().getHeader(JcloudsConstants.HARDWARE_ID); + hardwareId = exchange.getIn().getHeader(JcloudsConstants.HARDWARE_ID, String.class); } return hardwareId; } @@ -324,7 +324,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String locationId = getEndpoint().getLocationId(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.LOCATION_ID))) { - locationId = (String) exchange.getIn().getHeader(JcloudsConstants.LOCATION_ID); + locationId = exchange.getIn().getHeader(JcloudsConstants.LOCATION_ID, String.class); } return locationId; } @@ -336,7 +336,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String nodeId = getEndpoint().getNodeId(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.NODE_ID))) { - nodeId = (String) exchange.getIn().getHeader(JcloudsConstants.NODE_ID); + nodeId = exchange.getIn().getHeader(JcloudsConstants.NODE_ID, String.class); } return nodeId; } @@ -348,7 +348,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String group = getEndpoint().getGroup(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.GROUP))) { - group = (String) exchange.getIn().getHeader(JcloudsConstants.GROUP); + group = exchange.getIn().getHeader(JcloudsConstants.GROUP, String.class); } return group; } @@ -360,7 +360,7 @@ public class JcloudsComputeProducer extends JcloudsProducer { String user = getEndpoint().getUser(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.USER))) { - user = (String) exchange.getIn().getHeader(JcloudsConstants.USER); + user = exchange.getIn().getHeader(JcloudsConstants.USER, String.class); } return user; }
