Skip to content

Commit 04a7df3

Browse files
garrettjonesgooglegarrettjonesgoogle
committed
Formatting and merge fixes
1 parent 64b47ab commit 04a7df3

11 files changed

Lines changed: 157 additions & 175 deletions

File tree

‎google-cloud-core/src/main/java/com/google/cloud/Policy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ public static class Builder {
124124
private String etag;
125125
private int version;
126126

127-
protected Builder() {}
127+
protected Builder() {
128+
}
128129

129130
protected Builder(Policy policy) {
130131
setBindings(policy.bindings);

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -392,16 +392,4 @@ protected ListSnapshotsFixedSizeCollection createCollection(
392392
return new ListSnapshotsFixedSizeCollection(pages, collectionSize);
393393
}
394394
}
395-
396-
public static class ListSnapshotsPagedResponse
397-
extends PagedListResponseImpl<ListSnapshotsRequest, ListSnapshotsResponse, Snapshot> {
398-
399-
public ListSnapshotsPagedResponse(
400-
UnaryCallable<ListSnapshotsRequest, ListSnapshotsResponse> callable,
401-
PagedListDescriptor<ListSnapshotsRequest, ListSnapshotsResponse, Snapshot> pageDescriptor,
402-
ListSnapshotsRequest request,
403-
CallContext context) {
404-
super(callable, pageDescriptor, request, context);
405-
}
406-
}
407395
}

‎google-cloud-storage/src/main/java/com/google/cloud/storage/PolicyHelper.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package com.google.cloud.storage;
1818

19-
import java.util.ArrayList;
20-
import java.util.List;
21-
import java.util.Map;
22-
import java.util.Set;
23-
2419
import com.google.api.services.storage.model.Policy.Bindings;
2520
import com.google.cloud.Identity;
2621
import com.google.cloud.Policy;
2722
import com.google.cloud.Role;
23+
import java.util.ArrayList;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.Set;
2827

2928
/**
3029
* Helper for converting between the Policy model provided by the API and the Policy model provided

‎google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,6 @@
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

2222
import com.google.api.gax.core.Page;
23-
import java.io.InputStream;
24-
import java.io.Serializable;
25-
import java.net.URL;
26-
import java.security.Key;
27-
import java.util.Arrays;
28-
import java.util.Collections;
29-
import java.util.LinkedHashSet;
30-
import java.util.LinkedList;
31-
import java.util.List;
32-
import java.util.Objects;
33-
import java.util.Set;
34-
import java.util.concurrent.TimeUnit;
35-
3623
import com.google.auth.ServiceAccountSigner;
3724
import com.google.auth.ServiceAccountSigner.SigningException;
3825
import com.google.cloud.FieldSelector;
@@ -49,6 +36,18 @@
4936
import com.google.common.collect.Iterables;
5037
import com.google.common.collect.Lists;
5138
import com.google.common.io.BaseEncoding;
39+
import java.io.InputStream;
40+
import java.io.Serializable;
41+
import java.net.URL;
42+
import java.security.Key;
43+
import java.util.Arrays;
44+
import java.util.Collections;
45+
import java.util.LinkedHashSet;
46+
import java.util.LinkedList;
47+
import java.util.List;
48+
import java.util.Objects;
49+
import java.util.Set;
50+
import java.util.concurrent.TimeUnit;
5251

5352
/**
5453
* An interface for Google Cloud Storage.
@@ -2371,24 +2370,24 @@ public static Builder newBuilder() {
23712370
* @throws StorageException upon failure
23722371
*/
23732372
List<Acl> listAcls(BlobId blob);
2374-
2373+
23752374
/**
23762375
* Gets the IAM policy for the provided bucket.
2377-
*
2376+
*
23782377
* <p>Example of getting the IAM policy for a bucket.
23792378
* <pre> {@code
23802379
* String bucketName = "my_unique_bucket";
23812380
* Policy policy = storage.getIamPolicy(bucketName);
23822381
* }</pre>
2383-
*
2382+
*
23842383
* @throws StorageException upon failure
23852384
*/
23862385
@GcpLaunchStage.Alpha
23872386
Policy getIamPolicy(String bucket);
2388-
2387+
23892388
/**
23902389
* Updates the IAM policy on the specified bucket.
2391-
*
2390+
*
23922391
* <p>Example of updating the IAM policy on a bucket.
23932392
* <pre>{@code
23942393
* // We want to make all objects in our bucket publicly readable.
@@ -2401,16 +2400,16 @@ public static Builder newBuilder() {
24012400
* .addIdentity(StorageRoles.objectViewer(), Identity.allUsers())
24022401
* .build());
24032402
* }</pre>
2404-
*
2403+
*
24052404
* @throws StorageException upon failure
24062405
*/
24072406
@GcpLaunchStage.Alpha
24082407
Policy setIamPolicy(String bucket, Policy policy);
2409-
2408+
24102409
/**
24112410
* Tests whether the caller holds the permissions on the specified bucket. Returns a list of
24122411
* booleans in the same placement and order in which the permissions were specified.
2413-
*
2412+
*
24142413
* <p>Example of testing permissions on a bucket.
24152414
* <pre> {@code
24162415
* String bucketName = "my_unique_bucket";
@@ -2422,7 +2421,7 @@ public static Builder newBuilder() {
24222421
* // Do something with permission test response
24232422
* }
24242423
* }</pre>
2425-
*
2424+
*
24262425
* @throws StorageException upon failure
24272426
*/
24282427
@GcpLaunchStage.Alpha

‎google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,6 @@
3333
import static com.google.common.base.Preconditions.checkState;
3434
import static java.nio.charset.StandardCharsets.UTF_8;
3535

36-
import java.io.ByteArrayInputStream;
37-
import java.io.InputStream;
38-
import java.io.UnsupportedEncodingException;
39-
import java.net.MalformedURLException;
40-
import java.net.URL;
41-
import java.net.URLEncoder;
42-
import java.util.Arrays;
43-
import java.util.Collections;
44-
import java.util.EnumMap;
45-
import java.util.List;
46-
import java.util.Map;
47-
import java.util.Set;
48-
import java.util.concurrent.Callable;
49-
import java.util.concurrent.TimeUnit;
50-
5136
import com.google.api.gax.core.Page;
5237
import com.google.api.services.storage.model.BucketAccessControl;
5338
import com.google.api.services.storage.model.ObjectAccessControl;
@@ -76,6 +61,20 @@
7661
import com.google.common.io.BaseEncoding;
7762
import com.google.common.net.UrlEscapers;
7863
import com.google.common.primitives.Ints;
64+
import java.io.ByteArrayInputStream;
65+
import java.io.InputStream;
66+
import java.io.UnsupportedEncodingException;
67+
import java.net.MalformedURLException;
68+
import java.net.URL;
69+
import java.net.URLEncoder;
70+
import java.util.Arrays;
71+
import java.util.Collections;
72+
import java.util.EnumMap;
73+
import java.util.List;
74+
import java.util.Map;
75+
import java.util.Set;
76+
import java.util.concurrent.Callable;
77+
import java.util.concurrent.TimeUnit;
7978

8079
final class StorageImpl extends BaseService<StorageOptions> implements Storage {
8180

@@ -860,44 +859,47 @@ public List<ObjectAccessControl> call() {
860859
throw StorageException.translateAndThrow(e);
861860
}
862861
}
863-
862+
864863
@Override
865864
public Policy getIamPolicy(final String bucket) {
866865
try {
867-
return convertFromApiPolicy(runWithRetries(new Callable<com.google.api.services.storage.model.Policy>() {
868-
@Override
869-
public com.google.api.services.storage.model.Policy call() {
870-
return storageRpc.getIamPolicy(bucket);
871-
}
872-
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock()));
873-
} catch (RetryHelperException e){
866+
return convertFromApiPolicy(
867+
runWithRetries(new Callable<com.google.api.services.storage.model.Policy>() {
868+
@Override
869+
public com.google.api.services.storage.model.Policy call() {
870+
return storageRpc.getIamPolicy(bucket);
871+
}
872+
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock()));
873+
} catch (RetryHelperException e) {
874874
throw StorageException.translateAndThrow(e);
875875
}
876876
}
877-
877+
878878
@Override
879879
public Policy setIamPolicy(final String bucket, final Policy policy) {
880880
try {
881-
return convertFromApiPolicy(runWithRetries(new Callable<com.google.api.services.storage.model.Policy>() {
882-
@Override
883-
public com.google.api.services.storage.model.Policy call() {
884-
return storageRpc.setIamPolicy(bucket, convertToApiPolicy(policy));
885-
}
886-
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock()));
881+
return convertFromApiPolicy(
882+
runWithRetries(new Callable<com.google.api.services.storage.model.Policy>() {
883+
@Override
884+
public com.google.api.services.storage.model.Policy call() {
885+
return storageRpc.setIamPolicy(bucket, convertToApiPolicy(policy));
886+
}
887+
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock()));
887888
} catch (RetryHelperException e) {
888889
throw StorageException.translateAndThrow(e);
889890
}
890891
}
891-
892+
892893
@Override
893894
public List<Boolean> testIamPermissions(final String bucket, final List<String> permissions) {
894895
try {
895-
TestIamPermissionsResponse response = runWithRetries(new Callable<TestIamPermissionsResponse>() {
896-
@Override
897-
public TestIamPermissionsResponse call() {
898-
return storageRpc.testIamPermissions(bucket, permissions);
899-
}
900-
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock());
896+
TestIamPermissionsResponse response = runWithRetries(
897+
new Callable<TestIamPermissionsResponse>() {
898+
@Override
899+
public TestIamPermissionsResponse call() {
900+
return storageRpc.testIamPermissions(bucket, permissions);
901+
}
902+
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock());
901903
final Set<String> heldPermissions =
902904
response.getPermissions() != null
903905
? ImmutableSet.copyOf(response.getPermissions())

‎google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.api.services.storage.model.TestIamPermissionsResponse;
2525
import com.google.cloud.ServiceRpc;
2626
import com.google.cloud.storage.StorageException;
27-
2827
import java.io.InputStream;
2928
import java.util.List;
3029
import java.util.Map;
@@ -429,24 +428,24 @@ void write(String uploadId, byte[] toWrite, int toWriteOffset, long destOffset,
429428
* @throws StorageException upon failure
430429
*/
431430
List<ObjectAccessControl> listAcls(String bucket, String object, Long generation);
432-
431+
433432
/**
434433
* Returns the IAM policy for the specified bucket.
435-
*
434+
*
436435
* @throws StorageException upon failure
437436
*/
438437
Policy getIamPolicy(String bucket);
439-
438+
440439
/**
441440
* Updates the IAM policy for the specified bucket.
442-
*
441+
*
443442
* @throws StorageException upon failure
444443
*/
445444
Policy setIamPolicy(String bucket, Policy policy);
446-
445+
447446
/**
448447
* Tests whether the caller holds the specified permissions for the specified bucket.
449-
*
448+
*
450449
* @throws StorageException upon failure
451450
*/
452451
TestIamPermissionsResponse testIamPermissions(String bucket, List<String> permissions);

‎google-cloud-storage/src/test/java/com/google/cloud/storage/PolicyHelperTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919
import static org.junit.Assert.assertEquals;
2020
import static org.junit.Assert.assertTrue;
2121

22-
import org.junit.Test;
23-
2422
import com.google.api.services.storage.model.Policy.Bindings;
2523
import com.google.cloud.Identity;
2624
import com.google.cloud.Policy;
2725
import com.google.cloud.storage.testing.ApiPolicyMatcher;
2826
import com.google.common.collect.ImmutableList;
27+
import org.junit.Test;
2928

3029
public class PolicyHelperTest {
3130

0 commit comments

Comments
 (0)