Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 3acf948

Browse files
feat: deprecate TransferableSkus field (#44)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/679a8fed-21f3-4860-990c-bf5199c9e87f/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 358862009 Source-Link: googleapis/googleapis@2916ac4 BREAKING CHANGE: TransferableSkus field deprecation. Okay to make this change since no clients are using the libraries that were released just last week. The fields were supposed to be deprecated but missed. We have communicated to clients about this change.
1 parent 8496f5e commit 3acf948

20 files changed

Lines changed: 1336 additions & 2326 deletions

File tree

google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java

Lines changed: 370 additions & 328 deletions
Large diffs are not rendered by default.

google-cloud-channel/src/test/java/com/google/cloud/channel/v1/CloudChannelServiceClientTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,6 @@ public void createChannelPartnerLinkTest() throws Exception {
15771577
CreateChannelPartnerLinkRequest.newBuilder()
15781578
.setParent("parent-995424086")
15791579
.setChannelPartnerLink(ChannelPartnerLink.newBuilder().build())
1580-
.setDomain("domain-1326197564")
15811580
.build();
15821581

15831582
ChannelPartnerLink actualResponse = client.createChannelPartnerLink(request);
@@ -1590,7 +1589,6 @@ public void createChannelPartnerLinkTest() throws Exception {
15901589

15911590
Assert.assertEquals(request.getParent(), actualRequest.getParent());
15921591
Assert.assertEquals(request.getChannelPartnerLink(), actualRequest.getChannelPartnerLink());
1593-
Assert.assertEquals(request.getDomain(), actualRequest.getDomain());
15941592
Assert.assertTrue(
15951593
channelProvider.isHeaderSent(
15961594
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1607,7 +1605,6 @@ public void createChannelPartnerLinkExceptionTest() throws Exception {
16071605
CreateChannelPartnerLinkRequest.newBuilder()
16081606
.setParent("parent-995424086")
16091607
.setChannelPartnerLink(ChannelPartnerLink.newBuilder().build())
1610-
.setDomain("domain-1326197564")
16111608
.build();
16121609
client.createChannelPartnerLink(request);
16131610
Assert.fail("No exception raised");

grpc-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java

Lines changed: 484 additions & 668 deletions
Large diffs are not rendered by default.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
6+
<differenceType>7002</differenceType>
7+
<method>* get*(*)</method>
8+
</difference>
9+
<difference>
10+
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
11+
<differenceType>7002</differenceType>
12+
<method>* set*(*)</method>
13+
</difference>
14+
<difference>
15+
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
16+
<differenceType>7002</differenceType>
17+
<method>* clear*(*)</method>
18+
</difference>
19+
<difference>
20+
<className>com/google/cloud/channel/v1/TransferableSku*</className>
21+
<differenceType>7002</differenceType>
22+
<method>* get*(*)</method>
23+
</difference>
24+
<difference>
25+
<className>com/google/cloud/channel/v1/TransferableSku*</className>
26+
<differenceType>7002</differenceType>
27+
<method>* has*(*)</method>
28+
</difference>
29+
<difference>
30+
<className>com/google/cloud/channel/v1/TransferableSku*</className>
31+
<differenceType>7002</differenceType>
32+
<method>* clear*(*)</method>
33+
</difference>
34+
<difference>
35+
<className>com/google/cloud/channel/v1/TransferableSku*</className>
36+
<differenceType>7002</differenceType>
37+
<method>* set*(*)</method>
38+
</difference>
39+
<difference>
40+
<className>com/google/cloud/channel/v1/TransferableSku*</className>
41+
<differenceType>7002</differenceType>
42+
<method>* merge*(*)</method>
43+
</difference>
44+
<difference>
45+
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
46+
<differenceType>6011</differenceType>
47+
<field>*_FIELD_NUMBER</field>
48+
</difference>
49+
<difference>
50+
<className>com/google/cloud/channel/v1/TransferableSku*</className>
51+
<differenceType>6011</differenceType>
52+
<field>*_FIELD_NUMBER</field>
53+
</difference>
54+
</differences>

proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest.java

Lines changed: 0 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ private CreateChannelPartnerLinkRequest(
4040

4141
private CreateChannelPartnerLinkRequest() {
4242
parent_ = "";
43-
domain_ = "";
4443
}
4544

4645
@java.lang.Override
@@ -93,13 +92,6 @@ private CreateChannelPartnerLinkRequest(
9392
channelPartnerLink_ = subBuilder.buildPartial();
9493
}
9594

96-
break;
97-
}
98-
case 26:
99-
{
100-
java.lang.String s = input.readStringRequireUtf8();
101-
102-
domain_ = s;
10395
break;
10496
}
10597
default:
@@ -249,59 +241,6 @@ public com.google.cloud.channel.v1.ChannelPartnerLinkOrBuilder getChannelPartner
249241
return getChannelPartnerLink();
250242
}
251243

252-
public static final int DOMAIN_FIELD_NUMBER = 3;
253-
private volatile java.lang.Object domain_;
254-
/**
255-
*
256-
*
257-
* <pre>
258-
* Optional. The invited partner's domain. Either domain or
259-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
260-
* link.
261-
* </pre>
262-
*
263-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
264-
*
265-
* @return The domain.
266-
*/
267-
@java.lang.Override
268-
public java.lang.String getDomain() {
269-
java.lang.Object ref = domain_;
270-
if (ref instanceof java.lang.String) {
271-
return (java.lang.String) ref;
272-
} else {
273-
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
274-
java.lang.String s = bs.toStringUtf8();
275-
domain_ = s;
276-
return s;
277-
}
278-
}
279-
/**
280-
*
281-
*
282-
* <pre>
283-
* Optional. The invited partner's domain. Either domain or
284-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
285-
* link.
286-
* </pre>
287-
*
288-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
289-
*
290-
* @return The bytes for domain.
291-
*/
292-
@java.lang.Override
293-
public com.google.protobuf.ByteString getDomainBytes() {
294-
java.lang.Object ref = domain_;
295-
if (ref instanceof java.lang.String) {
296-
com.google.protobuf.ByteString b =
297-
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
298-
domain_ = b;
299-
return b;
300-
} else {
301-
return (com.google.protobuf.ByteString) ref;
302-
}
303-
}
304-
305244
private byte memoizedIsInitialized = -1;
306245

307246
@java.lang.Override
@@ -322,9 +261,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
322261
if (channelPartnerLink_ != null) {
323262
output.writeMessage(2, getChannelPartnerLink());
324263
}
325-
if (!getDomainBytes().isEmpty()) {
326-
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, domain_);
327-
}
328264
unknownFields.writeTo(output);
329265
}
330266

@@ -340,9 +276,6 @@ public int getSerializedSize() {
340276
if (channelPartnerLink_ != null) {
341277
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getChannelPartnerLink());
342278
}
343-
if (!getDomainBytes().isEmpty()) {
344-
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, domain_);
345-
}
346279
size += unknownFields.getSerializedSize();
347280
memoizedSize = size;
348281
return size;
@@ -364,7 +297,6 @@ public boolean equals(final java.lang.Object obj) {
364297
if (hasChannelPartnerLink()) {
365298
if (!getChannelPartnerLink().equals(other.getChannelPartnerLink())) return false;
366299
}
367-
if (!getDomain().equals(other.getDomain())) return false;
368300
if (!unknownFields.equals(other.unknownFields)) return false;
369301
return true;
370302
}
@@ -382,8 +314,6 @@ public int hashCode() {
382314
hash = (37 * hash) + CHANNEL_PARTNER_LINK_FIELD_NUMBER;
383315
hash = (53 * hash) + getChannelPartnerLink().hashCode();
384316
}
385-
hash = (37 * hash) + DOMAIN_FIELD_NUMBER;
386-
hash = (53 * hash) + getDomain().hashCode();
387317
hash = (29 * hash) + unknownFields.hashCode();
388318
memoizedHashCode = hash;
389319
return hash;
@@ -538,8 +468,6 @@ public Builder clear() {
538468
channelPartnerLink_ = null;
539469
channelPartnerLinkBuilder_ = null;
540470
}
541-
domain_ = "";
542-
543471
return this;
544472
}
545473

@@ -573,7 +501,6 @@ public com.google.cloud.channel.v1.CreateChannelPartnerLinkRequest buildPartial(
573501
} else {
574502
result.channelPartnerLink_ = channelPartnerLinkBuilder_.build();
575503
}
576-
result.domain_ = domain_;
577504
onBuilt();
578505
return result;
579506
}
@@ -631,10 +558,6 @@ public Builder mergeFrom(com.google.cloud.channel.v1.CreateChannelPartnerLinkReq
631558
if (other.hasChannelPartnerLink()) {
632559
mergeChannelPartnerLink(other.getChannelPartnerLink());
633560
}
634-
if (!other.getDomain().isEmpty()) {
635-
domain_ = other.domain_;
636-
onChanged();
637-
}
638561
this.mergeUnknownFields(other.unknownFields);
639562
onChanged();
640563
return this;
@@ -1004,122 +927,6 @@ public com.google.cloud.channel.v1.ChannelPartnerLink.Builder getChannelPartnerL
1004927
return channelPartnerLinkBuilder_;
1005928
}
1006929

1007-
private java.lang.Object domain_ = "";
1008-
/**
1009-
*
1010-
*
1011-
* <pre>
1012-
* Optional. The invited partner's domain. Either domain or
1013-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
1014-
* link.
1015-
* </pre>
1016-
*
1017-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
1018-
*
1019-
* @return The domain.
1020-
*/
1021-
public java.lang.String getDomain() {
1022-
java.lang.Object ref = domain_;
1023-
if (!(ref instanceof java.lang.String)) {
1024-
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
1025-
java.lang.String s = bs.toStringUtf8();
1026-
domain_ = s;
1027-
return s;
1028-
} else {
1029-
return (java.lang.String) ref;
1030-
}
1031-
}
1032-
/**
1033-
*
1034-
*
1035-
* <pre>
1036-
* Optional. The invited partner's domain. Either domain or
1037-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
1038-
* link.
1039-
* </pre>
1040-
*
1041-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
1042-
*
1043-
* @return The bytes for domain.
1044-
*/
1045-
public com.google.protobuf.ByteString getDomainBytes() {
1046-
java.lang.Object ref = domain_;
1047-
if (ref instanceof String) {
1048-
com.google.protobuf.ByteString b =
1049-
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
1050-
domain_ = b;
1051-
return b;
1052-
} else {
1053-
return (com.google.protobuf.ByteString) ref;
1054-
}
1055-
}
1056-
/**
1057-
*
1058-
*
1059-
* <pre>
1060-
* Optional. The invited partner's domain. Either domain or
1061-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
1062-
* link.
1063-
* </pre>
1064-
*
1065-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
1066-
*
1067-
* @param value The domain to set.
1068-
* @return This builder for chaining.
1069-
*/
1070-
public Builder setDomain(java.lang.String value) {
1071-
if (value == null) {
1072-
throw new NullPointerException();
1073-
}
1074-
1075-
domain_ = value;
1076-
onChanged();
1077-
return this;
1078-
}
1079-
/**
1080-
*
1081-
*
1082-
* <pre>
1083-
* Optional. The invited partner's domain. Either domain or
1084-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
1085-
* link.
1086-
* </pre>
1087-
*
1088-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
1089-
*
1090-
* @return This builder for chaining.
1091-
*/
1092-
public Builder clearDomain() {
1093-
1094-
domain_ = getDefaultInstance().getDomain();
1095-
onChanged();
1096-
return this;
1097-
}
1098-
/**
1099-
*
1100-
*
1101-
* <pre>
1102-
* Optional. The invited partner's domain. Either domain or
1103-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
1104-
* link.
1105-
* </pre>
1106-
*
1107-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
1108-
*
1109-
* @param value The bytes for domain to set.
1110-
* @return This builder for chaining.
1111-
*/
1112-
public Builder setDomainBytes(com.google.protobuf.ByteString value) {
1113-
if (value == null) {
1114-
throw new NullPointerException();
1115-
}
1116-
checkByteStringIsUtf8(value);
1117-
1118-
domain_ = value;
1119-
onChanged();
1120-
return this;
1121-
}
1122-
1123930
@java.lang.Override
1124931
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
1125932
return super.setUnknownFields(unknownFields);

proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CreateChannelPartnerLinkRequestOrBuilder.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -98,33 +98,4 @@ public interface CreateChannelPartnerLinkRequestOrBuilder
9898
* </code>
9999
*/
100100
com.google.cloud.channel.v1.ChannelPartnerLinkOrBuilder getChannelPartnerLinkOrBuilder();
101-
102-
/**
103-
*
104-
*
105-
* <pre>
106-
* Optional. The invited partner's domain. Either domain or
107-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
108-
* link.
109-
* </pre>
110-
*
111-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
112-
*
113-
* @return The domain.
114-
*/
115-
java.lang.String getDomain();
116-
/**
117-
*
118-
*
119-
* <pre>
120-
* Optional. The invited partner's domain. Either domain or
121-
* channel_partner_link.reseller_cloud_identity_id can be used to create a
122-
* link.
123-
* </pre>
124-
*
125-
* <code>string domain = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
126-
*
127-
* @return The bytes for domain.
128-
*/
129-
com.google.protobuf.ByteString getDomainBytes();
130101
}

0 commit comments

Comments
 (0)