replace local gcd hack with a fixed version of gcd

aozarov · aozarov · commit fdac9a74cde9 · 2015-01-14T10:46:44.000-08:00
diff --git a/src/main/java/com/google/gcloud/storage/Bucket.java b/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -4,15 +4,19 @@
 
 public interface Bucket {
 
+  String id();
+
   String name();
 
   Acl acl();
 
-  void updateAcl(Acl acl);
-
   Acl defaultObjectAcl();
 
+  Cors cors();
+
   void updateDefaultObjectAcl();
+  void updateAcl(Acl acl);
+
 
 
 
diff --git a/src/main/java/com/google/gcloud/storage/Cors.java b/src/main/java/com/google/gcloud/storage/Cors.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gcloud.storage;
+
+import com.google.common.collect.ImmutableList;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+public class Cors {
+
+  private final Integer maxAgeSeconds;
+  private final ImmutableList<Method> methods;
+  private final ImmutableList<Origin> origins;
+  private final ImmutableList<String> responseHeaders;
+
+  public enum Method {
+    ANY, GET, HEAD, PUT, POST, DELETE
+  }
+
+  public static class Origin {
+
+    private final URI uri;
+
+    public static final Origin ANY = new Origin();
+
+    private Origin() {
+      uri = null;
+    }
+
+    public Origin(String scheme, String host, int port) {
+      try {
+        this.uri = new URI(scheme, null, host, port, null, null, null);
+      } catch (URISyntaxException e) {
+        throw new IllegalArgumentException(e);
+      }
+
+    }
+
+    @Override
+    public String toString() {
+      return uri == null ? "*" : uri.toString();
+    }
+  }
+
+  public static final class Builder {
+
+    private Integer maxAgeSeconds;
+    private ImmutableList<Method> methods;
+    private ImmutableList<Origin> origins;
+    private ImmutableList<String> responseHeaders;
+
+    private Builder() {
+    }
+
+    public Builder maxAgeSeconds(Integer maxAgeSeconds) {
+      this.maxAgeSeconds = maxAgeSeconds;
+      return this;
+    }
+
+    public Builder methods(Method... methods) {
+      this.methods = ImmutableList.copyOf(methods);
+      return this;
+    }
+
+    public Builder origins(Origin... origins) {
+      this.origins = ImmutableList.copyOf(origins);
+      return this;
+    }
+
+    public Builder responseHeaders(String... responseHeaders) {
+      this.responseHeaders = ImmutableList.copyOf(responseHeaders);
+      return this;
+    }
+
+    public Cors build() {
+      return new Cors(this);
+    }
+  }
+
+  private Cors(Builder builder) {
+    this.maxAgeSeconds = builder.maxAgeSeconds;
+    this.methods = builder.methods;
+    this.origins = builder.origins;
+    this.responseHeaders = builder.responseHeaders;
+  }
+
+  public Integer maxAgeSeconds() {
+    return maxAgeSeconds;
+  }
+
+  public List<Method> methods() {
+    return methods;
+  }
+
+  public List<Origin> origins() {
+    return origins;
+  }
+
+  public List<String> responseHeaders() {
+    return responseHeaders;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+}
diff --git a/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java b/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java
@@ -36,7 +36,7 @@ public class LocalGcdHelper {
 
   public static final String DEFAULT_DATASET = "dataset1";
   public static final int PORT = 8080;
-  private static final String GCD = "gcd-v1beta2-rev1-2.1.1";
+  private static final String GCD = "gcd-head";
   private static final String GCD_LOC = '/' + GCD + ".zip";
 
   private static class ProcessStreamReader extends Thread {
