Skip to content

Commit 0be6320

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 2597 b: refs/heads/update-datastore c: 1e7e152 h: refs/heads/master i: 2595: 92d0857
1 parent dfe034b commit 0be6320

7 files changed

Lines changed: 33 additions & 23 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: b6bbf679f4c99d0cbcd36f663651307be1da1f0d
8+
refs/heads/update-datastore: 1e7e1526235e7c6192ae585f93a740ba762f2ab3
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

‎branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.Objects;
2626

2727
/**
28-
* Base class for Resource Manager operation options
28+
* Base class for Resource Manager operation options.
2929
*/
3030
class Option implements Serializable {
3131

‎branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* A Google Cloud Resource Manager project object.
2323
*
24-
* A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs,
24+
* <p>A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs,
2525
* AppEngine Apps, VMs, and other Google Cloud Platform resources. This class' member variables are
2626
* immutable. Methods that change or update the underlying Project information return a new Project
2727
* instance.
@@ -77,7 +77,7 @@ public Project reload() {
7777
/**
7878
* Marks the project identified by the specified project ID for deletion.
7979
*
80-
* This method will only affect the project if the following criteria are met:
80+
* <p>This method will only affect the project if the following criteria are met:
8181
* <ul>
8282
* <li>The project does not have a billing account associated with it.
8383
* <li>The project has a lifecycle state of {@link ProjectInfo.State#ACTIVE}.
@@ -103,7 +103,7 @@ public void delete() {
103103
/**
104104
* Restores the project identified by the specified project ID.
105105
*
106-
* You can only use this method for a project that has a lifecycle state of
106+
* <p>You can only use this method for a project that has a lifecycle state of
107107
* {@link ProjectInfo.State#DELETE_REQUESTED}. After deletion starts, as indicated by a lifecycle
108108
* state of {@link ProjectInfo.State#DELETE_IN_PROGRESS}, the project cannot be restored. The
109109
* caller must have modify permissions for this project.
@@ -120,7 +120,7 @@ public void undelete() {
120120
/**
121121
* Replaces the attributes of the project.
122122
*
123-
* The caller must have modify permissions for this project.
123+
* <p>The caller must have modify permissions for this project.
124124
*
125125
* @see <a
126126
* href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update">Cloud

‎branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.gcloud.Service;
2323
import com.google.gcloud.spi.ResourceManagerRpc;
2424

25-
import java.util.HashSet;
25+
import java.util.Set;
2626

2727
/**
2828
* An interface for Google Cloud Resource Manager.
@@ -31,7 +31,7 @@
3131
*/
3232
public interface ResourceManager extends Service<ResourceManagerOptions> {
3333

34-
public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
34+
String DEFAULT_CONTENT_TYPE = "application/octet-stream";
3535

3636
/**
3737
* The fields of a project.
@@ -59,7 +59,7 @@ public String selector() {
5959
}
6060

6161
static String selector(ProjectField... fields) {
62-
HashSet<String> fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
62+
Set<String> fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
6363
fieldStrings.add(PROJECT_ID.selector());
6464
for (ProjectField field : fields) {
6565
fieldStrings.add(field.selector());
@@ -71,7 +71,7 @@ static String selector(ProjectField... fields) {
7171
/**
7272
* Class for specifying project get options.
7373
*/
74-
public class ProjectGetOption extends Option {
74+
class ProjectGetOption extends Option {
7575

7676
private static final long serialVersionUID = 270185129961146874L;
7777

@@ -95,7 +95,7 @@ public static ProjectGetOption fields(ProjectField... fields) {
9595
/**
9696
* Class for specifying project list options.
9797
*/
98-
public class ProjectListOption extends Option {
98+
class ProjectListOption extends Option {
9999

100100
private static final long serialVersionUID = 7888768979702012328L;
101101

@@ -227,10 +227,9 @@ public static ProjectListOption fields(ProjectField... fields) {
227227
* Lists the projects visible to the current user.
228228
*
229229
* <p>This method returns projects in an unspecified order. New projects do not necessarily appear
230-
* at
231-
* the end of the list. Use {@link ProjectListOption} to filter this list, set page size, and set
232-
* page tokens. Note that pagination is currently not implemented by the Cloud Resource Manager
233-
* API.
230+
* at the end of the list. Use {@link ProjectListOption} to filter this list, set page size, and
231+
* set page tokens. Note that pagination is currently not implemented by the Cloud Resource
232+
* Manager API.
234233
*
235234
* @see <a
236235
* href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/list">Cloud
@@ -264,7 +263,7 @@ public static ProjectListOption fields(ProjectField... fields) {
264263
* @see <a
265264
* href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/undelete">Cloud
266265
* Resource Manager undelete</a>
267-
* @throws ResourceManagerException
266+
* @throws ResourceManagerException upon failure
268267
*/
269268
void undelete(String projectId);
270269
}

‎branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ public boolean equals(Object obj) {
107107
return obj instanceof ResourceManagerOptions && baseEquals((ResourceManagerOptions) obj);
108108
}
109109

110+
@Override
111+
public int hashCode() {
112+
return baseHashCode();
113+
}
114+
110115
@Override
111116
public Builder toBuilder() {
112117
return new Builder(this);

‎branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class LocalResourceManagerHelper {
7070
private static final Set<Character> PERMISSIBLE_PROJECT_NAME_PUNCTUATION =
7171
ImmutableSet.of('-', '\'', '"', ' ', '!');
7272

73-
private HttpServer server;
73+
private final HttpServer server;
7474
private final ConcurrentHashMap<String, Project> projects = new ConcurrentHashMap<>();
7575
private final int port;
7676

@@ -257,7 +257,7 @@ private static Map<String, Object> parseListOptions(String query) {
257257
return options;
258258
}
259259

260-
private static final String checkForProjectErrors(Project project) {
260+
private static String checkForProjectErrors(Project project) {
261261
if (project.getProjectId() == null) {
262262
return "Project ID cannot be empty.";
263263
}
@@ -291,9 +291,9 @@ private static final String checkForProjectErrors(Project project) {
291291
return null;
292292
}
293293

294-
private static final boolean isValidIdOrLabel(String value, int minLength, int maxLength) {
294+
private static boolean isValidIdOrLabel(String value, int minLength, int maxLength) {
295295
for (char c : value.toCharArray()) {
296-
if (c != '-' && !Character.isDigit(c) && (!Character.isLowerCase(c))) {
296+
if (c != '-' && !Character.isDigit(c) && !Character.isLowerCase(c)) {
297297
return false;
298298
}
299299
}
@@ -367,7 +367,7 @@ Response list(Map<String, Object> options) {
367367
}
368368
String[] fields = (String[]) options.get("fields");
369369
for (Project p : projects.values()) {
370-
Boolean includeProject = includeProject(p, filters);
370+
boolean includeProject = includeProject(p, filters);
371371
if (includeProject) {
372372
try {
373373
projectsSerialized.add(jsonFactory.toString(extractFields(p, fields)));

‎branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_SIZE;
66
import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
77
import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
8+
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
89

910
import com.google.api.client.googleapis.json.GoogleJsonError;
1011
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
@@ -26,6 +27,9 @@ public class DefaultResourceManagerRpc implements ResourceManagerRpc {
2627

2728
// see https://cloud.google.com/resource-manager/v1/errors/core_errors
2829
private static final Set<Integer> RETRYABLE_CODES = ImmutableSet.of(503, 500, 429);
30+
private static final Set<String> RETRYABLE_REASONS = ImmutableSet.of("concurrentLimitExceeded",
31+
"limitExceeded", "rateLimitExceeded", "rateLimitExceededUnreg", "servingLimitExceeded",
32+
"userRateLimitExceeded", "userRateLimitExceededUnreg", "variableTermLimitExceeded");
2933

3034
private final Cloudresourcemanager resourceManager;
3135

@@ -51,7 +55,9 @@ private static ResourceManagerException translate(IOException exception) {
5155
}
5256

5357
private static ResourceManagerException translate(GoogleJsonError exception) {
54-
boolean retryable = RETRYABLE_CODES.contains(exception.getCode());
58+
boolean retryable =
59+
RETRYABLE_CODES.contains(exception.getCode()) || (!exception.getErrors().isEmpty()
60+
&& RETRYABLE_REASONS.contains(exception.getErrors().get(0).getReason()));
5561
return new ResourceManagerException(exception.getCode(), exception.getMessage(), retryable);
5662
}
5763

@@ -82,7 +88,7 @@ public Project get(String projectId, Map<Option, ?> options) throws ResourceMana
8288
.execute();
8389
} catch (IOException ex) {
8490
ResourceManagerException translated = translate(ex);
85-
if (translated.code() == HTTP_FORBIDDEN) {
91+
if (translated.code() == HTTP_FORBIDDEN || translated.code() == HTTP_NOT_FOUND) {
8692
return null; // Project not found
8793
} else {
8894
throw translated;

0 commit comments

Comments
 (0)