-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for Compute's operations #728
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
231fe42
Add support for Compute's operations
mziccard 912ec8b
Fix Compute operations issues
mziccard ef98269
Rename maxResults to pageSize, add tests for pagination
mziccard c41ad14
Refactor compute operations
mziccard 484071c
Remove final from immutable resource classes
mziccard cc29929
Operations: better javadoc for delete, stricter parsing of identities
mziccard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
330 changes: 270 additions & 60 deletions
330
gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
gcloud-java-compute/src/main/java/com/google/gcloud/compute/GlobalOperationId.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
/* | ||
* Copyright 2016 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.compute; | ||
|
||
import static com.google.common.base.Preconditions.checkNotNull; | ||
|
||
import com.google.common.base.MoreObjects; | ||
|
||
import java.util.Objects; | ||
import java.util.regex.Matcher; | ||
import java.util.regex.Pattern; | ||
|
||
/** | ||
* Identity for a Google Compute Engine global operation. | ||
*/ | ||
public class GlobalOperationId extends ResourceId implements OperationId { | ||
|
||
private static final String REGEX = ResourceId.REGEX + "global/operations/([^/]+)"; | ||
private static final Pattern PATTERN = Pattern.compile(REGEX); | ||
private static final long serialVersionUID = 3945756772641577962L; | ||
|
||
private final String operation; | ||
|
||
private GlobalOperationId(String project, String operation) { | ||
super(project); | ||
this.operation = checkNotNull(operation); | ||
} | ||
|
||
@Override | ||
public Type type() { | ||
return Type.GLOBAL; | ||
} | ||
|
||
@Override | ||
public String operation() { | ||
return operation; | ||
} | ||
|
||
@Override | ||
public String selfLink() { | ||
return super.selfLink() + "/global/operations/" + operation; | ||
} | ||
|
||
@Override | ||
MoreObjects.ToStringHelper toStringHelper() { | ||
return super.toStringHelper().add("operation", operation); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(baseHashCode(), operation); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
return obj instanceof GlobalOperationId | ||
&& baseEquals((GlobalOperationId) obj) | ||
&& Objects.equals(operation, ((GlobalOperationId) obj).operation); | ||
} | ||
|
||
@Override | ||
GlobalOperationId setProjectId(String projectId) { | ||
if (project() != null) { | ||
return this; | ||
} | ||
return GlobalOperationId.of(projectId, operation); | ||
} | ||
|
||
/** | ||
* Returns a global operation identity given the operation name. | ||
*/ | ||
public static GlobalOperationId of(String operation) { | ||
return new GlobalOperationId(null, operation); | ||
} | ||
|
||
/** | ||
* Returns a global operation identity given project and operation names. | ||
*/ | ||
public static GlobalOperationId of(String project, String operation) { | ||
return new GlobalOperationId(project, operation); | ||
} | ||
|
||
/** | ||
* Returns {@code true} if the provided string matches the expected format of a global operation | ||
* URL. Returns {@code false} otherwise. | ||
*/ | ||
static boolean matchesUrl(String url) { | ||
return PATTERN.matcher(url).matches(); | ||
} | ||
|
||
static GlobalOperationId fromUrl(String url) { | ||
Matcher matcher = PATTERN.matcher(url); | ||
if (!matcher.matches()) { | ||
throw new IllegalArgumentException(url + " is not a valid global operation URL"); | ||
} | ||
return GlobalOperationId.of(matcher.group(1), matcher.group(2)); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.