Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add functional methods for snapshots and Snapshot class #780

Merged
merged 4 commits into from
Mar 26, 2016
Merged

Add functional methods for snapshots and Snapshot class #780

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe57d61
Add functional methods for snapshots and Snapshot class
mziccard Mar 23, 2016
d86ede9
Fix minor issues with functional snapshot methods and tests
mziccard Mar 24, 2016
fc1d0ed
Add missing final, fix codacy issues
mziccard Mar 25, 2016
bc2d7a1
Better javadoc for aggregated list methods
mziccard Mar 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gcloud-java-compute/src/main/java/com/google/gcloud/compute/Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ public final int hashCode() {
return Objects.hash(super.hashCode(), options);
}

private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {
input.defaultReadObject();
this.compute = options.service();
}

Expand Down
2 changes: 1 addition & 1 deletion gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@ public static SnapshotListOption fields(SnapshotField... fields) {
Snapshot getSnapshot(String snapshot, SnapshotOption... options);

/**
* Lists all snapshots.
* Lists snapshots.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

*
* @throws ComputeException upon failure
*/
Expand Down
1 change: 0 additions & 1 deletion gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,6 @@ public Snapshot apply(com.google.api.services.compute.model.Snapshot snapshot) {
@Override
public Operation deleteSnapshot(SnapshotId snapshot, OperationOption... options) {
return deleteSnapshot(snapshot.snapshot(), options);

}

@Override
Expand Down
4 changes: 2 additions & 2 deletions gcloud-java-compute/src/main/java/com/google/gcloud/compute/Operation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,8 +792,8 @@ com.google.api.services.compute.model.Operation toPb() {
return operationPb;
}

private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {
input.defaultReadObject();
this.compute = options.service();
}

Expand Down
4 changes: 2 additions & 2 deletions gcloud-java-compute/src/main/java/com/google/gcloud/compute/Snapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ public final int hashCode() {
return Objects.hash(super.hashCode(), options);
}

private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {
input.defaultReadObject();
this.compute = options.service();
}

Expand Down
4 changes: 2 additions & 2 deletions gcloud-java-compute/src/test/java/com/google/gcloud/compute/AddressTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public class AddressTest {
private static final AddressInfo.RegionForwardingUsage REGION_FORWARDING_USAGE =
new AddressInfo.RegionForwardingUsage(REGION_FORWARDING_RULES);

private Compute serviceMockReturnsOptions = createStrictMock(Compute.class);
private ComputeOptions mockOptions = createMock(ComputeOptions.class);
private final Compute serviceMockReturnsOptions = createStrictMock(Compute.class);
private final ComputeOptions mockOptions = createMock(ComputeOptions.class);
private Compute compute;
private Address globalForwardingAddress;
private Address instanceAddress;
Expand Down
4 changes: 2 additions & 2 deletions gcloud-java-compute/src/test/java/com/google/gcloud/compute/OperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public class OperationTest {
private static final RegionOperationId REGION_OPERATION_ID =
RegionOperationId.of("project", "region", "op");

private Compute serviceMockReturnsOptions = createStrictMock(Compute.class);
private ComputeOptions mockOptions = createMock(ComputeOptions.class);
private final Compute serviceMockReturnsOptions = createStrictMock(Compute.class);
private final ComputeOptions mockOptions = createMock(ComputeOptions.class);
private Compute compute;
private Operation globalOperation;
private Operation regionOperation;
Expand Down
4 changes: 2 additions & 2 deletions gcloud-java-compute/src/test/java/com/google/gcloud/compute/SnapshotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public class SnapshotTest {
private static final SnapshotInfo.StorageBytesStatus STORAGE_BYTES_STATUS =
SnapshotInfo.StorageBytesStatus.UP_TO_DATE;

private Compute serviceMockReturnsOptions = createStrictMock(Compute.class);
private ComputeOptions mockOptions = createMock(ComputeOptions.class);
private final Compute serviceMockReturnsOptions = createStrictMock(Compute.class);
private final ComputeOptions mockOptions = createMock(ComputeOptions.class);
private Compute compute;
private Snapshot snapshot;
private Snapshot expectedSnapshot;
Expand Down