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 2015/06/30 17:29:08 UTC
[6/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add containerExists tests
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add containerExists tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/116ef33d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/116ef33d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/116ef33d
Branch: refs/heads/master
Commit: 116ef33d49e50e30f2f01f04b637aa369b19f5c0
Parents: c9fee04
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:32 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:32 2015 +0200
----------------------------------------------------------------------
.../component/jclouds/JcloudsBlobStoreProducer.java | 2 +-
.../jclouds/JcloudsBlobStoreProducerTest.java | 16 ++++++++++++++++
.../jclouds/JcloudsSpringBlobstoreTest.java | 9 ++++++++-
.../src/test/resources/blobstore-test.xml | 7 +++++++
4 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/116ef33d/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 ddf1ed9..94574dd 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
@@ -64,7 +64,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
} else if (JcloudsConstants.DELETE_CONTAINER.equals(operation)) {
JcloudsBlobStoreHelper.deleteContainer(blobStore, container);
} else if (JcloudsConstants.CONTAINER_EXISTS.equals(operation)) {
- JcloudsBlobStoreHelper.containerExists(blobStore, container);
+ exchange.getOut().setBody(JcloudsBlobStoreHelper.containerExists(blobStore, container));
} else {
Payload body = exchange.getIn().getBody(Payload.class);
JcloudsBlobStoreHelper.writeBlob(blobStore, container, blobName, body);
http://git-wip-us.apache.org/repos/asf/camel/blob/116ef33d/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
index 67296ec..3aacf79 100644
--- a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
+++ b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
@@ -17,6 +17,8 @@
package org.apache.camel.component.jclouds;
import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.transform.TransformerException;
import javax.xml.transform.sax.SAXSource;
@@ -108,6 +110,17 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
assertEquals(new Long(1), result);
template.requestBodyAndHeader("direct:put-and-delete-container", null, JcloudsConstants.OPERATION, JcloudsConstants.DELETE_CONTAINER);
}
+
+ @Test
+ public void testCheckContainerExists() throws InterruptedException {
+ Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.CONTAINER_EXISTS, Boolean.class);
+ assertEquals(true, result);
+ Map<String,Object> headers = new HashMap<String,Object>();
+ headers.put(JcloudsConstants.OPERATION, JcloudsConstants.CONTAINER_EXISTS);
+ headers.put(JcloudsConstants.CONTAINER_NAME, "otherTest");
+ result = template.requestBodyAndHeaders("direct:container-exists", null, headers, Boolean.class);
+ assertEquals(false, result);
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -145,6 +158,9 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
.setHeader(JcloudsConstants.BLOB_NAME, constant(TEST_BLOB_IN_DIR))
.setHeader(JcloudsConstants.CONTAINER_NAME, constant(TEST_CONTAINER))
.to("jclouds:blobstore:transient");
+
+ from("direct:container-exists")
+ .to("jclouds:blobstore:transient");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/116ef33d/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
index 5c7c462..a250af3 100644
--- a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
+++ b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
@@ -93,6 +93,13 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
@Test
public void testBlobStoreDelete() throws InterruptedException {
- template.requestBody("direct:delete", "Some message");
+ Boolean result = template.requestBody("direct:delete", "Some message", Boolean.class);
+ assertEquals(false, result);
+ }
+
+ @Test
+ public void testBlobStoreContainerExists() throws InterruptedException {
+ Boolean result = template.requestBody("direct:exists", "Some message", Boolean.class);
+ assertEquals(true, result);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/116ef33d/components/camel-jclouds/src/test/resources/blobstore-test.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/test/resources/blobstore-test.xml b/components/camel-jclouds/src/test/resources/blobstore-test.xml
index 212b925..f7ab0be 100644
--- a/components/camel-jclouds/src/test/resources/blobstore-test.xml
+++ b/components/camel-jclouds/src/test/resources/blobstore-test.xml
@@ -73,6 +73,13 @@
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName"/>
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsCountBlobs"/>
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsDeleteContainer"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsExistsContainer"/>
+ </route>
+
+ <route>
+ <from uri="direct:exists"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsExistsContainer"/>
</route>
</camelContext>