---

mziccard · mziccard · commit c244d75fe952 · 2015-10-14T19:16:46.000+02:00
yaml --- r: 6307 b: refs/heads/tswast-patch-1 c: 3011587 h: refs/heads/master i: 6305: 8bb554d 6303: 2358851
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 3310a826c7c107b05ad06cc7c52e349b773368c0
+refs/heads/tswast-patch-1: 301158716e84080b654dd47e623f35f0ef845087
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/README.md b/branches/tswast-patch-1/README.md
@@ -25,7 +25,7 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java</artifactId>
-  <version>0.0.10</version>
+  <version>0.0.9</version>
 </dependency>
 ```
 
diff --git a/branches/tswast-patch-1/gcloud-java-core/README.md b/branches/tswast-patch-1/gcloud-java-core/README.md
@@ -17,7 +17,7 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java-core</artifactId>
-  <version>0.0.10</version>
+  <version>0.0.9</version>
 </dependency>
 ```
 
diff --git a/branches/tswast-patch-1/gcloud-java-core/pom.xml b/branches/tswast-patch-1/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.gcloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.0.11-SNAPSHOT</version>
+    <version>0.0.10-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/README.md b/branches/tswast-patch-1/gcloud-java-datastore/README.md
@@ -20,7 +20,7 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java-datastore</artifactId>
-  <version>0.0.10</version>
+  <version>0.0.9</version>
 </dependency>
 ```
 
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/pom.xml b/branches/tswast-patch-1/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.gcloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.0.11-SNAPSHOT</version>
+    <version>0.0.10-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/branches/tswast-patch-1/gcloud-java-examples/README.md b/branches/tswast-patch-1/gcloud-java-examples/README.md
@@ -17,7 +17,7 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java-examples</artifactId>
-  <version>0.0.10</version>
+  <version>0.0.9</version>
 </dependency>
 ```
 
diff --git a/branches/tswast-patch-1/gcloud-java-examples/pom.xml b/branches/tswast-patch-1/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.gcloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.0.11-SNAPSHOT</version>
+    <version>0.0.10-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -52,7 +52,6 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -96,22 +95,6 @@ protected String params() {
     }
   }
 
-  private static abstract class BlobAction extends StorageAction<Blob> {
-
-    @Override
-    Blob parse(Storage storage, String... args) {
-      if (args.length != 2) {
-        throw new IllegalArgumentException();
-      }
-      return new Blob(storage, args[0], args[1]);
-    }
-
-    @Override
-    public String params() {
-      return "<bucket> <path>";
-    }
-  }
-
   private static abstract class BlobsAction extends StorageAction<Blob[]> {
 
     @Override
@@ -121,7 +104,7 @@ Blob[] parse(Storage storage, String... args) {
       }
       Blob[] blobs = new Blob[args.length - 1];
       for (int i = 1; i < args.length; i++) {
-        blobs[i - 1] = new Blob(storage, args[0], args[i]);
+        blobs[i - 1] = Blob.load(storage, args[0], args[i]);
       }
       return blobs;
     }
@@ -145,11 +128,11 @@ public void run(Storage storage, Blob... blobs) {
       if (blobs.length == 1) {
         if (blobs[0].info().name().isEmpty()) {
           // get Bucket
-          Bucket bucket = new Bucket(storage, blobs[0].info().bucket());
-          System.out.println("Bucket info: " + bucket.reload().info());
+          Bucket bucket = Bucket.load(storage, blobs[0].info().bucket());
+          System.out.println("Bucket info: " + bucket.info());
         } else {
           // get Blob
-          System.out.println("Blob info: " + blobs[0].reload().info());
+          System.out.println("Blob info: " + blobs[0].info());
         }
       } else {
         // use batch to get multiple blobs.
@@ -167,7 +150,7 @@ public void run(Storage storage, Blob... blobs) {
     @Override
     Blob[] parse(Storage storage, String... args) {
       if (args.length < 2) {
-        return new Blob[] {new Blob(storage, args[0], "")};
+        return new Blob[] {new Blob(storage, BlobInfo.builder(args[0], "").build())};
       }
       return super.parse(storage, args);
     }
@@ -239,7 +222,7 @@ public void run(Storage storage, String bucketName) {
         }
       } else {
         // list a bucket's blobs
-        Bucket bucket = new Bucket(storage, bucketName);
+        Bucket bucket = Bucket.load(storage, bucketName);
         for (Blob b : bucket.list()) {
           System.out.println(b.info());
         }
@@ -321,7 +304,6 @@ public void run(Storage storage, Tuple<Blob, Path> tuple) throws IOException {
     }
 
     private void run(Storage storage, Blob blob, Path downloadTo) throws IOException {
-      blob = blob.reload();
       if (!blob.exists()) {
         System.out.println("No such object");
         return;
@@ -367,7 +349,7 @@ Tuple<Blob, Path> parse(Storage storage, String... args) {
       } else {
         path = null;
       }
-      return Tuple.of(new Blob(storage, args[0], args[1]), path);
+      return Tuple.of(Blob.load(storage, args[0], args[1]), path);
     }
 
     @Override
@@ -448,7 +430,6 @@ public void run(Storage storage, Tuple<Blob, Map<String, String>> tuple)
     }
 
     private void run(Storage storage, Blob blob, Map<String, String> metadata) {
-      blob = blob.reload();
       if (!blob.exists()) {
         System.out.println("No such object");
         return;
@@ -462,7 +443,7 @@ Tuple<Blob, Map<String, String>> parse(Storage storage, String... args) {
       if (args.length < 2) {
         throw new IllegalArgumentException();
       }
-      Blob blob = new Blob(storage, args[0], args[1]);
+      Blob blob = Blob.load(storage, args[0], args[1]);
       Map<String, String> metadata = new HashMap<>();
       for (int i = 2; i < args.length; i++) {
         int idx = args[i].indexOf('=');
@@ -515,7 +496,7 @@ Tuple<ServiceAccountAuthCredentials, Blob> parse(Storage storage, String... args
       keystore.load(Files.newInputStream(Paths.get(args[0])), PASSWORD);
       PrivateKey privateKey = (PrivateKey) keystore.getKey("privatekey", PASSWORD);
       ServiceAccountAuthCredentials cred = AuthCredentials.createFor(args[1], privateKey);
-      return Tuple.of(cred, new Blob(storage, args[2], args[3]));
+      return Tuple.of(cred, Blob.load(storage, args[2], args[3]));
     }
 
     @Override
diff --git a/branches/tswast-patch-1/gcloud-java-storage/README.md b/branches/tswast-patch-1/gcloud-java-storage/README.md
@@ -20,7 +20,7 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java-storage</artifactId>
-  <version>0.0.10</version>
+  <version>0.0.9</version>
 </dependency>
 ```
 
diff --git a/branches/tswast-patch-1/gcloud-java-storage/pom.xml b/branches/tswast-patch-1/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.gcloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.0.11-SNAPSHOT</version>
+    <version>0.0.10-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -109,28 +109,27 @@ public Blob(Storage storage, BlobInfo info) {
   }
 
   /**
-   * Constructs a {@code Blob} object for the provided bucket and blob names. The storage service is
-   * used to issue requests.
+   * Creates a {@code Blob} object for the provided bucket and blob names. Performs an RPC call to
+   * get the latest blob information.
    * 
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
    * @param blob blob's name
    */
-  public Blob(Storage storage, String bucket, String blob) {
-    this.storage = checkNotNull(storage);
-    this.info = BlobInfo.builder(BlobId.of(bucket, blob)).build();
+  public static Blob load(Storage storage, String bucket, String blob) {
+    return load(storage, BlobId.of(bucket, blob));
   }
 
   /**
-   * Constructs a {@code Blob} object for the provided {@code BlobId}. The storage service is used
-   * to issue requests.
+   * Creates a {@code Blob} object for the provided {@code blobId}. Performs an RPC call to get the
+   * latest blob information.
    * 
    * @param storage the storage service used for issuing requests
    * @param blobId blob's identifier
    */
-  public Blob(Storage storage, BlobId blobId) {
-    this.storage = checkNotNull(storage);
-    this.info = BlobInfo.builder(blobId).build();
+  public static Blob load(Storage storage, BlobId blobId) {
+    BlobInfo info = storage.get(blobId);
+    return new Blob(storage, info);
   }
 
   /**
@@ -209,9 +208,8 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
    */
   public Blob copyTo(BlobId targetBlob, BlobSourceOption... options) {
     BlobInfo updatedInfo = info.toBuilder().blobId(targetBlob).build();
-    CopyRequest copyRequest =
-        CopyRequest.builder().source(info.bucket(), info.name())
-            .sourceOptions(convert(info, options)).target(updatedInfo).build();
+    CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
+        .sourceOptions(convert(info, options)).target(updatedInfo).build();
     return new Blob(storage, storage.copy(copyRequest));
   }
 
@@ -251,9 +249,8 @@ public Blob copyTo(String targetBucket, BlobSourceOption... options) {
    */
   public Blob copyTo(String targetBucket, String targetBlob, BlobSourceOption... options) {
     BlobInfo updatedInfo = info.toBuilder().blobId(BlobId.of(targetBucket, targetBlob)).build();
-    CopyRequest copyRequest =
-        CopyRequest.builder().source(info.bucket(), info.name())
-            .sourceOptions(convert(info, options)).target(updatedInfo).build();
+    CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
+        .sourceOptions(convert(info, options)).target(updatedInfo).build();
     return new Blob(storage, storage.copy(copyRequest));
   }
 
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -56,15 +56,15 @@ public Bucket(Storage storage, BucketInfo info) {
   }
 
   /**
-   * Constructs a {@code Bucket} object for the provided name. The storage service is used to issue
-   * requests.
+   * Creates a {@code Bucket} object for the provided bucket name. Performs an RPC call to get the
+   * latest bucket information.
    * 
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
    */
-  public Bucket(Storage storage, String bucket) {
-    this.storage = checkNotNull(storage);
-    this.info = BucketInfo.of(checkNotNull(bucket));
+  public static Bucket load(Storage storage, String bucket) {
+    BucketInfo info = storage.get(bucket);
+    return new Bucket(storage, info);
   }
 
   /**
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -271,4 +271,20 @@ public void testDeleteSome() throws Exception {
       assertEquals(deleleResultList.get(i), result.get(i));
     }
   }
+
+  @Test
+  public void testLoadFromString() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId())).andReturn(BLOB_INFO);
+    replay(storage);
+    Blob loadedBlob = Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name());
+    assertEquals(BLOB_INFO, loadedBlob.info());
+  }
+
+  @Test
+  public void testLoadFromId() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId())).andReturn(BLOB_INFO);
+    replay(storage);
+    Blob loadedBlob = Blob.load(storage, BLOB_INFO.blobId());
+    assertEquals(BLOB_INFO, loadedBlob.info());
+  }
 }
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -168,4 +168,12 @@ public void testCreate() throws Exception {
     Blob blob = bucket.create("n", content);
     assertEquals(info, blob.info());
   }
+
+  @Test
+  public void testLoad() throws Exception {
+    expect(storage.get(BUCKET_INFO.name())).andReturn(BUCKET_INFO);
+    replay(storage);
+    Bucket loadedBucket = Bucket.load(storage, BUCKET_INFO.name());
+    assertEquals(BUCKET_INFO, loadedBucket.info());
+  }
 }
diff --git a/branches/tswast-patch-1/gcloud-java/README.md b/branches/tswast-patch-1/gcloud-java/README.md
@@ -25,7 +25,7 @@ Add this to your pom.xml file
 <dependency>
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java</artifactId>
-  <version>0.0.10</version>
+  <version>0.0.9</version>
 </dependency>
 ```
 
diff --git a/branches/tswast-patch-1/gcloud-java/pom.xml b/branches/tswast-patch-1/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.gcloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.0.11-SNAPSHOT</version>
+    <version>0.0.10-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/branches/tswast-patch-1/pom.xml b/branches/tswast-patch-1/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java-pom</artifactId>
   <packaging>pom</packaging>
-  <version>0.0.11-SNAPSHOT</version>
+  <version>0.0.10-SNAPSHOT</version>
   <name>GCloud Java</name>
   <url>https://github.com/GoogleCloudPlatform/gcloud-java</url>
   <description>
diff --git a/branches/tswast-patch-1/utilities/after_success.sh b/branches/tswast-patch-1/utilities/after_success.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-source ./utilities/integration_test_env.sh
 
 # This script is used by Travis-CI to publish artifacts (binary, sorce and javadoc jars) when releasing snapshots.
 # This script is referenced in .travis.yml.
@@ -33,9 +32,9 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
 
         cd ..
         utilities/update_docs_version.sh # Update version in READMEs
-        mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
+        mvn deploy -DskipTests=true --settings target/travis/settings.xml -P sign-deploy
     else
-        mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
+        mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
     fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."
diff --git a/branches/tswast-patch-1/utilities/integration_test_env.sh b/branches/tswast-patch-1/utilities/integration_test_env.sh
diff --git a/branches/tswast-patch-1/utilities/verify.sh b/branches/tswast-patch-1/utilities/verify.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
-source ./utilities/integration_test_env.sh
 
 # This script is used by Travis-CI to run tests.
 # This script is referenced in .travis.yml.
 
 if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     # Get signing tools and API keyfile
-    openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d
-    mkdir $TRAVIS_BUILD_DIR/signing-tools
-    chmod 700 $TRAVIS_BUILD_DIR/signing-tools
-    tar xvf $TRAVIS_BUILD_DIR/signing-tools.tar -C $TRAVIS_BUILD_DIR/signing-tools
+    openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out target/travis/signing-tools.tar -d
+    mkdir target/travis/signing-tools
+    chmod 700 target/travis/signing-tools
+    tar xvf target/travis/signing-tools.tar -C target/travis/signing-tools
+    # Export test env variables
+    export GCLOUD_TESTS_PROJECT_ID="gcloud-devel"
+    export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/target/travis/signing-tools/gcloud-devel-travis.json
     # Run verify
     mvn verify
 else
