diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java index 853b678a2ebe..f48c057ba049 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java @@ -25,7 +25,7 @@ import java.util.Objects; /** - * Base class for Resource Manager operation options + * Base class for Resource Manager operation options. */ class Option implements Serializable { diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java index a08d7e3714be..1b79eb973da3 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java @@ -21,7 +21,7 @@ /** * A Google Cloud Resource Manager project object. * - * A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs, + *
A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs, * AppEngine Apps, VMs, and other Google Cloud Platform resources. This class' member variables are * immutable. Methods that change or update the underlying Project information return a new Project * instance. @@ -77,7 +77,7 @@ public Project reload() { /** * Marks the project identified by the specified project ID for deletion. * - * This method will only affect the project if the following criteria are met: + *
This method will only affect the project if the following criteria are met: *
You can only use this method for a project that has a lifecycle state of * {@link ProjectInfo.State#DELETE_REQUESTED}. After deletion starts, as indicated by a lifecycle * state of {@link ProjectInfo.State#DELETE_IN_PROGRESS}, the project cannot be restored. The * caller must have modify permissions for this project. @@ -120,7 +120,7 @@ public void undelete() { /** * Replaces the attributes of the project. * - * The caller must have modify permissions for this project. + *
The caller must have modify permissions for this project.
*
* @see Cloud
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
index 9ae524e28017..907f164ec00c 100644
--- 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
@@ -22,7 +22,7 @@
import com.google.gcloud.Service;
import com.google.gcloud.spi.ResourceManagerRpc;
-import java.util.HashSet;
+import java.util.Set;
/**
* An interface for Google Cloud Resource Manager.
@@ -31,7 +31,7 @@
*/
public interface ResourceManager extends Service This method returns projects in an unspecified order. New projects do not necessarily appear
- * at
- * the end of the list. Use {@link ProjectListOption} to filter this list, set page size, and set
- * page tokens. Note that pagination is currently not implemented by the Cloud Resource Manager
- * API.
+ * at the end of the list. Use {@link ProjectListOption} to filter this list, set page size, and
+ * set page tokens. Note that pagination is currently not implemented by the Cloud Resource
+ * Manager API.
*
* @see Cloud
@@ -264,7 +263,7 @@ public static ProjectListOption fields(ProjectField... fields) {
* @see Cloud
* Resource Manager undelete
- * @throws ResourceManagerException
+ * @throws ResourceManagerException upon failure
*/
void undelete(String projectId);
}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
index a57a512d2c14..5c0c4baf1ecb 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -107,6 +107,11 @@ public boolean equals(Object obj) {
return obj instanceof ResourceManagerOptions && baseEquals((ResourceManagerOptions) obj);
}
+ @Override
+ public int hashCode() {
+ return baseHashCode();
+ }
+
@Override
public Builder toBuilder() {
return new Builder(this);
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
index 7897203de567..fb2a4f57ff41 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -70,7 +70,7 @@ public class LocalResourceManagerHelper {
private static final Set