From 448f3b518ba2059ce5a852051558617d1896b9d3 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 17 Dec 2015 10:32:22 -0800 Subject: [PATCH 1/3] Adding ResourceManagerExample, update docs --- gcloud-java-examples/README.md | 13 +- .../examples/ResourceManagerExample.java | 147 ++++++++++++++++++ gcloud-java-resourcemanager/README.md | 10 +- .../gcloud/resourcemanager/package-info.java | 19 ++- 4 files changed, 180 insertions(+), 9 deletions(-) create mode 100644 gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md index 2ccec3e81571..75b8bb220ee0 100644 --- a/gcloud-java-examples/README.md +++ b/gcloud-java-examples/README.md @@ -33,7 +33,7 @@ To run examples from your command line: 1. Login using gcloud SDK (`gcloud auth login` in command line) -2. Set your current project using `gcloud config set project PROJECT_ID` +2. If you are running an example other than `ResourceManagerExample`, set your current project using `gcloud config set project PROJECT_ID`. If you are running `ResourceManagerExample`, unset your project by using `gcloud config unset project`. 3. Compile using Maven (`mvn compile` in command line from your base project directory) @@ -56,7 +56,16 @@ To run examples from your command line: $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="list " $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="download test.txt" $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="delete test.txt" -``` + ``` + + Here's an example run of `ResourceManagerExample`. + + Be sure to change the placeholder project ID "my-project-id" with your own globally unique project ID. + ``` + $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="create my-project-id" + $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="list" + $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="get my-project-id" + ``` Troubleshooting --------------- diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java new file mode 100644 index 000000000000..497d4f07e081 --- /dev/null +++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java @@ -0,0 +1,147 @@ +/* + * 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.examples; + +import com.google.gcloud.resourcemanager.ProjectInfo; +import com.google.gcloud.resourcemanager.ResourceManager; +import com.google.gcloud.resourcemanager.ResourceManagerOptions; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +/** + * An example of using the Google Cloud Resource Manager. + *

+ * This example creates, gets, and lists projects. + *

+ * Steps needed for running the example:

    + *
  1. login using gcloud SDK - {@code gcloud auth login}.
    2. + *
  2. compile using maven - {@code mvn compile}
    3. + *
  3. run using maven - {@code mvn exec:java + * -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" + * -Dexec.args="[create|get|list projectId]"}
    4. + *
+ */ +public class ResourceManagerExample { + + private static final String DEFAULT_ACTION = "list"; + private static final Map ACTIONS = new HashMap<>(); + + private interface ResourceManagerAction { + void run(ResourceManager resourceManager, String... args); + String getRequiredParams(); + } + + private static class CreateAction implements ResourceManagerAction { + @Override + public void run(ResourceManager resourceManager, String... args) { + if (args.length > 0) { + String projectId = args[0]; + ProjectInfo project = resourceManager.create(ProjectInfo.builder(projectId).build()); + System.out.printf( + "Successfully created project '%s': %s.%n", projectId, projectDetails(project)); + } else { + System.out.println("Error: must supply a globally unique project ID for your new project."); + } + } + + @Override + public String getRequiredParams() { + return "projectId"; + } + } + + private static class GetAction implements ResourceManagerAction { + @Override + public void run(ResourceManager resourceManager, String... args) { + if (args.length > 0) { + String projectId = args[0]; + ProjectInfo project = resourceManager.get(projectId); + if (project != null) { + System.out.printf( + "Successfully got project '%s': %s.%n", projectId, projectDetails(project)); + } else { + System.out.printf("Could not find project '%s'.%n", projectId); + } + } else { + System.out.println( + "Error: must supply a project ID corresponding to a project for which you have viewing" + + " permissions. You can create a project and then call get using the same project ID" + + " if you have no other projects to use in this test."); + } + } + + @Override + public String getRequiredParams() { + return "projectId"; + } + } + + private static class ListAction implements ResourceManagerAction { + @Override + public void run(ResourceManager resourceManager, String... args) { + System.out.println("Projects you can view:"); + for (ProjectInfo project : resourceManager.list().values()) { + System.out.println(projectDetails(project)); + } + } + + @Override + public String getRequiredParams() { + return ""; + } + } + + static { + ACTIONS.put("create", new CreateAction()); + ACTIONS.put("get", new GetAction()); + ACTIONS.put("list", new ListAction()); + } + + private static String projectDetails(ProjectInfo project) { + return "{projectId:" + project.projectId() + ", projectNumber:" + project.projectNumber() + + ", createTimeMillis:" + project.createTimeMillis() + ", state:" + project.state() + "}"; + } + + public static void main(String... args) { + String actionName = args.length > 0 ? args[0].toLowerCase() : DEFAULT_ACTION; + ResourceManagerAction action = ACTIONS.get(actionName); + if (action == null) { + StringBuilder actionAndParams = new StringBuilder(); + for (Map.Entry entry : ACTIONS.entrySet()) { + actionAndParams.append(entry.getKey()); + String param = entry.getValue().getRequiredParams(); + if (param != null && !param.isEmpty()) { + actionAndParams.append(' ').append(param); + } + actionAndParams.append('|'); + } + actionAndParams.setLength(actionAndParams.length() - 1); + System.out.printf( + "Usage: %s [%s]%n", ResourceManagerExample.class.getSimpleName(), actionAndParams); + return; + } + + // If you want to access a local Resource Manager emulator (after creating and starting the + // LocalResourceManagerHelper), use the following code instead: + // ResourceManager resourceManager = LocalResourceManagerHelper.options().service(); + ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service(); + args = args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[] {}; + action.run(resourceManager, args); + } +} diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md index 4e6ebecbbe5c..fc8b6e0893c1 100644 --- a/gcloud-java-resourcemanager/README.md +++ b/gcloud-java-resourcemanager/README.md @@ -5,12 +5,10 @@ Java idiomatic client for [Google Cloud Resource Manager] (https://cloud.google. [![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java) [![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master) - - +[![Maven](https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-resourcemanager.svg)]( https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-resourcemanager.svg) - [Homepage] (https://googlecloudplatform.github.io/gcloud-java/) - - +- [API Documentation] (http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/resourcemanager/package-summary.html) > Note: This client is a work-in-progress, and may occasionally > make backwards-incompatible changes. @@ -34,9 +32,9 @@ If you are using SBT, add this to your dependencies libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.0" ``` - +-------------------- +[`ResourceManagerExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java) is a simple command line interface for the Cloud Resource Manager. Read more about using the application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/ResourceManagerExample.html). Authentication -------------- diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java index 3beaa0967443..1c6ebed48d1c 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java @@ -16,7 +16,24 @@ /** * A client to Google Cloud Resource Manager. - * //TODO(ajaykannan): add code example + * + *

Here's a simple usage example for using gcloud-java-resourcemanager: + * 

{@code
+ * ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
+ * String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.
+ * ProjectInfo myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
+ * ProjectInfo newProjectInfo = resourceManager.replace(myProject.toBuilder()
+ *     .addLabel("launch-status", "in-development").build());
+ * Iterator projectIterator = resourceManager.list().iterateAll();
+ * System.out.println("Projects I can view:");
+ * while (projectIterator.hasNext()) {
+ *   System.out.println(projectIterator.next().projectId());
+ * }}
+ * + * Remember that you must authenticate using the Google Cloud SDK. See more about + * providing + * credentials here. + * * @see Google Cloud Resource Manager */ From 1a10c7bf2ae66d4be84dd27b62a06a6851993bdc Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 18 Dec 2015 10:15:39 -0800 Subject: [PATCH 2/3] Include delete action + minor edits --- gcloud-java-examples/README.md | 2 +- .../examples/ResourceManagerExample.java | 144 +++++++++++++----- .../gcloud/resourcemanager/package-info.java | 3 +- 3 files changed, 110 insertions(+), 39 deletions(-) diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md index 75b8bb220ee0..c8ea1f6f0d00 100644 --- a/gcloud-java-examples/README.md +++ b/gcloud-java-examples/README.md @@ -33,7 +33,7 @@ To run examples from your command line: 1. Login using gcloud SDK (`gcloud auth login` in command line) -2. If you are running an example other than `ResourceManagerExample`, set your current project using `gcloud config set project PROJECT_ID`. If you are running `ResourceManagerExample`, unset your project by using `gcloud config unset project`. +2. Set your current project using `gcloud config set project PROJECT_ID`. This step is not necessary for `ResourceManagerExample`. 3. Compile using Maven (`mvn compile` in command line from your base project directory) diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java index 497d4f07e081..e29aff99c50a 100644 --- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java +++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java @@ -16,6 +16,7 @@ package com.google.gcloud.examples; +import com.google.common.base.Joiner; import com.google.gcloud.resourcemanager.ProjectInfo; import com.google.gcloud.resourcemanager.ResourceManager; import com.google.gcloud.resourcemanager.ResourceManagerOptions; @@ -23,18 +24,19 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.Scanner; /** * An example of using the Google Cloud Resource Manager. - *

- * This example creates, gets, and lists projects. - *

- * Steps needed for running the example:

    + * + *

    This example creates, deletes, gets, and lists projects. + * + *

    Steps needed for running the example:

      *
    1. login using gcloud SDK - {@code gcloud auth login}.
      2. *
    2. compile using maven - {@code mvn compile}
      3. *
    3. run using maven - {@code mvn exec:java * -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" - * -Dexec.args="[create|get|list projectId]"}
      4. + * -Dexec.args="[list | [create | delete | get] projectId]"} *
    */ public class ResourceManagerExample { @@ -44,51 +46,88 @@ public class ResourceManagerExample { private interface ResourceManagerAction { void run(ResourceManager resourceManager, String... args); - String getRequiredParams(); + + String[] getRequiredParams(); + + String[] getOptionalParams(); } private static class CreateAction implements ResourceManagerAction { @Override public void run(ResourceManager resourceManager, String... args) { - if (args.length > 0) { - String projectId = args[0]; - ProjectInfo project = resourceManager.create(ProjectInfo.builder(projectId).build()); + if (args.length % 2 != 1) { + System.out.println(usage("create", ACTIONS.get("create"))); + return; + } + String projectId = args[0]; + Map labels = new HashMap<>(); + for (int i = 1; i < args.length; i += 2) { + labels.put(args[i], args[i + 1]); + } + ProjectInfo project = + resourceManager.create(ProjectInfo.builder(projectId).labels(labels).build()); System.out.printf( "Successfully created project '%s': %s.%n", projectId, projectDetails(project)); + } + + @Override + public String[] getRequiredParams() { + return new String[] {"project-id"}; + } + + @Override + public String[] getOptionalParams() { + return new String[] {"label-key-1", "label-value-1", "label-key-2", "label-value-2", "..."}; + } + } + + private static class DeleteAction implements ResourceManagerAction { + @Override + public void run(ResourceManager resourceManager, String... args) { + String projectId = args[0]; + System.out.print("Are you sure [y/N]: "); + Scanner scanner = new Scanner(System.in); + if (scanner.nextLine().toLowerCase().equals("y")) { + resourceManager.delete(args[0]); + System.out.println("Successfully deleted project " + projectId + "."); } else { - System.out.println("Error: must supply a globally unique project ID for your new project."); + System.out.println("Will not delete project " + projectId + "."); } + scanner.close(); + } + + @Override + public String[] getRequiredParams() { + return new String[] {"project-id"}; } @Override - public String getRequiredParams() { - return "projectId"; + public String[] getOptionalParams() { + return new String[] {}; } } private static class GetAction implements ResourceManagerAction { @Override public void run(ResourceManager resourceManager, String... args) { - if (args.length > 0) { - String projectId = args[0]; - ProjectInfo project = resourceManager.get(projectId); - if (project != null) { - System.out.printf( - "Successfully got project '%s': %s.%n", projectId, projectDetails(project)); - } else { - System.out.printf("Could not find project '%s'.%n", projectId); - } + String projectId = args[0]; + ProjectInfo project = resourceManager.get(projectId); + if (project != null) { + System.out.printf( + "Successfully got project '%s': %s.%n", projectId, projectDetails(project)); } else { - System.out.println( - "Error: must supply a project ID corresponding to a project for which you have viewing" - + " permissions. You can create a project and then call get using the same project ID" - + " if you have no other projects to use in this test."); + System.out.printf("Could not find project '%s'.%n", projectId); } } @Override - public String getRequiredParams() { - return "projectId"; + public String[] getRequiredParams() { + return new String[] {"project-id"}; + } + + @Override + public String[] getOptionalParams() { + return new String[] {}; } } @@ -102,20 +141,51 @@ public void run(ResourceManager resourceManager, String... args) { } @Override - public String getRequiredParams() { - return ""; + public String[] getRequiredParams() { + return new String[] {}; + } + + @Override + public String[] getOptionalParams() { + return new String[] {}; } } static { ACTIONS.put("create", new CreateAction()); + ACTIONS.put("delete", new DeleteAction()); ACTIONS.put("get", new GetAction()); ACTIONS.put("list", new ListAction()); } private static String projectDetails(ProjectInfo project) { - return "{projectId:" + project.projectId() + ", projectNumber:" + project.projectNumber() - + ", createTimeMillis:" + project.createTimeMillis() + ", state:" + project.state() + "}"; + return new StringBuffer() + .append("{projectId:") + .append(project.projectId()) + .append(", projectNumber:") + .append(project.projectNumber()) + .append(", createTimeMillis:") + .append(project.createTimeMillis()) + .append(", state:") + .append(project.state()) + .append(", labels:") + .append(project.labels()) + .append("}") + .toString(); + } + + private static String usage(String actionName, ResourceManagerAction action) { + StringBuilder usage = new StringBuilder(); + usage.append(actionName); + String requiredParam = Joiner.on(" ").join(action.getRequiredParams()); + String optionalParam = Joiner.on(" ").join(action.getOptionalParams()); + if (!requiredParam.isEmpty()) { + usage.append(' ').append(requiredParam); + } + if (!optionalParam.isEmpty()) { + usage.append(" [").append(optionalParam).append("]"); + } + return usage.toString(); } public static void main(String... args) { @@ -124,11 +194,7 @@ public static void main(String... args) { if (action == null) { StringBuilder actionAndParams = new StringBuilder(); for (Map.Entry entry : ACTIONS.entrySet()) { - actionAndParams.append(entry.getKey()); - String param = entry.getValue().getRequiredParams(); - if (param != null && !param.isEmpty()) { - actionAndParams.append(' ').append(param); - } + actionAndParams.append(usage(entry.getKey(), entry.getValue())); actionAndParams.append('|'); } actionAndParams.setLength(actionAndParams.length() - 1); @@ -142,6 +208,10 @@ public static void main(String... args) { // ResourceManager resourceManager = LocalResourceManagerHelper.options().service(); ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service(); args = args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[] {}; - action.run(resourceManager, args); + if (args.length < action.getRequiredParams().length) { + System.out.println("Usage: " + usage(actionName, action)); + } else { + action.run(resourceManager, args); + } } } diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java index 1c6ebed48d1c..ace65b7203fc 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java @@ -18,6 +18,7 @@ * A client to Google Cloud Resource Manager. * *

    Here's a simple usage example for using gcloud-java-resourcemanager: + * * 

    {@code
  * ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
  * String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.
@@ -30,7 +31,7 @@
  *   System.out.println(projectIterator.next().projectId());
  * }}
    * - * Remember that you must authenticate using the Google Cloud SDK. See more about + *

    Remember that you must authenticate using the Google Cloud SDK. See more about * providing * credentials here. * From 741b10640af80598360f64b2582738c744a14dc9 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 18 Dec 2015 16:53:26 -0800 Subject: [PATCH 3/3] minor fixes --- .../examples/ResourceManagerExample.java | 49 ++++++++++--------- .../gcloud/resourcemanager/package-info.java | 1 - 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java index e29aff99c50a..cd0217c34dcb 100644 --- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java +++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java @@ -55,19 +55,19 @@ private interface ResourceManagerAction { private static class CreateAction implements ResourceManagerAction { @Override public void run(ResourceManager resourceManager, String... args) { - if (args.length % 2 != 1) { - System.out.println(usage("create", ACTIONS.get("create"))); - return; - } String projectId = args[0]; Map labels = new HashMap<>(); for (int i = 1; i < args.length; i += 2) { - labels.put(args[i], args[i + 1]); + if (i + 1 < args.length) { + labels.put(args[i], args[i + 1]); + } else { + labels.put(args[i], ""); + } } ProjectInfo project = resourceManager.create(ProjectInfo.builder(projectId).labels(labels).build()); - System.out.printf( - "Successfully created project '%s': %s.%n", projectId, projectDetails(project)); + System.out.printf( + "Successfully created project '%s': %s.%n", projectId, projectDetails(project)); } @Override @@ -85,10 +85,10 @@ private static class DeleteAction implements ResourceManagerAction { @Override public void run(ResourceManager resourceManager, String... args) { String projectId = args[0]; - System.out.print("Are you sure [y/N]: "); + System.out.printf("Going to delete project \"%s\". Are you sure [y/N]: ", projectId); Scanner scanner = new Scanner(System.in); if (scanner.nextLine().toLowerCase().equals("y")) { - resourceManager.delete(args[0]); + resourceManager.delete(projectId); System.out.println("Successfully deleted project " + projectId + "."); } else { System.out.println("Will not delete project " + projectId + "."); @@ -159,7 +159,7 @@ public String[] getOptionalParams() { } private static String projectDetails(ProjectInfo project) { - return new StringBuffer() + return new StringBuilder() .append("{projectId:") .append(project.projectId()) .append(", projectNumber:") @@ -174,18 +174,21 @@ private static String projectDetails(ProjectInfo project) { .toString(); } - private static String usage(String actionName, ResourceManagerAction action) { - StringBuilder usage = new StringBuilder(); + private static void addUsage( + String actionName, ResourceManagerAction action, StringBuilder usage) { usage.append(actionName); - String requiredParam = Joiner.on(" ").join(action.getRequiredParams()); - String optionalParam = Joiner.on(" ").join(action.getOptionalParams()); - if (!requiredParam.isEmpty()) { - usage.append(' ').append(requiredParam); - } - if (!optionalParam.isEmpty()) { - usage.append(" [").append(optionalParam).append("]"); + Joiner joiner = Joiner.on(" "); + String[] requiredParams = action.getRequiredParams(); + String[] optionalParams = action.getOptionalParams(); + if (requiredParams.length > 0) { + usage.append(' '); + joiner.appendTo(usage, requiredParams); + } + if (optionalParams.length > 0) { + usage.append(" ["); + joiner.appendTo(usage, optionalParams); + usage.append(']'); } - return usage.toString(); } public static void main(String... args) { @@ -194,7 +197,7 @@ public static void main(String... args) { if (action == null) { StringBuilder actionAndParams = new StringBuilder(); for (Map.Entry entry : ACTIONS.entrySet()) { - actionAndParams.append(usage(entry.getKey(), entry.getValue())); + addUsage(entry.getKey(), entry.getValue(), actionAndParams); actionAndParams.append('|'); } actionAndParams.setLength(actionAndParams.length() - 1); @@ -209,7 +212,9 @@ public static void main(String... args) { ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service(); args = args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[] {}; if (args.length < action.getRequiredParams().length) { - System.out.println("Usage: " + usage(actionName, action)); + StringBuilder usage = new StringBuilder(); + addUsage(actionName, action, usage); + System.out.println("Usage: " + usage); } else { action.run(resourceManager, args); } diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java index ace65b7203fc..0c9b0e5a4059 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java @@ -18,7 +18,6 @@ * A client to Google Cloud Resource Manager. * *

    Here's a simple usage example for using gcloud-java-resourcemanager: - * * 

    {@code
  * ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
  * String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.