Add list/get options serialization tests + other small fixes

Ajay Kannan · Ajay Kannan · commit d67f94bebb5d · 2015-11-30T10:31:22.000-08:00
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -132,7 +132,7 @@ private Builder() {
     Builder(ProjectInfo info) {
       this.name = info.name;
       this.projectId = info.projectId;
-      this.labels = Maps.newHashMap(checkNotNull(info.labels));
+      this.labels.putAll(info.labels);
       this.projectNumber = info.projectNumber;
       this.state = info.state;
       this.createTimeMillis = info.createTimeMillis;
@@ -159,7 +159,7 @@ public Builder name(String name) {
      * project.
      */
     public Builder projectId(String projectId) {
-      this.projectId = projectId;
+      this.projectId = checkNotNull(projectId);
       return this;
     }
 
@@ -230,7 +230,7 @@ public ProjectInfo build() {
 
   ProjectInfo(Builder builder) {
     this.name = builder.name;
-    this.projectId = checkNotNull(builder.projectId);
+    this.projectId = builder.projectId;
     this.labels = ImmutableMap.copyOf(builder.labels);
     this.projectNumber = builder.projectNumber;
     this.state = builder.state;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -36,7 +36,7 @@ public interface ResourceManager extends Service<ResourceManagerOptions> {
   /**
    * The fields of a project.
    *
-   * These values can be used to specify the fields to include of in a partial response when calling
+   * These values can be used to specify the fields to include in a partial response when calling
    * {@link ResourceManager#get} or {@link ResourceManager#list}. Project ID is always returned,
    * even if not specified.
    */
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
@@ -17,6 +17,7 @@
 
 public class DefaultResourceManagerRpc implements ResourceManagerRpc {
 
+  // see https://cloud.google.com/resource-manager/v1/errors/core_errors
   private static final Set<Integer> RETRYABLE_CODES = ImmutableSet.of(503, 500, 429, 417);
 
   private final ResourceManagerOptions options;
@@ -45,9 +46,7 @@ private static ResourceManagerException translate(IOException exception) {
   }
 
   private static ResourceManagerException translate(GoogleJsonError exception) {
-    boolean retryable =
-        RETRYABLE_CODES.contains(exception.getCode())
-        || "InternalError".equals(exception.getMessage());
+    boolean retryable = RETRYABLE_CODES.contains(exception.getCode());
     return new ResourceManagerException(exception.getCode(), exception.getMessage(), retryable);
   }
 
@@ -63,7 +62,7 @@ public void delete(String projectId) throws ResourceManagerException {
   }
 
   @Override
-  public Project get(String projectId) throws ResourceManagerException {
+  public Project get(String projectId, Map<Option, ?> options) throws ResourceManagerException {
     // TODO(ajaykannan): fix me!
     return null;
   }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -77,7 +77,7 @@ public Y y() {
 
   void delete(String projectId) throws ResourceManagerException;
 
-  Project get(String projectId) throws ResourceManagerException;
+  Project get(String projectId, Map<Option, ?> options) throws ResourceManagerException;
 
   Tuple<String, Iterable<Project>> list(Map<Option, ?> options) throws ResourceManagerException;
 
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -18,7 +18,6 @@
 
 import static org.easymock.EasyMock.createStrictMock;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
@@ -94,15 +93,13 @@ public void testResourceManager() {
   @Test
   public void testDelete() {
     resourceManager.delete(PROJECT_INFO.projectId());
-    expectLastCall();
     replay(resourceManager);
     project.delete();
   }
 
   @Test
   public void testUndelete() {
     resourceManager.undelete(PROJECT_INFO.projectId());
-    expectLastCall();
     replay(resourceManager);
     project.undelete();
   }
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
@@ -46,6 +46,10 @@ public class SerializationTest {
       .build();
   private static final PageImpl<ProjectInfo> PAGE_RESULT =
       new PageImpl<>(null, "c", Collections.singletonList(PARTIAL_PROJECT_INFO));
+  private static final ResourceManager.ProjectGetOption PROJECT_GET_OPTION =
+      ResourceManager.ProjectGetOption.fields(ResourceManager.ProjectField.NAME);
+  private static final ResourceManager.ProjectListOption PROJECT_LIST_OPTION =
+      ResourceManager.ProjectListOption.filter("name:*");
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -63,7 +67,8 @@ public void testServiceOptions() throws Exception {
 
   @Test
   public void testModelAndRequests() throws Exception {
-    Serializable[] objects = {PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, PAGE_RESULT};
+    Serializable[] objects = {PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, PAGE_RESULT,
+        PROJECT_GET_OPTION, PROJECT_LIST_OPTION};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public interface ResourceManager extends Service<ResourceManagerOptions> {`
`36`	`36`	`/**`
`37`	`37`	`* The fields of a project.`
`38`	`38`	`*`
`39`		`- * These values can be used to specify the fields to include of in a partial response when calling`
	`39`	`+ * These values can be used to specify the fields to include in a partial response when calling`
`40`	`40`	`* {@link ResourceManager#get} or {@link ResourceManager#list}. Project ID is always returned,`
`41`	`41`	`* even if not specified.`
`42`	`42`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`public class DefaultResourceManagerRpc implements ResourceManagerRpc {`
`19`	`19`
	`20`	`+ // see https://cloud.google.com/resource-manager/v1/errors/core_errors`
`20`	`21`	`private static final Set<Integer> RETRYABLE_CODES = ImmutableSet.of(503, 500, 429, 417);`
`21`	`22`
`22`	`23`	`private final ResourceManagerOptions options;`
`@@ -45,9 +46,7 @@ private static ResourceManagerException translate(IOException exception) {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`private static ResourceManagerException translate(GoogleJsonError exception) {`
`48`		`- boolean retryable =`
`49`		`- RETRYABLE_CODES.contains(exception.getCode())`
`50`		`- \|\| "InternalError".equals(exception.getMessage());`
	`49`	`+ boolean retryable = RETRYABLE_CODES.contains(exception.getCode());`
`51`	`50`	`return new ResourceManagerException(exception.getCode(), exception.getMessage(), retryable);`
`52`	`51`	`}`
`53`	`52`
`@@ -63,7 +62,7 @@ public void delete(String projectId) throws ResourceManagerException {`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`@Override`
`66`		`- public Project get(String projectId) throws ResourceManagerException {`
	`65`	`+ public Project get(String projectId, Map<Option, ?> options) throws ResourceManagerException {`
`67`	`66`	`// TODO(ajaykannan): fix me!`
`68`	`67`	`return null;`
`69`	`68`	`}`