[infinispan-commits] Infinispan SVN: r206 - trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds.

[infinispan-commits at lists.jboss.org]

Author: adriancole
Date: 2009-05-01 17:31:32 -0400 (Fri, 01 May 2009)
New Revision: 206

Modified:
   trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsBucket.java
   trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsConnection.java
Log:
updated to latest jclouds snapshot

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsBucket.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsBucket.java	2009-05-01 14:42:11 UTC (rev 205)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsBucket.java	2009-05-01 21:31:32 UTC (rev 206)
@@ -5,6 +5,7 @@
 import org.jclouds.aws.s3.domain.S3Bucket;
 import org.jclouds.aws.s3.domain.S3Object;
 import org.jclouds.aws.s3.S3ObjectMap;
+import org.jclouds.aws.s3.S3InputStreamMap;
 
 import java.io.InputStream;
 import java.util.HashSet;
@@ -32,7 +33,7 @@
         this.connection = connection;
         this.rootS3Bucket = bucket;
         this.name = bucket.getName();
-        this.map = connection.context.createMapView(rootS3Bucket);
+        this.map = connection.context.createInputStreamMap(rootS3Bucket);
     }
 
     public String getName() {
@@ -118,7 +119,7 @@
             if (b.getEntries().isEmpty()) {
                 map.remove(b.getBucketName());
             } else {
-                ((S3ObjectMap)map).putBytes(b.getBucketName(),connection.marshaller.objectToByteBuffer(b));
+                ((S3InputStreamMap)map).putBytes(b.getBucketName(),connection.marshaller.objectToByteBuffer(b));
             }
         } catch (Exception ex) {
             throw connection.convertToS3ConnectionException("Exception while saving bucket " + b, ex);

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsConnection.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsConnection.java	2009-05-01 14:42:11 UTC (rev 205)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/jclouds/JCloudsConnection.java	2009-05-01 21:31:32 UTC (rev 206)
@@ -30,7 +30,7 @@
      * {@inheritDoc}
      */
     public void connect(S3CacheStoreConfig config, Marshaller m) throws S3ConnectionException {
-        InputStream propertiesIS = null;
+        InputStream propertiesIS;
         try {
             propertiesIS = JCloudsConnection.class.getResourceAsStream("/jclouds.properties");
             Properties properties = new Properties();
@@ -67,8 +67,7 @@
      */
     public org.jclouds.aws.s3.domain.S3Bucket verifyOrCreateBucket(String bucketName) throws S3ConnectionException {
         try {
-            org.jclouds.aws.s3.domain.S3Bucket bucket = new org.jclouds.aws.s3.domain.S3Bucket();
-            bucket.setName(bucketName);
+            org.jclouds.aws.s3.domain.S3Bucket bucket = new org.jclouds.aws.s3.domain.S3Bucket(bucketName);
             s3Service.createBucketIfNotExists(bucket).get();
             return bucket;
         } catch (Exception ex) {
@@ -78,9 +77,8 @@
 
     public void destroyBucket(String name) throws S3ConnectionException {
         try {
-            org.jclouds.aws.s3.domain.S3Bucket bucket = new org.jclouds.aws.s3.domain.S3Bucket();
-            bucket.setName(name);
-            context.createMapView(bucket).clear();
+            org.jclouds.aws.s3.domain.S3Bucket bucket = new org.jclouds.aws.s3.domain.S3Bucket(name);
+            context.createS3ObjectMap(bucket).clear();
             s3Service.deleteBucket(bucket);
         } catch (Exception ex) {
             throw convertToS3ConnectionException("Exception removing s3 bucket " + name, ex);
@@ -89,26 +87,23 @@
 
 
     Set<String> keysInBucket(S3Bucket bucket) throws S3ConnectionException {
-        return context.createMapView(bucket).keySet();
+        return context.createS3ObjectMap(bucket).keySet();
     }
 
     /**
      * {@inheritDoc}
      */
     public void copyBucket(String sourceBucket, String destinationBucket) throws S3ConnectionException {
-        Set<String> sourceKeys = null;
+        Set<String> sourceKeys;
         try {
-            S3Bucket source = new S3Bucket();
-            source.setName(sourceBucket);
+            S3Bucket source = new S3Bucket(sourceBucket);
             source = s3Service.getBucket(source).get();
             sourceKeys = keysInBucket(source);
-            S3Bucket dest = new S3Bucket();
-            dest.setName(destinationBucket);
+            S3Bucket dest = new S3Bucket(destinationBucket);
 
             for (String key : sourceKeys) {
                 try {
-                    S3Object object = new S3Object();
-                    object.setKey(key);
+                    S3Object object = new S3Object(key);
                     s3Service.copyObject(source, object, dest, object).get();
                 } catch (Exception ex) {
                     throw convertToS3ConnectionException("Exception while copying key " + key + " from bucket " + sourceBucket, ex);