---

aozarov · aozarov · commit 40e4d27b2478 · 2014-12-28T16:57:04.000-08:00
yaml --- r: 75 b: refs/heads/master c: 509072d h: refs/heads/master i: 73: 229690f 71: 77af580 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6250dccff620e87c7a181e02f4622dfb4f666bc
+refs/heads/master: 509072d2347d09fc556b91a089006ef4b94f199d
diff --git a/trunk/.classpath b/trunk/.classpath
@@ -20,6 +20,7 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="ECLIPSE_HOME"/>
diff --git a/trunk/.project b/trunk/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -30,11 +35,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/trunk/src/main/java/com/google/gcloud/ServiceOptions.java b/trunk/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -63,7 +63,13 @@ private static AuthConfig defaultAuthConfig() {
   }
 
   protected static String appEngineAppId() {
-    return System.getProperty("com.google.appengine.application.id");
+    try {
+      Class<?> apiProxy = Class.forName("com.google.apphosting.api.ApiProxy");
+      Object currentEnv = apiProxy.getMethod("getCurrentEnvironment").invoke(null);
+      return (String) currentEnv.getClass().getMethod("getAppId").invoke(currentEnv);
+    } catch (Exception ex) {
+      return System.getProperty("com.google.appengine.application.id");
+    }
   }
 
   protected abstract static class Builder<B extends Builder<B>> {
diff --git a/trunk/src/main/java/com/google/gcloud/storage/Acl.java b/trunk/src/main/java/com/google/gcloud/storage/Acl.java
@@ -2,4 +2,43 @@
 
 public interface Acl {
 
+  public class ProjectTeam {
+    	// ProjectNumber: The project number.
+	//ProjectNumber string `json:"projectNumber,omitempty"`
+
+	// Team: The team. Can be owners, editors, or viewers.
+	//Team string `json:"team,omitempty"`
+  }
+
+  enum Entity {
+    USER_ID("user-userId"),
+    USER_EMAIL("user-emailAddress"),
+    GROUP_ID("group-groupId"),
+    GROUP_EMAIL("group-emailAddress"),
+    ALL_USERS("allUsers"),
+    ALL_AUTHENTICATED_USERS("allAuthenticatedUsers");
+
+    private final String value;
+
+    Entity(String value) {
+      this.value = value;
+    }
+  }
+
+  String domain();
+
+  Entity entity();
+
+  String entityId();
+
+  String email();
+
+  String etag();
+
+  String generation();
+
+
+  ProjectTeam projectTeam();
+
+  String role();
 }
diff --git a/trunk/src/main/java/com/google/gcloud/storage/Bucket.java b/trunk/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -14,11 +14,11 @@ public interface Bucket {
 
   void updateDefaultObjectAcl();
 
-  Acl acl(String objectName);
 
-  void updateAcl(String objectName, Acl acl);
 
-  void delete(String... objectName);
+
+
+  void delete(Key... objectKey);
 
   void compose(Iterable<String> source, String dest);
 
diff --git a/trunk/src/main/java/com/google/gcloud/storage/Key.java b/trunk/src/main/java/com/google/gcloud/storage/Key.java
@@ -0,0 +1,26 @@
+package com.google.gcloud.storage;
+
+public class Key {
+
+  // TODO: add builder, factory method, toURL, from URL, equals,hashCode, toString
+  private final String bucket;
+  private final String name;
+
+  /*
+  Builder() {
+
+  }*/
+
+  Key(String bucket, String name) {
+    this.bucket = bucket;
+    this.name = name;
+  }
+
+  public String bucket() {
+    return bucket;
+  }
+
+  public String name() {
+    return name;
+  }
+}
diff --git a/trunk/src/main/java/com/google/gcloud/storage/StorageObject.java b/trunk/src/main/java/com/google/gcloud/storage/StorageObject.java
@@ -0,0 +1,15 @@
+package com.google.gcloud.storage;
+
+import java.nio.ByteBuffer;
+
+public interface StorageObject {
+
+  // builder will have an option to populate content and set acl, bucket, name,..
+
+  Key key();
+
+  Acl acl();
+
+  ByteBuffer content();
+
+}
diff --git a/trunk/src/main/java/com/google/gcloud/storage/StorageService.java b/trunk/src/main/java/com/google/gcloud/storage/StorageService.java
@@ -5,5 +5,4 @@ public interface StorageService {
   Iterable<Bucket> listBuckets();
 
   Bucket getBucket(String bucket);
-
 }
diff --git a/trunk/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java b/trunk/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java
@@ -9,7 +9,7 @@ final class StorageServiceImpl implements StorageService {
 
   StorageServiceImpl(StorageServiceOptions options) {
     this.options = options;
-    this.storage = options.getStorage();
+    storage = options.getStorage();
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: e6250dccff620e87c7a181e02f4622dfb4f666bc`
	`2`	`+refs/heads/master: 509072d2347d09fc556b91a089006ef4b94f199d`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,13 @@ private static AuthConfig defaultAuthConfig() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`protected static String appEngineAppId() {`
`66`		`- return System.getProperty("com.google.appengine.application.id");`
	`66`	`+ try {`
	`67`	`+ Class<?> apiProxy = Class.forName("com.google.apphosting.api.ApiProxy");`
	`68`	`+ Object currentEnv = apiProxy.getMethod("getCurrentEnvironment").invoke(null);`
	`69`	`+ return (String) currentEnv.getClass().getMethod("getAppId").invoke(currentEnv);`
	`70`	`+ } catch (Exception ex) {`
	`71`	`+ return System.getProperty("com.google.appengine.application.id");`
	`72`	`+ }`
`67`	`73`	`}`
`68`	`74`
`69`	`75`	`protected abstract static class Builder<B extends Builder<B>> {`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,4 @@ public interface StorageService {`
`5`	`5`	`Iterable<Bucket> listBuckets();`
`6`	`6`
`7`	`7`	`Bucket getBucket(String bucket);`
`8`		`-`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ final class StorageServiceImpl implements StorageService {`
`9`	`9`
`10`	`10`	`StorageServiceImpl(StorageServiceOptions options) {`
`11`	`11`	`this.options = options;`
`12`		`- this.storage = options.getStorage();`
	`12`	`+ storage = options.getStorage();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`