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:03 UTC
[1/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add clearContainer operation
Repository: camel
Updated Branches:
refs/heads/master 0704f7e61 -> bd55ef8b3
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add clearContainer operation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5439702d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5439702d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5439702d
Branch: refs/heads/master
Commit: 5439702d0a7de2e9bd5f6a6241cd16f1f349ae9d
Parents: 0704f7e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:26:59 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:26:59 2015 +0200
----------------------------------------------------------------------
.../camel/component/jclouds/JcloudsBlobStoreHelper.java | 9 ++++++++-
.../camel/component/jclouds/JcloudsBlobStoreProducer.java | 4 +++-
.../apache/camel/component/jclouds/JcloudsConstants.java | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5439702d/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
index 27fcec9..25f0a41 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
@@ -107,11 +107,18 @@ public final class JcloudsBlobStoreHelper {
/**
- * Reads from a {@link BlobStore}. It returns an Object.
+ * Remove a specific blob from a {@link BlobStore}
*/
public static void removeBlob(BlobStore blobStore, String container, String blobName) throws IOException {
if (!Strings.isNullOrEmpty(blobName)) {
blobStore.removeBlob(container, blobName);
}
}
+
+ /**
+ * Clear a {@link BlobStore} specific container
+ */
+ public static void clearContainer(BlobStore blobStore, String container) throws IOException {
+ blobStore.clearContainer(container);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5439702d/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 4ab5ddc..763531e 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
@@ -57,8 +57,10 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
exchange.getOut().setBody(JcloudsBlobStoreHelper.readBlob(blobStore, container, blobName));
} else if (JcloudsConstants.COUNT_BLOBS.equals(operation)) {
exchange.getOut().setBody(JcloudsBlobStoreHelper.countBlob(blobStore, container));
- } else if (JcloudsConstants.REMOVE_BLOB.equals(operation)) {
+ } else if (JcloudsConstants.REMOVE_BLOB.equals(operation)) {
JcloudsBlobStoreHelper.removeBlob(blobStore, container, blobName);
+ } else if (JcloudsConstants.CLEAR_CONTAINER.equals(operation)) {
+ JcloudsBlobStoreHelper.clearContainer(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/5439702d/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
index 6b60a03..3d2d90e 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
@@ -30,6 +30,7 @@ public final class JcloudsConstants {
public static final String GET = "CamelJcloudsGet";
public static final String COUNT_BLOBS = "CamelJcloudsCountBlobs";
public static final String REMOVE_BLOB = "CamelJcloudsRemoveBlob";
+ public static final String CLEAR_CONTAINER = "CamelJcloudsClearContainer";
public static final String LIST_IMAGES = "CamelJcloudsListImages";
public static final String LIST_HARDWARE = "CamelJcloudsListHardware";
public static final String LIST_NODES = "CamelJcloudsListNodes";
[4/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add deleteContainer tests
Posted by ac...@apache.org.
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add deleteContainer tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f604eded
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f604eded
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f604eded
Branch: refs/heads/master
Commit: f604eded1881de640bfe3019a9bb0e8f96d34b43
Parents: f912c23
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:20 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:20 2015 +0200
----------------------------------------------------------------------
.../jclouds/JcloudsBlobStoreProducerTest.java | 14 ++++++++++++++
.../component/jclouds/JcloudsSpringBlobstoreTest.java | 5 +++++
.../src/test/resources/blobstore-test.xml | 7 +++++++
3 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f604eded/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 75aa0ab..67296ec 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
@@ -99,6 +99,15 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
assertEquals(new Long(0), result);
}
+
+ @Test
+ public void testBlobStorePutAndDeleteContainer() throws InterruptedException {
+ String message = "Some message";
+ template.sendBody("direct:put-and-delete-container", message);
+ Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
+ assertEquals(new Long(1), result);
+ template.requestBodyAndHeader("direct:put-and-delete-container", null, JcloudsConstants.OPERATION, JcloudsConstants.DELETE_CONTAINER);
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -131,6 +140,11 @@ 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:put-and-delete-container")
+ .setHeader(JcloudsConstants.BLOB_NAME, constant(TEST_BLOB_IN_DIR))
+ .setHeader(JcloudsConstants.CONTAINER_NAME, constant(TEST_CONTAINER))
+ .to("jclouds:blobstore:transient");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f604eded/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 e2c03ea..5c7c462 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
@@ -90,4 +90,9 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
Long count = template.requestBody("direct:clear", "Some message", Long.class);
assertEquals(new Long(0), count);
}
+
+ @Test
+ public void testBlobStoreDelete() throws InterruptedException {
+ template.requestBody("direct:delete", "Some message");
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f604eded/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 2294b66..212b925 100644
--- a/components/camel-jclouds/src/test/resources/blobstore-test.xml
+++ b/components/camel-jclouds/src/test/resources/blobstore-test.xml
@@ -67,6 +67,13 @@
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsClearContainer"/>
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsCountBlobs"/>
</route>
+
+ <route>
+ <from uri="direct:delete"/>
+ <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"/>
+ </route>
</camelContext>
[3/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add deleteContainer operation
Posted by ac...@apache.org.
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add deleteContainer operation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f912c236
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f912c236
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f912c236
Branch: refs/heads/master
Commit: f912c23623b868188819b3eb7a57a88bf454a45e
Parents: 5bad8c0
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:15 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:15 2015 +0200
----------------------------------------------------------------------
.../camel/component/jclouds/JcloudsBlobStoreHelper.java | 7 +++++++
.../camel/component/jclouds/JcloudsBlobStoreProducer.java | 2 ++
.../org/apache/camel/component/jclouds/JcloudsConstants.java | 1 +
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f912c236/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
index 25f0a41..dbd2a68 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
@@ -121,4 +121,11 @@ public final class JcloudsBlobStoreHelper {
public static void clearContainer(BlobStore blobStore, String container) throws IOException {
blobStore.clearContainer(container);
}
+
+ /**
+ * Delete a {@link BlobStore} specific container
+ */
+ public static void deleteContainer(BlobStore blobStore, String container) throws IOException {
+ blobStore.deleteContainer(container);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f912c236/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 763531e..ea6ed0d 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
@@ -61,6 +61,8 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
JcloudsBlobStoreHelper.removeBlob(blobStore, container, blobName);
} else if (JcloudsConstants.CLEAR_CONTAINER.equals(operation)) {
JcloudsBlobStoreHelper.clearContainer(blobStore, container);
+ } else if (JcloudsConstants.DELETE_CONTAINER.equals(operation)) {
+ JcloudsBlobStoreHelper.deleteContainer(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/f912c236/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
index 3d2d90e..7a994bb 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
@@ -31,6 +31,7 @@ public final class JcloudsConstants {
public static final String COUNT_BLOBS = "CamelJcloudsCountBlobs";
public static final String REMOVE_BLOB = "CamelJcloudsRemoveBlob";
public static final String CLEAR_CONTAINER = "CamelJcloudsClearContainer";
+ public static final String DELETE_CONTAINER = "CamelJcloudsDeleteContainer";
public static final String LIST_IMAGES = "CamelJcloudsListImages";
public static final String LIST_HARDWARE = "CamelJcloudsListHardware";
public static final String LIST_NODES = "CamelJcloudsListNodes";
[7/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add removeBlobs operation
Posted by ac...@apache.org.
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add removeBlobs operation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ccb77a4d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ccb77a4d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ccb77a4d
Branch: refs/heads/master
Commit: ccb77a4d4aa0fba39d4a781c4fb0fa0edff061a5
Parents: 116ef33
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:38 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:38 2015 +0200
----------------------------------------------------------------------
.../jclouds/JcloudsBlobStoreHelper.java | 10 ++++++++++
.../jclouds/JcloudsBlobStoreProducer.java | 20 +++++++++++++++++++-
.../component/jclouds/JcloudsConstants.java | 2 ++
3 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ccb77a4d/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
index 3ce1d57..6ec6c7e 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
@@ -18,15 +18,18 @@ package org.apache.camel.component.jclouds;
import java.io.IOException;
import java.io.InputStream;
+import java.util.List;
import javax.ws.rs.core.MediaType;
import com.google.common.base.Strings;
+
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.util.BlobStoreUtils;
import org.jclouds.domain.Location;
import org.jclouds.io.Payload;
+
import static org.jclouds.blobstore.options.PutOptions.Builder.multipart;
public final class JcloudsBlobStoreHelper {
@@ -136,4 +139,11 @@ public final class JcloudsBlobStoreHelper {
boolean result = blobStore.containerExists(container);
return result;
}
+
+ /**
+ * Delete a list of {@link BlobStore} blob
+ */
+ public static void removeBlobs(BlobStore blobStore, String container, List blobNames) throws IOException {
+ blobStore.removeBlobs(container, blobNames);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ccb77a4d/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 94574dd..b5735c5 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
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.jclouds;
-import org.apache.camel.Exchange;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.camel.Exchange;
+import org.apache.camel.util.ObjectHelper;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.io.Payload;
import org.slf4j.Logger;
@@ -49,6 +52,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
String container = getContainerName(exchange);
String blobName = getBlobName(exchange);
String operation = getOperation(exchange);
+ List blobNames = getBlobNameList(exchange);
if (LOG.isTraceEnabled()) {
LOG.trace("Processing {} operation on '{}'", operation, container + "/" + blobName);
@@ -65,6 +69,8 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
JcloudsBlobStoreHelper.deleteContainer(blobStore, container);
} else if (JcloudsConstants.CONTAINER_EXISTS.equals(operation)) {
exchange.getOut().setBody(JcloudsBlobStoreHelper.containerExists(blobStore, container));
+ } else if (JcloudsConstants.REMOVE_BLOBS.equals(operation)) {
+ JcloudsBlobStoreHelper.removeBlobs(blobStore, container, blobNames);
} else {
Payload body = exchange.getIn().getBody(Payload.class);
JcloudsBlobStoreHelper.writeBlob(blobStore, container, blobName, body);
@@ -116,4 +122,16 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
}
return operation;
}
+
+ /**
+ * Retrieves the Blob name list from the exchange headers.
+ */
+ public List getBlobNameList(Exchange exchange) {
+ List blobNames = new ArrayList<>();
+
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME_LIST))) {
+ blobNames = (List) exchange.getIn().getHeader(JcloudsConstants.BLOB_NAME_LIST);
+ }
+ return blobNames;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ccb77a4d/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
index 8819e54..b574fed 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
@@ -22,6 +22,7 @@ public final class JcloudsConstants {
public static final String COMPUTE = "compute";
public static final String BLOB_NAME = "CamelJcloudsBlobName";
public static final String CONTAINER_NAME = "CamelJcloudsContainerName";
+ public static final String BLOB_NAME_LIST = "CamelJcloudsBlobNameList";
public static final String NODE_STATE = "CamelJcloudsNodeState";
@@ -30,6 +31,7 @@ public final class JcloudsConstants {
public static final String GET = "CamelJcloudsGet";
public static final String COUNT_BLOBS = "CamelJcloudsCountBlobs";
public static final String REMOVE_BLOB = "CamelJcloudsRemoveBlob";
+ public static final String REMOVE_BLOBS = "CamelJcloudsRemoveBlobs";
public static final String CLEAR_CONTAINER = "CamelJcloudsClearContainer";
public static final String DELETE_CONTAINER = "CamelJcloudsDeleteContainer";
public static final String CONTAINER_EXISTS = "CamelJcloudsExistsContainer";
[5/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add containerExists operation
Posted by ac...@apache.org.
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add containerExists operation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9fee04b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9fee04b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9fee04b
Branch: refs/heads/master
Commit: c9fee04b2588e635b210a23cc505d01ca97ba8a2
Parents: f604ede
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:26 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:26 2015 +0200
----------------------------------------------------------------------
.../camel/component/jclouds/JcloudsBlobStoreHelper.java | 8 ++++++++
.../camel/component/jclouds/JcloudsBlobStoreProducer.java | 2 ++
.../org/apache/camel/component/jclouds/JcloudsConstants.java | 1 +
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c9fee04b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
index dbd2a68..3ce1d57 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
@@ -128,4 +128,12 @@ public final class JcloudsBlobStoreHelper {
public static void deleteContainer(BlobStore blobStore, String container) throws IOException {
blobStore.deleteContainer(container);
}
+
+ /**
+ * Check if a {@link BlobStore} specific container exists or not
+ */
+ public static boolean containerExists(BlobStore blobStore, String container) throws IOException {
+ boolean result = blobStore.containerExists(container);
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c9fee04b/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 ea6ed0d..ddf1ed9 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
@@ -63,6 +63,8 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
JcloudsBlobStoreHelper.clearContainer(blobStore, container);
} else if (JcloudsConstants.DELETE_CONTAINER.equals(operation)) {
JcloudsBlobStoreHelper.deleteContainer(blobStore, container);
+ } else if (JcloudsConstants.CONTAINER_EXISTS.equals(operation)) {
+ 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/c9fee04b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
index 7a994bb..8819e54 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
@@ -32,6 +32,7 @@ public final class JcloudsConstants {
public static final String REMOVE_BLOB = "CamelJcloudsRemoveBlob";
public static final String CLEAR_CONTAINER = "CamelJcloudsClearContainer";
public static final String DELETE_CONTAINER = "CamelJcloudsDeleteContainer";
+ public static final String CONTAINER_EXISTS = "CamelJcloudsExistsContainer";
public static final String LIST_IMAGES = "CamelJcloudsListImages";
public static final String LIST_HARDWARE = "CamelJcloudsListHardware";
public static final String LIST_NODES = "CamelJcloudsListNodes";
[9/9] camel git commit: Fixed CS
Posted by ac...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd55ef8b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd55ef8b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd55ef8b
Branch: refs/heads/master
Commit: bd55ef8b362623bb88c27f52fb3e1072c03bbffb
Parents: 97236b5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:49 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:49 2015 +0200
----------------------------------------------------------------------
.../camel/component/jclouds/JcloudsBlobStoreProducerTest.java | 4 ++--
.../camel/component/jclouds/JcloudsSpringBlobstoreTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bd55ef8b/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 0590d9d..35f6eed 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
@@ -117,7 +117,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
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>();
+ 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);
@@ -131,7 +131,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
assertEquals(new Long(1), result);
List blobsToRemove = new ArrayList<>();
blobsToRemove.add(TEST_BLOB_IN_DIR);
- Map<String,Object> headers = new HashMap<String,Object>();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put(JcloudsConstants.OPERATION, JcloudsConstants.REMOVE_BLOBS);
headers.put(JcloudsConstants.CONTAINER_NAME, TEST_CONTAINER);
headers.put(JcloudsConstants.BLOB_NAME_LIST, blobsToRemove);
http://git-wip-us.apache.org/repos/asf/camel/blob/bd55ef8b/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 12a5b76..2834ffa 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
@@ -112,7 +112,7 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
assertEquals(true, result);
List blobsToRemove = new ArrayList<>();
blobsToRemove.add("testName");
- Map<String,Object> headers = new HashMap<String,Object>();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put(JcloudsConstants.OPERATION, JcloudsConstants.REMOVE_BLOBS);
headers.put(JcloudsConstants.CONTAINER_NAME, "foo");
headers.put(JcloudsConstants.BLOB_NAME_LIST, blobsToRemove);
[8/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add removeBlobs tests
Posted by ac...@apache.org.
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add removeBlobs tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97236b5a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97236b5a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97236b5a
Branch: refs/heads/master
Commit: 97236b5a75c747e73abff0f17a1fbec328744065
Parents: ccb77a4
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:42 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:43 2015 +0200
----------------------------------------------------------------------
.../jclouds/JcloudsBlobStoreProducerTest.java | 21 ++++++++++++++++++++
.../jclouds/JcloudsSpringBlobstoreTest.java | 18 +++++++++++++++++
.../src/test/resources/blobstore-test.xml | 10 ++++++++++
3 files changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/97236b5a/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 3aacf79..0590d9d 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,7 +17,9 @@
package org.apache.camel.component.jclouds;
import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.xml.transform.TransformerException;
@@ -121,6 +123,22 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
result = template.requestBodyAndHeaders("direct:container-exists", null, headers, Boolean.class);
assertEquals(false, result);
}
+
+ @Test
+ public void testRemoveBlobs() throws InterruptedException {
+ template.sendBody("direct:put", "test message");
+ Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
+ assertEquals(new Long(1), result);
+ List blobsToRemove = new ArrayList<>();
+ blobsToRemove.add(TEST_BLOB_IN_DIR);
+ Map<String,Object> headers = new HashMap<String,Object>();
+ headers.put(JcloudsConstants.OPERATION, JcloudsConstants.REMOVE_BLOBS);
+ headers.put(JcloudsConstants.CONTAINER_NAME, TEST_CONTAINER);
+ headers.put(JcloudsConstants.BLOB_NAME_LIST, blobsToRemove);
+ template.sendBodyAndHeaders("direct:remove-blobs", null, headers);
+ result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
+ assertEquals(new Long(0), result);
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -161,6 +179,9 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
from("direct:container-exists")
.to("jclouds:blobstore:transient");
+
+ from("direct:remove-blobs")
+ .to("jclouds:blobstore:transient");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/97236b5a/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 a250af3..12a5b76 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
@@ -16,7 +16,10 @@
*/
package org.apache.camel.component.jclouds;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.camel.EndpointInject;
@@ -102,4 +105,19 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
Boolean result = template.requestBody("direct:exists", "Some message", Boolean.class);
assertEquals(true, result);
}
+
+ @Test
+ public void testBlobStoreRemoveBlobs() throws InterruptedException {
+ Boolean result = template.requestBody("direct:exists", "Some message", Boolean.class);
+ assertEquals(true, result);
+ List blobsToRemove = new ArrayList<>();
+ blobsToRemove.add("testName");
+ Map<String,Object> headers = new HashMap<String,Object>();
+ headers.put(JcloudsConstants.OPERATION, JcloudsConstants.REMOVE_BLOBS);
+ headers.put(JcloudsConstants.CONTAINER_NAME, "foo");
+ headers.put(JcloudsConstants.BLOB_NAME_LIST, blobsToRemove);
+ template.sendBodyAndHeaders("direct:remove-blobs", null, headers);
+ Long count = template.requestBody("direct:count-after-remove-blobs", null, Long.class);
+ assertEquals(new Long(0), count);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/97236b5a/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 f7ab0be..ffb4530 100644
--- a/components/camel-jclouds/src/test/resources/blobstore-test.xml
+++ b/components/camel-jclouds/src/test/resources/blobstore-test.xml
@@ -81,6 +81,16 @@
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName"/>
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsExistsContainer"/>
</route>
+
+ <route>
+ <from uri="direct:remove-blobs"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsExistsContainer"/>
+ </route>
+
+ <route>
+ <from uri="direct:count-after-remove-blobs"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsCountBlobs"/>
+ </route>
</camelContext>
[2/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add clearContainer tests
Posted by ac...@apache.org.
CAMEL-8920 Camel-JClouds: Add new operations to Blobstore component, add clearContainer tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5bad8c08
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5bad8c08
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5bad8c08
Branch: refs/heads/master
Commit: 5bad8c08440a8ce84b6b6daec3be67e40843b178
Parents: 5439702
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 30 17:27:09 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 30 17:27:09 2015 +0200
----------------------------------------------------------------------
.../jclouds/JcloudsBlobStoreProducerTest.java | 16 ++++++++++++++++
.../jclouds/JcloudsSpringBlobstoreTest.java | 6 ++++++
.../src/test/resources/blobstore-test.xml | 7 +++++++
3 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5bad8c08/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 7af8ff3..75aa0ab 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
@@ -88,6 +88,17 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
Object result = template.requestBodyAndHeader("direct:put-and-remove", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
assertEquals(new Long(0), result);
}
+
+ @Test
+ public void testBlobStorePutAndClear() throws InterruptedException {
+ String message = "Some message";
+ template.sendBody("direct:put-and-clear", message);
+ Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
+ assertEquals(new Long(1), result);
+ template.requestBodyAndHeader("direct:put-and-clear", null, JcloudsConstants.OPERATION, JcloudsConstants.CLEAR_CONTAINER);
+ result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION, JcloudsConstants.COUNT_BLOBS, Long.class);
+ assertEquals(new Long(0), result);
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -115,6 +126,11 @@ 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:put-and-clear")
+ .setHeader(JcloudsConstants.BLOB_NAME, constant(TEST_BLOB_IN_DIR))
+ .setHeader(JcloudsConstants.CONTAINER_NAME, constant(TEST_CONTAINER))
+ .to("jclouds:blobstore:transient");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5bad8c08/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 70378a4..e2c03ea 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
@@ -84,4 +84,10 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
Long count = template.requestBody("direct:remove", "Some message", Long.class);
assertEquals(new Long(0), count);
}
+
+ @Test
+ public void testBlobStoreClear() throws InterruptedException {
+ Long count = template.requestBody("direct:clear", "Some message", Long.class);
+ assertEquals(new Long(0), count);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5bad8c08/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 7746e55..2294b66 100644
--- a/components/camel-jclouds/src/test/resources/blobstore-test.xml
+++ b/components/camel-jclouds/src/test/resources/blobstore-test.xml
@@ -60,6 +60,13 @@
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsRemoveBlob"/>
<to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsCountBlobs"/>
</route>
+
+ <route>
+ <from uri="direct:clear"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsClearContainer"/>
+ <to uri="jclouds:blobstore:transient?container=foo&blobName=testName&operation=CamelJcloudsCountBlobs"/>
+ </route>
</camelContext>
[6/9] camel git commit: CAMEL-8920 Camel-JClouds: Add new operations
to Blobstore component, add containerExists tests
Posted by ac...@apache.org.
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>