WIP (includes Arie's verbal comments)

Author: Ajay Kannan

README.md

@@ -201,7 +201,7 @@ import com.google.gcloud.resourcemanager.ResourceManagerOptions;
 import java.util.Iterator;
 
 ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
-ProjectInfo myProject = resourceManager.get("some-project-id-that-I-own");
+ProjectInfo myProject = resourceManager.get("some-project-id"); // Use an existing project's ID
 ProjectInfo newProjectInfo = resourceManager.replace(myProject.toBuilder()
     .addLabel("launch-status", "in-development").build());
 System.out.println("Updated the labels of project " + newProjectInfo.projectId()

TESTING.md

@@ -1,6 +1,10 @@
 ## gcloud-java tools for testing
 
-This library provides tools to help write tests for code that uses gcloud-java services.
+This library provides tools to help write tests for code that uses the following gcloud-java services:
+
+-  [Datastore] (#testing-code-that-uses-datastore)
+-  [Storage] (#testing-code-that-uses-storage)
+-  [Resource Manager] (#testing-code-that-uses-resource-manager)
 
 ### Testing code that uses Datastore
 
@@ -85,8 +89,7 @@ You can test against a temporary local Resource Manager by following these steps
 2. In your program, create and use a Resource Manager service object whose host is set to `localhost` at the appropriate port.  For example:
 
   ```java
-  ResourceManager resourceManager = ResourceManagerOptions.builder()
-      .host("http://localhost:" + helper.port()).build().service();
+  ResourceManager resourceManager = LocalResourceManagerHelper.options().service();
   ```
 
 3. Run your tests.
@@ -99,17 +102,5 @@ You can test against a temporary local Resource Manager by following these steps
 
   This method will block until the server thread has been terminated.
 
-#### On a remote machine
-
-You can test against a remote Resource Manager emulator as well.  To do this, set the host to the hostname of the remote machine, like the example below.
-
-  ```java
-  ResourceManager resourceManager = ResourceManagerOptions.builder()
-      .host("http://<hostname of machine>:<port>").build();
-  ```
-
-Note that the remote Resource Manager emulator must be running before your tests are run.
-
-
 
 [cloud-platform-storage-authentication]:https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts

gcloud-java-resourcemanager/README.md

@@ -17,8 +17,22 @@ Java idiomatic client for [Google Cloud Resource Manager] (https://cloud.google.
 
 Quickstart
 ----------
-This library is currently under development and will be available soon!
-<!--TODO(ajaykannan): add in pom.xml snippet once gcloud-java-resourcemanager becomes available on maven -->
+If you are using Maven, add this to your pom.xml file
+```xml
+<dependency>
+  <groupId>com.google.gcloud</groupId>
+  <artifactId>gcloud-java-resourcemanager</artifactId>
+  <version>0.1.0</version>
+</dependency>
+```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-resourcemanager:jar:0.1.0'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.0"
+```
 
 <!-- TODO(ajaykannan): once the API becomes usable, make an example application
 Example Application
@@ -38,7 +52,7 @@ Google [Cloud Resource Manager][cloud-resourcemanager] provides a programmatic w
 * Create new projects.
 * Update existing projects.
 * Delete projects.
-* Undelete, or recover, projects that you don't want to delete.
+* Undelete projects that you don't want to delete.
 
 Google Cloud Resource Manager is currently in beta and may occasionally make backwards incompatible changes.
 

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java

@@ -334,7 +334,7 @@ com.google.api.services.cloudresourcemanager.model.Project toPb() {
   static ProjectInfo fromPb(com.google.api.services.cloudresourcemanager.model.Project projectPb) {
     ProjectInfo.Builder builder =
         ProjectInfo.builder(projectPb.getProjectId()).projectNumber(projectPb.getProjectNumber());
-    if (projectPb.getName() != null) {
+    if (projectPb.getName() != null && !projectPb.getName().equals("Unnamed")) {
       builder.name(projectPb.getName());
     }
     if (projectPb.getLabels() != null) {

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java

@@ -12,6 +12,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteStreams;
+import com.google.gcloud.resourcemanager.ResourceManagerOptions;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
@@ -524,10 +525,10 @@ public static LocalResourceManagerHelper create() {
   }
 
   /**
-   * Returns the port that the LocalResourceManagerHelper listens to for requests.
+   * Returns a ResourceManagerOptions instance that sets the host to use the mock server.
    */
-  public int port() {
-    return port;
+  public ResourceManagerOptions options() {
+    return ResourceManagerOptions.builder().host("http://localhost:" + port).build();
   }
 
   /**

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java

@@ -4,6 +4,7 @@
 import static com.google.gcloud.spi.ResourceManagerRpc.Option.FILTER;
 import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_SIZE;
 import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
+import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
@@ -81,7 +82,7 @@ public Project get(String projectId, Map<Option, ?> options) throws ResourceMana
           .execute();
     } catch (IOException ex) {
       ResourceManagerException translated = translate(ex);
-      if (translated.code() == 403) {
+      if (translated.code() == HTTP_FORBIDDEN) {
         return null; // Project not found
       } else {
         throw translated;

gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java

@@ -32,10 +32,8 @@ public class LocalResourceManagerHelperTest {
   private static final Map<ResourceManagerRpc.Option, ?> EMPTY_RPC_OPTIONS = ImmutableMap.of();
   private static final LocalResourceManagerHelper RESOURCE_MANAGER_HELPER =
       LocalResourceManagerHelper.create();
-  private static final ResourceManagerRpc rpc = new DefaultResourceManagerRpc(
-      ResourceManagerOptions.builder()
-      .host("http://localhost:" + RESOURCE_MANAGER_HELPER.port())
-      .build());
+  private static final ResourceManagerRpc rpc =
+      new DefaultResourceManagerRpc(RESOURCE_MANAGER_HELPER.options());
   private static final com.google.api.services.cloudresourcemanager.model.Project PARTIAL_PROJECT =
       new com.google.api.services.cloudresourcemanager.model.Project().setProjectId(
           "partial-project");

gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java

@@ -45,6 +45,8 @@ public class ProjectInfoTest {
       .parent(PARENT)
       .build();
   private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder(PROJECT_ID).build();
+  private static final ProjectInfo UNNAMED_PROJECT_FROM_LIST =
+      PARTIAL_PROJECT_INFO.toBuilder().name("Unnamed").build();
 
   @Test
   public void testBuilder() {
@@ -73,6 +75,7 @@ public void testToBuilder() {
   public void testToAndFromPb() {
     compareProjects(FULL_PROJECT_INFO, ProjectInfo.fromPb(FULL_PROJECT_INFO.toPb()));
     compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.fromPb(PARTIAL_PROJECT_INFO.toPb()));
+    compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.fromPb(UNNAMED_PROJECT_FROM_LIST.toPb()));
   }
 
   @Test

gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java

@@ -48,10 +48,8 @@ public class ResourceManagerImplTest {
 
   private static final LocalResourceManagerHelper RESOURCE_MANAGER_HELPER =
       LocalResourceManagerHelper.create();
-  private static final ResourceManager RESOURCE_MANAGER = ResourceManagerOptions.builder()
-          .host("http://localhost:" + RESOURCE_MANAGER_HELPER.port())
-      .build()
-      .service();
+  private static final ResourceManager RESOURCE_MANAGER =
+      RESOURCE_MANAGER_HELPER.options().service();
   private static final ProjectGetOption GET_FIELDS =
       ProjectGetOption.fields(ProjectField.NAME, ProjectField.CREATE_TIME);
   private static final ProjectListOption LIST_FIELDS =