Skip to content

Commit 310c9b2

Browse files
BenWhiteheadBenWhitehead
authored
fix: remove server unimplemented GrpcStorageImpl#{get,list,create,delete}Notification (#2710)
Partial revert of 830052b
1 parent 51076a8 commit 310c9b2

File tree

11 files changed

+11
-337
lines changed

11 files changed

+11
-337
lines changed

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

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.google.cloud.storage.Utils.ifNonNull;
2222
import static com.google.cloud.storage.Utils.lift;
2323
import static com.google.cloud.storage.Utils.projectNameCodec;
24-
import static com.google.cloud.storage.Utils.topicNameCodec;
2524

2625
import com.google.api.pathtemplate.PathTemplate;
2726
import com.google.cloud.Binding;
@@ -37,8 +36,6 @@
3736
import com.google.cloud.storage.BucketInfo.PublicAccessPrevention;
3837
import com.google.cloud.storage.Conversions.Codec;
3938
import com.google.cloud.storage.HmacKey.HmacKeyState;
40-
import com.google.cloud.storage.NotificationInfo.EventType;
41-
import com.google.cloud.storage.NotificationInfo.PayloadFormat;
4239
import com.google.common.annotations.VisibleForTesting;
4340
import com.google.common.collect.ImmutableList;
4441
import com.google.common.collect.ImmutableSet;
@@ -52,8 +49,6 @@
5249
import com.google.storage.v2.BucketAccessControl;
5350
import com.google.storage.v2.CryptoKeyName;
5451
import com.google.storage.v2.HmacKeyMetadata;
55-
import com.google.storage.v2.NotificationConfig;
56-
import com.google.storage.v2.NotificationConfigName;
5752
import com.google.storage.v2.Object;
5853
import com.google.storage.v2.ObjectAccessControl;
5954
import com.google.storage.v2.ObjectChecksums;
@@ -107,8 +102,6 @@ final class GrpcConversions {
107102
Codec.of(this::blobIdEncode, this::blobIdDecode);
108103
private final Codec<BlobInfo, Object> blobInfoCodec =
109104
Codec.of(this::blobInfoEncode, this::blobInfoDecode);
110-
private final Codec<NotificationInfo, com.google.storage.v2.NotificationConfig>
111-
notificationInfoCodec = Codec.of(this::notificationEncode, this::notificationDecode);
112105
private final Codec<Policy, com.google.iam.v1.Policy> policyCodec =
113106
Codec.of(this::policyEncode, this::policyDecode);
114107
private final Codec<Binding, com.google.iam.v1.Binding> bindingCodec =
@@ -219,10 +212,6 @@ Codec<BlobInfo, Object> blobInfo() {
219212
return blobInfoCodec;
220213
}
221214

222-
Codec<NotificationInfo, com.google.storage.v2.NotificationConfig> notificationInfo() {
223-
return notificationInfoCodec;
224-
}
225-
226215
Codec<Policy, com.google.iam.v1.Policy> policyCodec() {
227216
return policyCodec;
228217
}
@@ -1003,56 +992,6 @@ private BlobInfo blobInfoDecode(Object from) {
1003992
return toBuilder.build();
1004993
}
1005994

1006-
private NotificationConfig notificationEncode(NotificationInfo from) {
1007-
NotificationConfig.Builder to = NotificationConfig.newBuilder();
1008-
String id = from.getNotificationId();
1009-
if (id != null) {
1010-
if (NotificationConfigName.isParsableFrom(id)) {
1011-
ifNonNull(id, to::setName);
1012-
} else {
1013-
NotificationConfigName name = NotificationConfigName.of("_", from.getBucket(), id);
1014-
to.setName(name.toString());
1015-
}
1016-
}
1017-
ifNonNull(from.getTopic(), topicNameCodec::encode, to::setTopic);
1018-
ifNonNull(from.getEtag(), to::setEtag);
1019-
ifNonNull(from.getEventTypes(), toImmutableListOf(EventType::name), to::addAllEventTypes);
1020-
ifNonNull(from.getCustomAttributes(), to::putAllCustomAttributes);
1021-
ifNonNull(from.getObjectNamePrefix(), to::setObjectNamePrefix);
1022-
ifNonNull(from.getPayloadFormat(), PayloadFormat::name, to::setPayloadFormat);
1023-
return to.build();
1024-
}
1025-
1026-
private NotificationInfo notificationDecode(NotificationConfig from) {
1027-
NotificationInfo.Builder to =
1028-
NotificationInfo.newBuilder(topicNameCodec.decode(from.getTopic()));
1029-
if (!from.getName().isEmpty()) {
1030-
NotificationConfigName parse = NotificationConfigName.parse(from.getName());
1031-
// the case where parse could return null is already guarded by the preceding isEmpty check
1032-
//noinspection DataFlowIssue
1033-
to.setNotificationId(parse.getNotificationConfig());
1034-
to.setBucket(parse.getBucket());
1035-
}
1036-
if (!from.getEtag().isEmpty()) {
1037-
to.setEtag(from.getEtag());
1038-
}
1039-
if (!from.getEventTypesList().isEmpty()) {
1040-
EventType[] eventTypes =
1041-
from.getEventTypesList().stream().map(EventType::valueOf).toArray(EventType[]::new);
1042-
to.setEventTypes(eventTypes);
1043-
}
1044-
if (!from.getCustomAttributesMap().isEmpty()) {
1045-
to.setCustomAttributes(from.getCustomAttributesMap());
1046-
}
1047-
if (!from.getObjectNamePrefix().isEmpty()) {
1048-
to.setObjectNamePrefix(from.getObjectNamePrefix());
1049-
}
1050-
if (!from.getPayloadFormat().isEmpty()) {
1051-
to.setPayloadFormat(PayloadFormat.valueOf(from.getPayloadFormat()));
1052-
}
1053-
return to.build();
1054-
}
1055-
1056995
private com.google.iam.v1.Policy policyEncode(Policy from) {
1057996
com.google.iam.v1.Policy.Builder to = com.google.iam.v1.Policy.newBuilder();
1058997
ifNonNull(from.getEtag(), byteStringB64StringCodec::decode, to::setEtag);

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

Lines changed: 5 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -82,29 +82,21 @@
8282
import com.google.storage.v2.ComposeObjectRequest;
8383
import com.google.storage.v2.ComposeObjectRequest.SourceObject;
8484
import com.google.storage.v2.CreateBucketRequest;
85-
import com.google.storage.v2.CreateNotificationConfigRequest;
8685
import com.google.storage.v2.DeleteBucketRequest;
87-
import com.google.storage.v2.DeleteNotificationConfigRequest;
8886
import com.google.storage.v2.DeleteObjectRequest;
8987
import com.google.storage.v2.GetBucketRequest;
90-
import com.google.storage.v2.GetNotificationConfigRequest;
9188
import com.google.storage.v2.GetObjectRequest;
9289
import com.google.storage.v2.ListBucketsRequest;
93-
import com.google.storage.v2.ListNotificationConfigsRequest;
94-
import com.google.storage.v2.ListNotificationConfigsResponse;
9590
import com.google.storage.v2.ListObjectsRequest;
9691
import com.google.storage.v2.ListObjectsResponse;
9792
import com.google.storage.v2.LockBucketRetentionPolicyRequest;
98-
import com.google.storage.v2.NotificationConfig;
99-
import com.google.storage.v2.NotificationConfigName;
10093
import com.google.storage.v2.Object;
10194
import com.google.storage.v2.ObjectAccessControl;
10295
import com.google.storage.v2.ReadObjectRequest;
10396
import com.google.storage.v2.RestoreObjectRequest;
10497
import com.google.storage.v2.RewriteObjectRequest;
10598
import com.google.storage.v2.RewriteResponse;
10699
import com.google.storage.v2.StorageClient;
107-
import com.google.storage.v2.StorageClient.ListNotificationConfigsPage;
108100
import com.google.storage.v2.UpdateBucketRequest;
109101
import com.google.storage.v2.UpdateObjectRequest;
110102
import com.google.storage.v2.WriteObjectRequest;
@@ -1393,96 +1385,23 @@ public ServiceAccount getServiceAccount(String projectId) {
13931385

13941386
@Override
13951387
public Notification createNotification(String bucket, NotificationInfo notificationInfo) {
1396-
NotificationConfig encode = codecs.notificationInfo().encode(notificationInfo);
1397-
CreateNotificationConfigRequest req =
1398-
CreateNotificationConfigRequest.newBuilder()
1399-
.setParent(bucketNameCodec.encode(bucket))
1400-
.setNotificationConfig(encode)
1401-
.build();
1402-
GrpcCallContext retryContext = Retrying.newCallContext();
1403-
return Retrying.run(
1404-
getOptions(),
1405-
retryAlgorithmManager.getFor(req),
1406-
() -> storageClient.createNotificationConfigCallable().call(req, retryContext),
1407-
syntaxDecoders.notificationConfig);
1388+
return throwHttpJsonOnly(
1389+
fmtMethodName("createNotification", String.class, NotificationInfo.class));
14081390
}
14091391

14101392
@Override
14111393
public Notification getNotification(String bucket, String notificationId) {
1412-
String name;
1413-
if (NotificationConfigName.isParsableFrom(notificationId)) {
1414-
name = notificationId;
1415-
} else {
1416-
NotificationConfigName configName = NotificationConfigName.of("_", bucket, notificationId);
1417-
name = configName.toString();
1418-
}
1419-
GetNotificationConfigRequest req =
1420-
GetNotificationConfigRequest.newBuilder().setName(name).build();
1421-
GrpcCallContext retryContext = Retrying.newCallContext();
1422-
return Retrying.run(
1423-
getOptions(),
1424-
retryAlgorithmManager.getFor(req),
1425-
() -> {
1426-
try {
1427-
return storageClient.getNotificationConfigCallable().call(req, retryContext);
1428-
} catch (NotFoundException e) {
1429-
return null;
1430-
}
1431-
},
1432-
syntaxDecoders.notificationConfig);
1394+
return throwHttpJsonOnly(fmtMethodName("getNotification", String.class, String.class));
14331395
}
14341396

14351397
@Override
14361398
public List<Notification> listNotifications(String bucket) {
1437-
ListNotificationConfigsRequest req =
1438-
ListNotificationConfigsRequest.newBuilder()
1439-
.setParent(bucketNameCodec.encode(bucket))
1440-
.build();
1441-
ResultRetryAlgorithm<?> algorithm = retryAlgorithmManager.getFor(req);
1442-
GrpcCallContext retryContext = Retrying.newCallContext();
1443-
return Retrying.run(
1444-
getOptions(),
1445-
algorithm,
1446-
() -> storageClient.listNotificationConfigsPagedCallable().call(req, retryContext),
1447-
resp -> {
1448-
TransformingPageDecorator<
1449-
ListNotificationConfigsRequest,
1450-
ListNotificationConfigsResponse,
1451-
NotificationConfig,
1452-
ListNotificationConfigsPage,
1453-
Notification>
1454-
page =
1455-
new TransformingPageDecorator<>(
1456-
resp.getPage(), syntaxDecoders.notificationConfig, getOptions(), algorithm);
1457-
return ImmutableList.copyOf(page.iterateAll());
1458-
});
1399+
return throwHttpJsonOnly(fmtMethodName("listNotifications", String.class));
14591400
}
14601401

14611402
@Override
14621403
public boolean deleteNotification(String bucket, String notificationId) {
1463-
String name;
1464-
if (NotificationConfigName.isParsableFrom(notificationId)) {
1465-
name = notificationId;
1466-
} else {
1467-
NotificationConfigName configName = NotificationConfigName.of("_", bucket, notificationId);
1468-
name = configName.toString();
1469-
}
1470-
DeleteNotificationConfigRequest req =
1471-
DeleteNotificationConfigRequest.newBuilder().setName(name).build();
1472-
GrpcCallContext retryContext = Retrying.newCallContext();
1473-
return Boolean.TRUE.equals(
1474-
Retrying.run(
1475-
getOptions(),
1476-
retryAlgorithmManager.getFor(req),
1477-
() -> {
1478-
try {
1479-
storageClient.deleteNotificationConfigCallable().call(req, retryContext);
1480-
return true;
1481-
} catch (NotFoundException e) {
1482-
return false;
1483-
}
1484-
},
1485-
Decoder.identity()));
1404+
return throwHttpJsonOnly(fmtMethodName("deleteNotification", String.class, String.class));
14861405
}
14871406

14881407
@BetaApi
@@ -1519,8 +1438,6 @@ private final class SyntaxDecoders {
15191438
o -> codecs.blobInfo().decode(o).asBlob(GrpcStorageImpl.this);
15201439
final Decoder<com.google.storage.v2.Bucket, Bucket> bucket =
15211440
b -> codecs.bucketInfo().decode(b).asBucket(GrpcStorageImpl.this);
1522-
final Decoder<NotificationConfig, Notification> notificationConfig =
1523-
n -> codecs.notificationInfo().decode(n).asNotification(GrpcStorageImpl.this);
15241441
}
15251442

15261443
/**

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ final class JsonConversions {
9494
// when converting from gRPC to apiary or vice-versa we want to preserve this property. Until
9595
// such a time as the apiary model has a project field, we manually apply it with this name.
9696
private static final String PROJECT_ID_FIELD_NAME = "x_project";
97-
// gRPC has a NotificationConfig.name property which contains the bucket the config is associated
98-
// with which that apiary doesn't have yet.
99-
// when converting from gRPC to apiary or vice-versa we want to preserve this property. Until
100-
// such a time as the apiary model has a bucket field, we manually apply it with this name.
101-
private static final String NOTIFICATION_BUCKET_FIELD_NAME = "x_bucket";
10297

10398
private final Codec<Entity, String> entityCodec =
10499
Codec.of(this::entityEncode, this::entityDecode);
@@ -882,7 +877,6 @@ private com.google.api.services.storage.model.Notification notificationEncode(
882877
to.setEtag(from.getEtag());
883878
to.setSelfLink(from.getSelfLink());
884879
to.setTopic(from.getTopic());
885-
ifNonNull(from.getBucket(), b -> to.set(NOTIFICATION_BUCKET_FIELD_NAME, b));
886880
ifNonNull(from.getNotificationId(), to::setId);
887881
ifNonNull(from.getCustomAttributes(), to::setCustomAttributes);
888882
ifNonNull(from.getObjectNamePrefix(), to::setObjectNamePrefix);
@@ -922,7 +916,6 @@ private BucketInfo.HierarchicalNamespace hierarchicalNamespaceDecode(
922916
private NotificationInfo notificationDecode(
923917
com.google.api.services.storage.model.Notification from) {
924918
NotificationInfo.Builder builder = new NotificationInfo.BuilderImpl(from.getTopic());
925-
ifNonNull(from.get(NOTIFICATION_BUCKET_FIELD_NAME), String.class::cast, builder::setBucket);
926919
ifNonNull(from.getId(), builder::setNotificationId);
927920
ifNonNull(from.getEtag(), builder::setEtag);
928921
ifNonNull(from.getCustomAttributes(), builder::setCustomAttributes);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ public Builder setCustomAttributes(Map<String, String> customAttributes) {
8989
return this;
9090
}
9191

92-
@Override
93-
Builder setBucket(String bucket) {
94-
infoBuilder.setBucket(bucket);
95-
return this;
96-
}
97-
9892
@Override
9993
public Notification build() {
10094
return new Notification(storage, infoBuilder);

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.api.core.InternalApi;
2221
import com.google.api.pathtemplate.PathTemplate;
2322
import com.google.common.base.MoreObjects;
2423
import com.google.common.collect.ImmutableMap;
@@ -35,13 +34,11 @@ public class NotificationInfo implements Serializable {
3534
private static final PathTemplate PATH_TEMPLATE =
3635
PathTemplate.createWithoutUrlEncoding("projects/{project}/topics/{topic}");
3736

38-
// TODO: Change to StringEnum in next major version
3937
public enum PayloadFormat {
4038
JSON_API_V1,
4139
NONE
4240
}
4341

44-
// TODO: Change to StringEnum in next major version
4542
public enum EventType {
4643
OBJECT_FINALIZE,
4744
OBJECT_METADATA_UPDATE,
@@ -57,7 +54,6 @@ public enum EventType {
5754
private final String objectNamePrefix;
5855
private final String etag;
5956
private final String selfLink;
60-
private final String bucket;
6157

6258
/** Builder for {@code NotificationInfo}. */
6359
public abstract static class Builder {
@@ -79,8 +75,6 @@ public abstract static class Builder {
7975

8076
public abstract Builder setCustomAttributes(Map<String, String> customAttributes);
8177

82-
abstract Builder setBucket(String bucket);
83-
8478
/** Creates a {@code NotificationInfo} object. */
8579
public abstract NotificationInfo build();
8680
}
@@ -96,7 +90,6 @@ public static class BuilderImpl extends Builder {
9690
private String objectNamePrefix;
9791
private String etag;
9892
private String selfLink;
99-
private String bucket;
10093

10194
BuilderImpl(String topic) {
10295
this.topic = topic;
@@ -111,7 +104,6 @@ public static class BuilderImpl extends Builder {
111104
customAttributes = notificationInfo.customAttributes;
112105
payloadFormat = notificationInfo.payloadFormat;
113106
objectNamePrefix = notificationInfo.objectNamePrefix;
114-
bucket = notificationInfo.bucket;
115107
}
116108

117109
@Override
@@ -164,12 +156,6 @@ public Builder setCustomAttributes(Map<String, String> customAttributes) {
164156
return this;
165157
}
166158

167-
@Override
168-
Builder setBucket(String bucket) {
169-
this.bucket = bucket;
170-
return this;
171-
}
172-
173159
public NotificationInfo build() {
174160
checkNotNull(topic);
175161
checkTopicFormat(topic);
@@ -186,7 +172,6 @@ public NotificationInfo build() {
186172
customAttributes = builder.customAttributes;
187173
payloadFormat = builder.payloadFormat;
188174
objectNamePrefix = builder.objectNamePrefix;
189-
bucket = builder.bucket;
190175
}
191176

192177
/** Returns the service-generated id for the notification. */
@@ -240,15 +225,6 @@ public Map<String, String> getCustomAttributes() {
240225
return customAttributes;
241226
}
242227

243-
/**
244-
* gRPC has the bucket name encoded in the notification name, use this internal property to track
245-
* it.
246-
*/
247-
@InternalApi
248-
String getBucket() {
249-
return bucket;
250-
}
251-
252228
@Override
253229
public int hashCode() {
254230
return Objects.hash(

0 commit comments

Comments
 (0)