diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java index 7d07f32436..5414ae4c2c 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java @@ -113,7 +113,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERVICE_FIELD_NUMBER = 1; - private volatile java.lang.Object service_; + + @SuppressWarnings("serial") + private volatile java.lang.Object service_ = ""; /** * * @@ -166,6 +168,8 @@ public com.google.protobuf.ByteString getServiceBytes() { } public static final int AUDIT_LOG_CONFIGS_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private java.util.List auditLogConfigs_; /** * @@ -484,15 +488,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; service_ = ""; - if (auditLogConfigsBuilder_ == null) { auditLogConfigs_ = java.util.Collections.emptyList(); } else { auditLogConfigs_ = null; auditLogConfigsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -518,19 +522,31 @@ public com.google.iam.v1.AuditConfig build() { @java.lang.Override public com.google.iam.v1.AuditConfig buildPartial() { com.google.iam.v1.AuditConfig result = new com.google.iam.v1.AuditConfig(this); - int from_bitField0_ = bitField0_; - result.service_ = service_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v1.AuditConfig result) { if (auditLogConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { auditLogConfigs_ = java.util.Collections.unmodifiableList(auditLogConfigs_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.auditLogConfigs_ = auditLogConfigs_; } else { result.auditLogConfigs_ = auditLogConfigsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v1.AuditConfig result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.service_ = service_; + } } @java.lang.Override @@ -580,13 +596,14 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfig other) { if (other == com.google.iam.v1.AuditConfig.getDefaultInstance()) return this; if (!other.getService().isEmpty()) { service_ = other.service_; + bitField0_ |= 0x00000001; onChanged(); } if (auditLogConfigsBuilder_ == null) { if (!other.auditLogConfigs_.isEmpty()) { if (auditLogConfigs_.isEmpty()) { auditLogConfigs_ = other.auditLogConfigs_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureAuditLogConfigsIsMutable(); auditLogConfigs_.addAll(other.auditLogConfigs_); @@ -599,7 +616,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfig other) { auditLogConfigsBuilder_.dispose(); auditLogConfigsBuilder_ = null; auditLogConfigs_ = other.auditLogConfigs_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); auditLogConfigsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getAuditLogConfigsFieldBuilder() @@ -638,7 +655,7 @@ public Builder mergeFrom( case 10: { service_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 26: @@ -739,8 +756,8 @@ public Builder setService(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - service_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -758,8 +775,8 @@ public Builder setService(java.lang.String value) { * @return This builder for chaining. */ public Builder clearService() { - service_ = getDefaultInstance().getService(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -782,8 +799,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - service_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -792,10 +809,10 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureAuditLogConfigsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { auditLogConfigs_ = new java.util.ArrayList(auditLogConfigs_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1010,7 +1027,7 @@ public Builder addAllAuditLogConfigs( public Builder clearAuditLogConfigs() { if (auditLogConfigsBuilder_ == null) { auditLogConfigs_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { auditLogConfigsBuilder_.clear(); @@ -1133,7 +1150,7 @@ public com.google.iam.v1.AuditLogConfig.Builder addAuditLogConfigsBuilder(int in com.google.iam.v1.AuditLogConfig.Builder, com.google.iam.v1.AuditLogConfigOrBuilder>( auditLogConfigs_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); auditLogConfigs_ = null; diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java index 622b64143c..9fc1f68b1d 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java @@ -228,7 +228,7 @@ private Action(int value) { } public static final int ACTION_FIELD_NUMBER = 1; - private int action_; + private int action_ = 0; /** * * @@ -259,14 +259,15 @@ public int getActionValue() { */ @java.lang.Override public com.google.iam.v1.AuditConfigDelta.Action getAction() { - @SuppressWarnings("deprecation") com.google.iam.v1.AuditConfigDelta.Action result = - com.google.iam.v1.AuditConfigDelta.Action.valueOf(action_); + com.google.iam.v1.AuditConfigDelta.Action.forNumber(action_); return result == null ? com.google.iam.v1.AuditConfigDelta.Action.UNRECOGNIZED : result; } public static final int SERVICE_FIELD_NUMBER = 2; - private volatile java.lang.Object service_; + + @SuppressWarnings("serial") + private volatile java.lang.Object service_ = ""; /** * * @@ -321,7 +322,9 @@ public com.google.protobuf.ByteString getServiceBytes() { } public static final int EXEMPTED_MEMBER_FIELD_NUMBER = 3; - private volatile java.lang.Object exemptedMember_; + + @SuppressWarnings("serial") + private volatile java.lang.Object exemptedMember_ = ""; /** * * @@ -374,7 +377,9 @@ public com.google.protobuf.ByteString getExemptedMemberBytes() { } public static final int LOG_TYPE_FIELD_NUMBER = 4; - private volatile java.lang.Object logType_; + + @SuppressWarnings("serial") + private volatile java.lang.Object logType_ = ""; /** * * @@ -649,14 +654,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; action_ = 0; - service_ = ""; - exemptedMember_ = ""; - logType_ = ""; - return this; } @@ -683,14 +685,29 @@ public com.google.iam.v1.AuditConfigDelta build() { @java.lang.Override public com.google.iam.v1.AuditConfigDelta buildPartial() { com.google.iam.v1.AuditConfigDelta result = new com.google.iam.v1.AuditConfigDelta(this); - result.action_ = action_; - result.service_ = service_; - result.exemptedMember_ = exemptedMember_; - result.logType_ = logType_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v1.AuditConfigDelta result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.action_ = action_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.service_ = service_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.exemptedMember_ = exemptedMember_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.logType_ = logType_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -741,14 +758,17 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfigDelta other) { } if (!other.getService().isEmpty()) { service_ = other.service_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getExemptedMember().isEmpty()) { exemptedMember_ = other.exemptedMember_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getLogType().isEmpty()) { logType_ = other.logType_; + bitField0_ |= 0x00000008; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -780,25 +800,25 @@ public Builder mergeFrom( case 8: { action_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { service_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { exemptedMember_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { logType_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -818,6 +838,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int action_ = 0; /** * @@ -849,8 +871,8 @@ public int getActionValue() { * @return This builder for chaining. */ public Builder setActionValue(int value) { - action_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -868,9 +890,8 @@ public Builder setActionValue(int value) { */ @java.lang.Override public com.google.iam.v1.AuditConfigDelta.Action getAction() { - @SuppressWarnings("deprecation") com.google.iam.v1.AuditConfigDelta.Action result = - com.google.iam.v1.AuditConfigDelta.Action.valueOf(action_); + com.google.iam.v1.AuditConfigDelta.Action.forNumber(action_); return result == null ? com.google.iam.v1.AuditConfigDelta.Action.UNRECOGNIZED : result; } /** @@ -890,7 +911,7 @@ public Builder setAction(com.google.iam.v1.AuditConfigDelta.Action value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; action_ = value.getNumber(); onChanged(); return this; @@ -908,7 +929,7 @@ public Builder setAction(com.google.iam.v1.AuditConfigDelta.Action value) { * @return This builder for chaining. */ public Builder clearAction() { - + bitField0_ = (bitField0_ & ~0x00000001); action_ = 0; onChanged(); return this; @@ -984,8 +1005,8 @@ public Builder setService(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - service_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1004,8 +1025,8 @@ public Builder setService(java.lang.String value) { * @return This builder for chaining. */ public Builder clearService() { - service_ = getDefaultInstance().getService(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1029,8 +1050,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - service_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1102,8 +1123,8 @@ public Builder setExemptedMember(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - exemptedMember_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1121,8 +1142,8 @@ public Builder setExemptedMember(java.lang.String value) { * @return This builder for chaining. */ public Builder clearExemptedMember() { - exemptedMember_ = getDefaultInstance().getExemptedMember(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1145,8 +1166,8 @@ public Builder setExemptedMemberBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - exemptedMember_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1218,8 +1239,8 @@ public Builder setLogType(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - logType_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1237,8 +1258,8 @@ public Builder setLogType(java.lang.String value) { * @return This builder for chaining. */ public Builder clearLogType() { - logType_ = getDefaultInstance().getLogType(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1261,8 +1282,8 @@ public Builder setLogTypeBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - logType_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java index 645f2c04db..c80e4b2511 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java @@ -263,7 +263,7 @@ private LogType(int value) { } public static final int LOG_TYPE_FIELD_NUMBER = 1; - private int logType_; + private int logType_ = 0; /** * * @@ -292,13 +292,14 @@ public int getLogTypeValue() { */ @java.lang.Override public com.google.iam.v1.AuditLogConfig.LogType getLogType() { - @SuppressWarnings("deprecation") com.google.iam.v1.AuditLogConfig.LogType result = - com.google.iam.v1.AuditLogConfig.LogType.valueOf(logType_); + com.google.iam.v1.AuditLogConfig.LogType.forNumber(logType_); return result == null ? com.google.iam.v1.AuditLogConfig.LogType.UNRECOGNIZED : result; } public static final int EXEMPTED_MEMBERS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList exemptedMembers_; /** * @@ -593,10 +594,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; logType_ = 0; - exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -622,17 +623,29 @@ public com.google.iam.v1.AuditLogConfig build() { @java.lang.Override public com.google.iam.v1.AuditLogConfig buildPartial() { com.google.iam.v1.AuditLogConfig result = new com.google.iam.v1.AuditLogConfig(this); - int from_bitField0_ = bitField0_; - result.logType_ = logType_; - if (((bitField0_ & 0x00000001) != 0)) { - exemptedMembers_ = exemptedMembers_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.exemptedMembers_ = exemptedMembers_; onBuilt(); return result; } + private void buildPartialRepeatedFields(com.google.iam.v1.AuditLogConfig result) { + if (((bitField0_ & 0x00000002) != 0)) { + exemptedMembers_ = exemptedMembers_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.exemptedMembers_ = exemptedMembers_; + } + + private void buildPartial0(com.google.iam.v1.AuditLogConfig result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.logType_ = logType_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -684,7 +697,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditLogConfig other) { if (!other.exemptedMembers_.isEmpty()) { if (exemptedMembers_.isEmpty()) { exemptedMembers_ = other.exemptedMembers_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureExemptedMembersIsMutable(); exemptedMembers_.addAll(other.exemptedMembers_); @@ -720,7 +733,7 @@ public Builder mergeFrom( case 8: { logType_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: @@ -778,8 +791,8 @@ public int getLogTypeValue() { * @return This builder for chaining. */ public Builder setLogTypeValue(int value) { - logType_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -796,9 +809,8 @@ public Builder setLogTypeValue(int value) { */ @java.lang.Override public com.google.iam.v1.AuditLogConfig.LogType getLogType() { - @SuppressWarnings("deprecation") com.google.iam.v1.AuditLogConfig.LogType result = - com.google.iam.v1.AuditLogConfig.LogType.valueOf(logType_); + com.google.iam.v1.AuditLogConfig.LogType.forNumber(logType_); return result == null ? com.google.iam.v1.AuditLogConfig.LogType.UNRECOGNIZED : result; } /** @@ -817,7 +829,7 @@ public Builder setLogType(com.google.iam.v1.AuditLogConfig.LogType value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; logType_ = value.getNumber(); onChanged(); return this; @@ -834,7 +846,7 @@ public Builder setLogType(com.google.iam.v1.AuditLogConfig.LogType value) { * @return This builder for chaining. */ public Builder clearLogType() { - + bitField0_ = (bitField0_ & ~0x00000001); logType_ = 0; onChanged(); return this; @@ -844,9 +856,9 @@ public Builder clearLogType() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureExemptedMembersIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { exemptedMembers_ = new com.google.protobuf.LazyStringArrayList(exemptedMembers_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } /** @@ -997,7 +1009,7 @@ public Builder addAllExemptedMembers(java.lang.Iterable values */ public Builder clearExemptedMembers() { exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java index d4cb1d80f7..b24aa460af 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java @@ -66,7 +66,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROLE_FIELD_NUMBER = 1; - private volatile java.lang.Object role_; + + @SuppressWarnings("serial") + private volatile java.lang.Object role_ = ""; /** * * @@ -117,6 +119,8 @@ public com.google.protobuf.ByteString getRoleBytes() { } public static final int MEMBERS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList members_; /** * @@ -364,7 +368,7 @@ public com.google.type.Expr getCondition() { */ @java.lang.Override public com.google.type.ExprOrBuilder getConditionOrBuilder() { - return getCondition(); + return condition_ == null ? com.google.type.Expr.getDefaultInstance() : condition_; } private byte memoizedIsInitialized = -1; @@ -589,14 +593,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; role_ = ""; - members_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - if (conditionBuilder_ == null) { - condition_ = null; - } else { - condition_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + condition_ = null; + if (conditionBuilder_ != null) { + conditionBuilder_.dispose(); conditionBuilder_ = null; } return this; @@ -624,20 +627,30 @@ public com.google.iam.v1.Binding build() { @java.lang.Override public com.google.iam.v1.Binding buildPartial() { com.google.iam.v1.Binding result = new com.google.iam.v1.Binding(this); - int from_bitField0_ = bitField0_; - result.role_ = role_; - if (((bitField0_ & 0x00000001) != 0)) { + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v1.Binding result) { + if (((bitField0_ & 0x00000002) != 0)) { members_ = members_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.members_ = members_; - if (conditionBuilder_ == null) { - result.condition_ = condition_; - } else { - result.condition_ = conditionBuilder_.build(); + } + + private void buildPartial0(com.google.iam.v1.Binding result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.role_ = role_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.condition_ = conditionBuilder_ == null ? condition_ : conditionBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -687,12 +700,13 @@ public Builder mergeFrom(com.google.iam.v1.Binding other) { if (other == com.google.iam.v1.Binding.getDefaultInstance()) return this; if (!other.getRole().isEmpty()) { role_ = other.role_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.members_.isEmpty()) { if (members_.isEmpty()) { members_ = other.members_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureMembersIsMutable(); members_.addAll(other.members_); @@ -731,7 +745,7 @@ public Builder mergeFrom( case 10: { role_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -744,7 +758,7 @@ public Builder mergeFrom( case 26: { input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -830,8 +844,8 @@ public Builder setRole(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - role_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -848,8 +862,8 @@ public Builder setRole(java.lang.String value) { * @return This builder for chaining. */ public Builder clearRole() { - role_ = getDefaultInstance().getRole(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -871,8 +885,8 @@ public Builder setRoleBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - role_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -881,9 +895,9 @@ public Builder setRoleBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureMembersIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { members_ = new com.google.protobuf.LazyStringArrayList(members_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } /** @@ -1258,7 +1272,7 @@ public Builder addAllMembers(java.lang.Iterable values) { */ public Builder clearMembers() { members_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1339,7 +1353,7 @@ public Builder addMembersBytes(com.google.protobuf.ByteString value) { * @return Whether the condition field is set. */ public boolean hasCondition() { - return conditionBuilder_ != null || condition_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1390,11 +1404,11 @@ public Builder setCondition(com.google.type.Expr value) { throw new NullPointerException(); } condition_ = value; - onChanged(); } else { conditionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1417,11 +1431,11 @@ public Builder setCondition(com.google.type.Expr value) { public Builder setCondition(com.google.type.Expr.Builder builderForValue) { if (conditionBuilder_ == null) { condition_ = builderForValue.build(); - onChanged(); } else { conditionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1443,16 +1457,18 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) { */ public Builder mergeCondition(com.google.type.Expr value) { if (conditionBuilder_ == null) { - if (condition_ != null) { - condition_ = com.google.type.Expr.newBuilder(condition_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && condition_ != null + && condition_ != com.google.type.Expr.getDefaultInstance()) { + getConditionBuilder().mergeFrom(value); } else { condition_ = value; } - onChanged(); } else { conditionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1473,14 +1489,13 @@ public Builder mergeCondition(com.google.type.Expr value) { * .google.type.Expr condition = 3; */ public Builder clearCondition() { - if (conditionBuilder_ == null) { - condition_ = null; - onChanged(); - } else { - condition_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + condition_ = null; + if (conditionBuilder_ != null) { + conditionBuilder_.dispose(); conditionBuilder_ = null; } - + onChanged(); return this; } /** @@ -1501,7 +1516,7 @@ public Builder clearCondition() { * .google.type.Expr condition = 3; */ public com.google.type.Expr.Builder getConditionBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getConditionFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java index f6d46a10be..340980bdfc 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java @@ -226,7 +226,7 @@ private Action(int value) { } public static final int ACTION_FIELD_NUMBER = 1; - private int action_; + private int action_ = 0; /** * * @@ -257,14 +257,15 @@ public int getActionValue() { */ @java.lang.Override public com.google.iam.v1.BindingDelta.Action getAction() { - @SuppressWarnings("deprecation") com.google.iam.v1.BindingDelta.Action result = - com.google.iam.v1.BindingDelta.Action.valueOf(action_); + com.google.iam.v1.BindingDelta.Action.forNumber(action_); return result == null ? com.google.iam.v1.BindingDelta.Action.UNRECOGNIZED : result; } public static final int ROLE_FIELD_NUMBER = 2; - private volatile java.lang.Object role_; + + @SuppressWarnings("serial") + private volatile java.lang.Object role_ = ""; /** * * @@ -317,7 +318,9 @@ public com.google.protobuf.ByteString getRoleBytes() { } public static final int MEMBER_FIELD_NUMBER = 3; - private volatile java.lang.Object member_; + + @SuppressWarnings("serial") + private volatile java.lang.Object member_ = ""; /** * * @@ -412,7 +415,7 @@ public com.google.type.Expr getCondition() { */ @java.lang.Override public com.google.type.ExprOrBuilder getConditionOrBuilder() { - return getCondition(); + return condition_ == null ? com.google.type.Expr.getDefaultInstance() : condition_; } private byte memoizedIsInitialized = -1; @@ -641,16 +644,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; action_ = 0; - role_ = ""; - member_ = ""; - - if (conditionBuilder_ == null) { - condition_ = null; - } else { - condition_ = null; + condition_ = null; + if (conditionBuilder_ != null) { + conditionBuilder_.dispose(); conditionBuilder_ = null; } return this; @@ -678,18 +678,29 @@ public com.google.iam.v1.BindingDelta build() { @java.lang.Override public com.google.iam.v1.BindingDelta buildPartial() { com.google.iam.v1.BindingDelta result = new com.google.iam.v1.BindingDelta(this); - result.action_ = action_; - result.role_ = role_; - result.member_ = member_; - if (conditionBuilder_ == null) { - result.condition_ = condition_; - } else { - result.condition_ = conditionBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v1.BindingDelta result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.action_ = action_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.role_ = role_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.member_ = member_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.condition_ = conditionBuilder_ == null ? condition_ : conditionBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -740,10 +751,12 @@ public Builder mergeFrom(com.google.iam.v1.BindingDelta other) { } if (!other.getRole().isEmpty()) { role_ = other.role_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getMember().isEmpty()) { member_ = other.member_; + bitField0_ |= 0x00000004; onChanged(); } if (other.hasCondition()) { @@ -778,25 +791,25 @@ public Builder mergeFrom( case 8: { action_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { role_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { member_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -816,6 +829,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int action_ = 0; /** * @@ -847,8 +862,8 @@ public int getActionValue() { * @return This builder for chaining. */ public Builder setActionValue(int value) { - action_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -866,9 +881,8 @@ public Builder setActionValue(int value) { */ @java.lang.Override public com.google.iam.v1.BindingDelta.Action getAction() { - @SuppressWarnings("deprecation") com.google.iam.v1.BindingDelta.Action result = - com.google.iam.v1.BindingDelta.Action.valueOf(action_); + com.google.iam.v1.BindingDelta.Action.forNumber(action_); return result == null ? com.google.iam.v1.BindingDelta.Action.UNRECOGNIZED : result; } /** @@ -888,7 +902,7 @@ public Builder setAction(com.google.iam.v1.BindingDelta.Action value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; action_ = value.getNumber(); onChanged(); return this; @@ -906,7 +920,7 @@ public Builder setAction(com.google.iam.v1.BindingDelta.Action value) { * @return This builder for chaining. */ public Builder clearAction() { - + bitField0_ = (bitField0_ & ~0x00000001); action_ = 0; onChanged(); return this; @@ -979,8 +993,8 @@ public Builder setRole(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - role_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -998,8 +1012,8 @@ public Builder setRole(java.lang.String value) { * @return This builder for chaining. */ public Builder clearRole() { - role_ = getDefaultInstance().getRole(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1022,8 +1036,8 @@ public Builder setRoleBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - role_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1095,8 +1109,8 @@ public Builder setMember(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - member_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1114,8 +1128,8 @@ public Builder setMember(java.lang.String value) { * @return This builder for chaining. */ public Builder clearMember() { - member_ = getDefaultInstance().getMember(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1138,8 +1152,8 @@ public Builder setMemberBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - member_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1160,7 +1174,7 @@ public Builder setMemberBytes(com.google.protobuf.ByteString value) { * @return Whether the condition field is set. */ public boolean hasCondition() { - return conditionBuilder_ != null || condition_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1195,11 +1209,11 @@ public Builder setCondition(com.google.type.Expr value) { throw new NullPointerException(); } condition_ = value; - onChanged(); } else { conditionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1214,11 +1228,11 @@ public Builder setCondition(com.google.type.Expr value) { public Builder setCondition(com.google.type.Expr.Builder builderForValue) { if (conditionBuilder_ == null) { condition_ = builderForValue.build(); - onChanged(); } else { conditionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1232,16 +1246,18 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) { */ public Builder mergeCondition(com.google.type.Expr value) { if (conditionBuilder_ == null) { - if (condition_ != null) { - condition_ = com.google.type.Expr.newBuilder(condition_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && condition_ != null + && condition_ != com.google.type.Expr.getDefaultInstance()) { + getConditionBuilder().mergeFrom(value); } else { condition_ = value; } - onChanged(); } else { conditionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1254,14 +1270,13 @@ public Builder mergeCondition(com.google.type.Expr value) { * .google.type.Expr condition = 4; */ public Builder clearCondition() { - if (conditionBuilder_ == null) { - condition_ = null; - onChanged(); - } else { - condition_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + condition_ = null; + if (conditionBuilder_ != null) { + conditionBuilder_.dispose(); conditionBuilder_ = null; } - + onChanged(); return this; } /** @@ -1274,7 +1289,7 @@ public Builder clearCondition() { * .google.type.Expr condition = 4; */ public com.google.type.Expr.Builder getConditionBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getConditionFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java index 883feeaae9..532f56549c 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RESOURCE_FIELD_NUMBER = 1; - private volatile java.lang.Object resource_; + + @SuppressWarnings("serial") + private volatile java.lang.Object resource_ = ""; /** * * @@ -168,7 +170,7 @@ public com.google.iam.v1.GetPolicyOptions getOptions() { */ @java.lang.Override public com.google.iam.v1.GetPolicyOptionsOrBuilder getOptionsOrBuilder() { - return getOptions(); + return options_ == null ? com.google.iam.v1.GetPolicyOptions.getDefaultInstance() : options_; } private byte memoizedIsInitialized = -1; @@ -380,12 +382,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; resource_ = ""; - - if (optionsBuilder_ == null) { - options_ = null; - } else { - options_ = null; + options_ = null; + if (optionsBuilder_ != null) { + optionsBuilder_.dispose(); optionsBuilder_ = null; } return this; @@ -415,16 +416,23 @@ public com.google.iam.v1.GetIamPolicyRequest build() { public com.google.iam.v1.GetIamPolicyRequest buildPartial() { com.google.iam.v1.GetIamPolicyRequest result = new com.google.iam.v1.GetIamPolicyRequest(this); - result.resource_ = resource_; - if (optionsBuilder_ == null) { - result.options_ = options_; - } else { - result.options_ = optionsBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v1.GetIamPolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.resource_ = resource_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.options_ = optionsBuilder_ == null ? options_ : optionsBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -472,6 +480,7 @@ public Builder mergeFrom(com.google.iam.v1.GetIamPolicyRequest other) { if (other == com.google.iam.v1.GetIamPolicyRequest.getDefaultInstance()) return this; if (!other.getResource().isEmpty()) { resource_ = other.resource_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasOptions()) { @@ -506,13 +515,13 @@ public Builder mergeFrom( case 10: { resource_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getOptionsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -532,6 +541,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object resource_ = ""; /** * @@ -602,8 +613,8 @@ public Builder setResource(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - resource_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -622,8 +633,8 @@ public Builder setResource(java.lang.String value) { * @return This builder for chaining. */ public Builder clearResource() { - resource_ = getDefaultInstance().getResource(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -647,8 +658,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - resource_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -672,7 +683,7 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) { * @return Whether the options field is set. */ public boolean hasOptions() { - return optionsBuilder_ != null || options_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -711,11 +722,11 @@ public Builder setOptions(com.google.iam.v1.GetPolicyOptions value) { throw new NullPointerException(); } options_ = value; - onChanged(); } else { optionsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -731,11 +742,11 @@ public Builder setOptions(com.google.iam.v1.GetPolicyOptions value) { public Builder setOptions(com.google.iam.v1.GetPolicyOptions.Builder builderForValue) { if (optionsBuilder_ == null) { options_ = builderForValue.build(); - onChanged(); } else { optionsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -750,19 +761,18 @@ public Builder setOptions(com.google.iam.v1.GetPolicyOptions.Builder builderForV */ public Builder mergeOptions(com.google.iam.v1.GetPolicyOptions value) { if (optionsBuilder_ == null) { - if (options_ != null) { - options_ = - com.google.iam.v1.GetPolicyOptions.newBuilder(options_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && options_ != null + && options_ != com.google.iam.v1.GetPolicyOptions.getDefaultInstance()) { + getOptionsBuilder().mergeFrom(value); } else { options_ = value; } - onChanged(); } else { optionsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -776,14 +786,13 @@ public Builder mergeOptions(com.google.iam.v1.GetPolicyOptions value) { * .google.iam.v1.GetPolicyOptions options = 2; */ public Builder clearOptions() { - if (optionsBuilder_ == null) { - options_ = null; - onChanged(); - } else { - options_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + options_ = null; + if (optionsBuilder_ != null) { + optionsBuilder_.dispose(); optionsBuilder_ = null; } - + onChanged(); return this; } /** @@ -797,7 +806,7 @@ public Builder clearOptions() { * .google.iam.v1.GetPolicyOptions options = 2; */ public com.google.iam.v1.GetPolicyOptions.Builder getOptionsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getOptionsFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java index 1c427ecb8d..9484d8801c 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java @@ -65,7 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int REQUESTED_POLICY_VERSION_FIELD_NUMBER = 1; - private int requestedPolicyVersion_; + private int requestedPolicyVersion_ = 0; /** * * @@ -290,8 +290,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; requestedPolicyVersion_ = 0; - return this; } @@ -318,11 +318,20 @@ public com.google.iam.v1.GetPolicyOptions build() { @java.lang.Override public com.google.iam.v1.GetPolicyOptions buildPartial() { com.google.iam.v1.GetPolicyOptions result = new com.google.iam.v1.GetPolicyOptions(this); - result.requestedPolicyVersion_ = requestedPolicyVersion_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v1.GetPolicyOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.requestedPolicyVersion_ = requestedPolicyVersion_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -400,7 +409,7 @@ public Builder mergeFrom( case 8: { requestedPolicyVersion_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -420,6 +429,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int requestedPolicyVersion_; /** * @@ -477,6 +488,7 @@ public int getRequestedPolicyVersion() { public Builder setRequestedPolicyVersion(int value) { requestedPolicyVersion_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -505,7 +517,7 @@ public Builder setRequestedPolicyVersion(int value) { * @return This builder for chaining. */ public Builder clearRequestedPolicyVersion() { - + bitField0_ = (bitField0_ & ~0x00000001); requestedPolicyVersion_ = 0; onChanged(); return this; diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java index b03aa80d06..791003d25e 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java @@ -125,7 +125,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int VERSION_FIELD_NUMBER = 1; - private int version_; + private int version_ = 0; /** * * @@ -160,6 +160,8 @@ public int getVersion() { } public static final int BINDINGS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List bindings_; /** * @@ -268,6 +270,8 @@ public com.google.iam.v1.BindingOrBuilder getBindingsOrBuilder(int index) { } public static final int AUDIT_CONFIGS_FIELD_NUMBER = 6; + + @SuppressWarnings("serial") private java.util.List auditConfigs_; /** * @@ -337,7 +341,7 @@ public com.google.iam.v1.AuditConfigOrBuilder getAuditConfigsOrBuilder(int index } public static final int ETAG_FIELD_NUMBER = 3; - private com.google.protobuf.ByteString etag_; + private com.google.protobuf.ByteString etag_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -645,24 +649,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; version_ = 0; - if (bindingsBuilder_ == null) { bindings_ = java.util.Collections.emptyList(); } else { bindings_ = null; bindingsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); if (auditConfigsBuilder_ == null) { auditConfigs_ = java.util.Collections.emptyList(); } else { auditConfigs_ = null; auditConfigsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); etag_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -688,29 +691,43 @@ public com.google.iam.v1.Policy build() { @java.lang.Override public com.google.iam.v1.Policy buildPartial() { com.google.iam.v1.Policy result = new com.google.iam.v1.Policy(this); - int from_bitField0_ = bitField0_; - result.version_ = version_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v1.Policy result) { if (bindingsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { bindings_ = java.util.Collections.unmodifiableList(bindings_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.bindings_ = bindings_; } else { result.bindings_ = bindingsBuilder_.build(); } if (auditConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000004) != 0)) { auditConfigs_ = java.util.Collections.unmodifiableList(auditConfigs_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); } result.auditConfigs_ = auditConfigs_; } else { result.auditConfigs_ = auditConfigsBuilder_.build(); } - result.etag_ = etag_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v1.Policy result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.version_ = version_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.etag_ = etag_; + } } @java.lang.Override @@ -765,7 +782,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) { if (!other.bindings_.isEmpty()) { if (bindings_.isEmpty()) { bindings_ = other.bindings_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureBindingsIsMutable(); bindings_.addAll(other.bindings_); @@ -778,7 +795,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) { bindingsBuilder_.dispose(); bindingsBuilder_ = null; bindings_ = other.bindings_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); bindingsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getBindingsFieldBuilder() @@ -792,7 +809,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) { if (!other.auditConfigs_.isEmpty()) { if (auditConfigs_.isEmpty()) { auditConfigs_ = other.auditConfigs_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureAuditConfigsIsMutable(); auditConfigs_.addAll(other.auditConfigs_); @@ -805,7 +822,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) { auditConfigsBuilder_.dispose(); auditConfigsBuilder_ = null; auditConfigs_ = other.auditConfigs_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); auditConfigsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getAuditConfigsFieldBuilder() @@ -847,13 +864,13 @@ public Builder mergeFrom( case 8: { version_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 case 26: { etag_ = input.readBytes(); - + bitField0_ |= 0x00000008; break; } // case 26 case 34: @@ -964,6 +981,7 @@ public int getVersion() { public Builder setVersion(int value) { version_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -996,7 +1014,7 @@ public Builder setVersion(int value) { * @return This builder for chaining. */ public Builder clearVersion() { - + bitField0_ = (bitField0_ & ~0x00000001); version_ = 0; onChanged(); return this; @@ -1005,9 +1023,9 @@ public Builder clearVersion() { private java.util.List bindings_ = java.util.Collections.emptyList(); private void ensureBindingsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { bindings_ = new java.util.ArrayList(bindings_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1307,7 +1325,7 @@ public Builder addAllBindings(java.lang.Iterable getBindingsBuilderList( com.google.iam.v1.Binding, com.google.iam.v1.Binding.Builder, com.google.iam.v1.BindingOrBuilder>( - bindings_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + bindings_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); bindings_ = null; } return bindingsBuilder_; @@ -1492,9 +1510,9 @@ public java.util.List getBindingsBuilderList( java.util.Collections.emptyList(); private void ensureAuditConfigsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000004) != 0)) { auditConfigs_ = new java.util.ArrayList(auditConfigs_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } @@ -1709,7 +1727,7 @@ public Builder addAllAuditConfigs( public Builder clearAuditConfigs() { if (auditConfigsBuilder_ == null) { auditConfigs_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); } else { auditConfigsBuilder_.clear(); @@ -1830,7 +1848,7 @@ public java.util.List getAuditConfigsBuil com.google.iam.v1.AuditConfig, com.google.iam.v1.AuditConfig.Builder, com.google.iam.v1.AuditConfigOrBuilder>( - auditConfigs_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + auditConfigs_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); auditConfigs_ = null; } return auditConfigsBuilder_; @@ -1888,8 +1906,8 @@ public Builder setEtag(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - etag_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1915,7 +1933,7 @@ public Builder setEtag(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearEtag() { - + bitField0_ = (bitField0_ & ~0x00000008); etag_ = getDefaultInstance().getEtag(); onChanged(); return this; diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java index 536ede1a7c..9ee92e988c 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java @@ -67,6 +67,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int BINDING_DELTAS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List bindingDeltas_; /** * @@ -136,6 +138,8 @@ public com.google.iam.v1.BindingDeltaOrBuilder getBindingDeltasOrBuilder(int ind } public static final int AUDIT_CONFIG_DELTAS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List auditConfigDeltas_; /** * @@ -411,6 +415,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (bindingDeltasBuilder_ == null) { bindingDeltas_ = java.util.Collections.emptyList(); } else { @@ -450,7 +455,15 @@ public com.google.iam.v1.PolicyDelta build() { @java.lang.Override public com.google.iam.v1.PolicyDelta buildPartial() { com.google.iam.v1.PolicyDelta result = new com.google.iam.v1.PolicyDelta(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v1.PolicyDelta result) { if (bindingDeltasBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { bindingDeltas_ = java.util.Collections.unmodifiableList(bindingDeltas_); @@ -469,8 +482,10 @@ public com.google.iam.v1.PolicyDelta buildPartial() { } else { result.auditConfigDeltas_ = auditConfigDeltasBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v1.PolicyDelta result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java index 78d0c7aa01..15561955bd 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RESOURCE_FIELD_NUMBER = 1; - private volatile java.lang.Object resource_; + + @SuppressWarnings("serial") + private volatile java.lang.Object resource_ = ""; /** * * @@ -174,7 +176,7 @@ public com.google.iam.v1.Policy getPolicy() { */ @java.lang.Override public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() { - return getPolicy(); + return policy_ == null ? com.google.iam.v1.Policy.getDefaultInstance() : policy_; } public static final int UPDATE_MASK_FIELD_NUMBER = 3; @@ -229,7 +231,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -455,18 +457,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; resource_ = ""; - - if (policyBuilder_ == null) { - policy_ = null; - } else { - policy_ = null; + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -496,21 +496,26 @@ public com.google.iam.v1.SetIamPolicyRequest build() { public com.google.iam.v1.SetIamPolicyRequest buildPartial() { com.google.iam.v1.SetIamPolicyRequest result = new com.google.iam.v1.SetIamPolicyRequest(this); - result.resource_ = resource_; - if (policyBuilder_ == null) { - result.policy_ = policy_; - } else { - result.policy_ = policyBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v1.SetIamPolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.resource_ = resource_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -558,6 +563,7 @@ public Builder mergeFrom(com.google.iam.v1.SetIamPolicyRequest other) { if (other == com.google.iam.v1.SetIamPolicyRequest.getDefaultInstance()) return this; if (!other.getResource().isEmpty()) { resource_ = other.resource_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasPolicy()) { @@ -595,19 +601,19 @@ public Builder mergeFrom( case 10: { resource_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -627,6 +633,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object resource_ = ""; /** * @@ -697,8 +705,8 @@ public Builder setResource(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - resource_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -717,8 +725,8 @@ public Builder setResource(java.lang.String value) { * @return This builder for chaining. */ public Builder clearResource() { - resource_ = getDefaultInstance().getResource(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -742,8 +750,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - resource_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -769,7 +777,7 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) { * @return Whether the policy field is set. */ public boolean hasPolicy() { - return policyBuilder_ != null || policy_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -810,11 +818,11 @@ public Builder setPolicy(com.google.iam.v1.Policy value) { throw new NullPointerException(); } policy_ = value; - onChanged(); } else { policyBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -832,11 +840,11 @@ public Builder setPolicy(com.google.iam.v1.Policy value) { public Builder setPolicy(com.google.iam.v1.Policy.Builder builderForValue) { if (policyBuilder_ == null) { policy_ = builderForValue.build(); - onChanged(); } else { policyBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -853,16 +861,18 @@ public Builder setPolicy(com.google.iam.v1.Policy.Builder builderForValue) { */ public Builder mergePolicy(com.google.iam.v1.Policy value) { if (policyBuilder_ == null) { - if (policy_ != null) { - policy_ = com.google.iam.v1.Policy.newBuilder(policy_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && policy_ != null + && policy_ != com.google.iam.v1.Policy.getDefaultInstance()) { + getPolicyBuilder().mergeFrom(value); } else { policy_ = value; } - onChanged(); } else { policyBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -878,14 +888,13 @@ public Builder mergePolicy(com.google.iam.v1.Policy value) { * .google.iam.v1.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearPolicy() { - if (policyBuilder_ == null) { - policy_ = null; - onChanged(); - } else { - policy_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } - + onChanged(); return this; } /** @@ -901,7 +910,7 @@ public Builder clearPolicy() { * .google.iam.v1.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.iam.v1.Policy.Builder getPolicyBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getPolicyFieldBuilder().getBuilder(); } @@ -973,7 +982,7 @@ public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1016,11 +1025,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1038,11 +1047,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1059,17 +1068,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1085,14 +1095,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * .google.protobuf.FieldMask update_mask = 3; */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1108,7 +1117,7 @@ public Builder clearUpdateMask() { * .google.protobuf.FieldMask update_mask = 3; */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java index cb5dab7d8f..ee3530d94e 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RESOURCE_FIELD_NUMBER = 1; - private volatile java.lang.Object resource_; + + @SuppressWarnings("serial") + private volatile java.lang.Object resource_ = ""; /** * * @@ -124,6 +126,8 @@ public com.google.protobuf.ByteString getResourceBytes() { } public static final int PERMISSIONS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList permissions_; /** * @@ -409,10 +413,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; resource_ = ""; - permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -440,17 +444,29 @@ public com.google.iam.v1.TestIamPermissionsRequest build() { public com.google.iam.v1.TestIamPermissionsRequest buildPartial() { com.google.iam.v1.TestIamPermissionsRequest result = new com.google.iam.v1.TestIamPermissionsRequest(this); - int from_bitField0_ = bitField0_; - result.resource_ = resource_; - if (((bitField0_ & 0x00000001) != 0)) { - permissions_ = permissions_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.permissions_ = permissions_; onBuilt(); return result; } + private void buildPartialRepeatedFields(com.google.iam.v1.TestIamPermissionsRequest result) { + if (((bitField0_ & 0x00000002) != 0)) { + permissions_ = permissions_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.permissions_ = permissions_; + } + + private void buildPartial0(com.google.iam.v1.TestIamPermissionsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.resource_ = resource_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -498,12 +514,13 @@ public Builder mergeFrom(com.google.iam.v1.TestIamPermissionsRequest other) { if (other == com.google.iam.v1.TestIamPermissionsRequest.getDefaultInstance()) return this; if (!other.getResource().isEmpty()) { resource_ = other.resource_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.permissions_.isEmpty()) { if (permissions_.isEmpty()) { permissions_ = other.permissions_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensurePermissionsIsMutable(); permissions_.addAll(other.permissions_); @@ -539,7 +556,7 @@ public Builder mergeFrom( case 10: { resource_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -638,8 +655,8 @@ public Builder setResource(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - resource_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -658,8 +675,8 @@ public Builder setResource(java.lang.String value) { * @return This builder for chaining. */ public Builder clearResource() { - resource_ = getDefaultInstance().getResource(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -683,8 +700,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - resource_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -693,9 +710,9 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePermissionsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { permissions_ = new com.google.protobuf.LazyStringArrayList(permissions_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } /** @@ -854,7 +871,7 @@ public Builder addAllPermissions(java.lang.Iterable values) { */ public Builder clearPermissions() { permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java index fbe4f1a3e7..25fb71590e 100644 --- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java +++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java @@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PERMISSIONS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList permissions_; /** * @@ -336,6 +338,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -365,14 +368,24 @@ public com.google.iam.v1.TestIamPermissionsResponse build() { public com.google.iam.v1.TestIamPermissionsResponse buildPartial() { com.google.iam.v1.TestIamPermissionsResponse result = new com.google.iam.v1.TestIamPermissionsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v1.TestIamPermissionsResponse result) { if (((bitField0_ & 0x00000001) != 0)) { permissions_ = permissions_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.permissions_ = permissions_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v1.TestIamPermissionsResponse result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java index 3566ce1abd..6d67c52f34 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -174,11 +176,13 @@ public com.google.iam.v2.Policy getPolicy() { */ @java.lang.Override public com.google.iam.v2.PolicyOrBuilder getPolicyOrBuilder() { - return getPolicy(); + return policy_ == null ? com.google.iam.v2.Policy.getDefaultInstance() : policy_; } public static final int POLICY_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object policyId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object policyId_ = ""; /** * * @@ -450,16 +454,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (policyBuilder_ == null) { - policy_ = null; - } else { - policy_ = null; + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } policyId_ = ""; - return this; } @@ -487,17 +489,26 @@ public com.google.iam.v2.CreatePolicyRequest build() { public com.google.iam.v2.CreatePolicyRequest buildPartial() { com.google.iam.v2.CreatePolicyRequest result = new com.google.iam.v2.CreatePolicyRequest(this); - result.parent_ = parent_; - if (policyBuilder_ == null) { - result.policy_ = policy_; - } else { - result.policy_ = policyBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.policyId_ = policyId_; onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.CreatePolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.policyId_ = policyId_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -545,6 +556,7 @@ public Builder mergeFrom(com.google.iam.v2.CreatePolicyRequest other) { if (other == com.google.iam.v2.CreatePolicyRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasPolicy()) { @@ -552,6 +564,7 @@ public Builder mergeFrom(com.google.iam.v2.CreatePolicyRequest other) { } if (!other.getPolicyId().isEmpty()) { policyId_ = other.policyId_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -583,19 +596,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { policyId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -615,6 +628,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -697,8 +712,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -721,8 +736,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -750,8 +765,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -774,7 +789,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the policy field is set. */ public boolean hasPolicy() { - return policyBuilder_ != null || policy_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -809,11 +824,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) { throw new NullPointerException(); } policy_ = value; - onChanged(); } else { policyBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -828,11 +843,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) { public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) { if (policyBuilder_ == null) { policy_ = builderForValue.build(); - onChanged(); } else { policyBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -846,16 +861,18 @@ public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) { */ public Builder mergePolicy(com.google.iam.v2.Policy value) { if (policyBuilder_ == null) { - if (policy_ != null) { - policy_ = com.google.iam.v2.Policy.newBuilder(policy_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && policy_ != null + && policy_ != com.google.iam.v2.Policy.getDefaultInstance()) { + getPolicyBuilder().mergeFrom(value); } else { policy_ = value; } - onChanged(); } else { policyBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -868,14 +885,13 @@ public Builder mergePolicy(com.google.iam.v2.Policy value) { * .google.iam.v2.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearPolicy() { - if (policyBuilder_ == null) { - policy_ = null; - onChanged(); - } else { - policy_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } - + onChanged(); return this; } /** @@ -888,7 +904,7 @@ public Builder clearPolicy() { * .google.iam.v2.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.iam.v2.Policy.Builder getPolicyBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getPolicyFieldBuilder().getBuilder(); } @@ -1003,8 +1019,8 @@ public Builder setPolicyId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - policyId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1023,8 +1039,8 @@ public Builder setPolicyId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPolicyId() { - policyId_ = getDefaultInstance().getPolicyId(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1048,8 +1064,8 @@ public Builder setPolicyIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - policyId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java index 3900d3dc95..a1fc39876b 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int ETAG_FIELD_NUMBER = 2; - private volatile java.lang.Object etag_; + + @SuppressWarnings("serial") + private volatile java.lang.Object etag_ = ""; /** * * @@ -390,10 +394,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - etag_ = ""; - return this; } @@ -421,12 +424,23 @@ public com.google.iam.v2.DeletePolicyRequest build() { public com.google.iam.v2.DeletePolicyRequest buildPartial() { com.google.iam.v2.DeletePolicyRequest result = new com.google.iam.v2.DeletePolicyRequest(this); - result.name_ = name_; - result.etag_ = etag_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.DeletePolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.etag_ = etag_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -474,10 +488,12 @@ public Builder mergeFrom(com.google.iam.v2.DeletePolicyRequest other) { if (other == com.google.iam.v2.DeletePolicyRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getEtag().isEmpty()) { etag_ = other.etag_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -509,13 +525,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { etag_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -535,6 +551,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -614,8 +632,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -637,8 +655,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -665,8 +683,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -744,8 +762,8 @@ public Builder setEtag(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - etag_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -765,8 +783,8 @@ public Builder setEtag(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEtag() { - etag_ = getDefaultInstance().getEtag(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -791,8 +809,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - etag_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java index f3bc03f599..8fcf2a56fe 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java @@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int DENIED_PRINCIPALS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList deniedPrincipals_; /** * @@ -253,6 +255,8 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) { } public static final int EXCEPTION_PRINCIPALS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList exceptionPrincipals_; /** * @@ -338,6 +342,8 @@ public com.google.protobuf.ByteString getExceptionPrincipalsBytes(int index) { } public static final int DENIED_PERMISSIONS_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList deniedPermissions_; /** * @@ -411,6 +417,8 @@ public com.google.protobuf.ByteString getDeniedPermissionsBytes(int index) { } public static final int EXCEPTION_PERMISSIONS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList exceptionPermissions_; /** * @@ -558,7 +566,7 @@ public com.google.type.Expr getDenialCondition() { */ @java.lang.Override public com.google.type.ExprOrBuilder getDenialConditionOrBuilder() { - return getDenialCondition(); + return denialCondition_ == null ? com.google.type.Expr.getDefaultInstance() : denialCondition_; } private byte memoizedIsInitialized = -1; @@ -824,6 +832,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY; @@ -832,10 +841,9 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000004); exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000008); - if (denialConditionBuilder_ == null) { - denialCondition_ = null; - } else { - denialCondition_ = null; + denialCondition_ = null; + if (denialConditionBuilder_ != null) { + denialConditionBuilder_.dispose(); denialConditionBuilder_ = null; } return this; @@ -863,7 +871,15 @@ public com.google.iam.v2.DenyRule build() { @java.lang.Override public com.google.iam.v2.DenyRule buildPartial() { com.google.iam.v2.DenyRule result = new com.google.iam.v2.DenyRule(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v2.DenyRule result) { if (((bitField0_ & 0x00000001) != 0)) { deniedPrincipals_ = deniedPrincipals_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); @@ -884,13 +900,14 @@ public com.google.iam.v2.DenyRule buildPartial() { bitField0_ = (bitField0_ & ~0x00000008); } result.exceptionPermissions_ = exceptionPermissions_; - if (denialConditionBuilder_ == null) { - result.denialCondition_ = denialCondition_; - } else { - result.denialCondition_ = denialConditionBuilder_.build(); + } + + private void buildPartial0(com.google.iam.v2.DenyRule result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000010) != 0)) { + result.denialCondition_ = + denialConditionBuilder_ == null ? denialCondition_ : denialConditionBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -1038,7 +1055,7 @@ public Builder mergeFrom( case 42: { input.readMessage(getDenialConditionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -2161,7 +2178,7 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value * @return Whether the denialCondition field is set. */ public boolean hasDenialCondition() { - return denialConditionBuilder_ != null || denialCondition_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -2214,11 +2231,11 @@ public Builder setDenialCondition(com.google.type.Expr value) { throw new NullPointerException(); } denialCondition_ = value; - onChanged(); } else { denialConditionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2241,11 +2258,11 @@ public Builder setDenialCondition(com.google.type.Expr value) { public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue) { if (denialConditionBuilder_ == null) { denialCondition_ = builderForValue.build(); - onChanged(); } else { denialConditionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2267,17 +2284,18 @@ public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue) */ public Builder mergeDenialCondition(com.google.type.Expr value) { if (denialConditionBuilder_ == null) { - if (denialCondition_ != null) { - denialCondition_ = - com.google.type.Expr.newBuilder(denialCondition_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && denialCondition_ != null + && denialCondition_ != com.google.type.Expr.getDefaultInstance()) { + getDenialConditionBuilder().mergeFrom(value); } else { denialCondition_ = value; } - onChanged(); } else { denialConditionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2298,14 +2316,13 @@ public Builder mergeDenialCondition(com.google.type.Expr value) { * .google.type.Expr denial_condition = 5; */ public Builder clearDenialCondition() { - if (denialConditionBuilder_ == null) { - denialCondition_ = null; - onChanged(); - } else { - denialCondition_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + denialCondition_ = null; + if (denialConditionBuilder_ != null) { + denialConditionBuilder_.dispose(); denialConditionBuilder_ = null; } - + onChanged(); return this; } /** @@ -2326,7 +2343,7 @@ public Builder clearDenialCondition() { * .google.type.Expr denial_condition = 5; */ public com.google.type.Expr.Builder getDenialConditionBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getDenialConditionFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java index e3888a12fd..31ae9840b5 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java @@ -67,7 +67,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -350,11 +352,20 @@ public com.google.iam.v2.GetPolicyRequest build() { @java.lang.Override public com.google.iam.v2.GetPolicyRequest buildPartial() { com.google.iam.v2.GetPolicyRequest result = new com.google.iam.v2.GetPolicyRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.GetPolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -402,6 +413,7 @@ public Builder mergeFrom(com.google.iam.v2.GetPolicyRequest other) { if (other == com.google.iam.v2.GetPolicyRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -433,7 +445,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -453,6 +465,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -532,8 +546,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -555,8 +569,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -583,8 +597,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java index 124798c38a..42f23221d0 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -134,7 +136,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 2; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -153,7 +155,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -416,12 +420,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -449,13 +451,26 @@ public com.google.iam.v2.ListPoliciesRequest build() { public com.google.iam.v2.ListPoliciesRequest buildPartial() { com.google.iam.v2.ListPoliciesRequest result = new com.google.iam.v2.ListPoliciesRequest(this); - result.parent_ = parent_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.ListPoliciesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -503,6 +518,7 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesRequest other) { if (other == com.google.iam.v2.ListPoliciesRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getPageSize() != 0) { @@ -510,6 +526,7 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesRequest other) { } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -541,19 +558,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -573,6 +590,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -658,8 +677,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -683,8 +702,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -713,8 +732,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -752,6 +771,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -768,7 +788,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000002); pageSize_ = 0; onChanged(); return this; @@ -838,8 +858,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -856,8 +876,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -879,8 +899,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java index 62cdb5ecac..85d5cf7b5d 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int POLICIES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List policies_; /** * @@ -137,7 +139,9 @@ public com.google.iam.v2.PolicyOrBuilder getPoliciesOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -394,6 +398,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (policiesBuilder_ == null) { policies_ = java.util.Collections.emptyList(); } else { @@ -402,7 +407,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -430,7 +434,15 @@ public com.google.iam.v2.ListPoliciesResponse build() { public com.google.iam.v2.ListPoliciesResponse buildPartial() { com.google.iam.v2.ListPoliciesResponse result = new com.google.iam.v2.ListPoliciesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v2.ListPoliciesResponse result) { if (policiesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { policies_ = java.util.Collections.unmodifiableList(policies_); @@ -440,9 +452,13 @@ public com.google.iam.v2.ListPoliciesResponse buildPartial() { } else { result.policies_ = policiesBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v2.ListPoliciesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -519,6 +535,7 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -562,7 +579,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -990,8 +1007,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1008,8 +1025,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1031,8 +1048,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java index 82a241e71d..2c6ad8972b 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java @@ -82,7 +82,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -147,7 +149,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int UID_FIELD_NUMBER = 2; - private volatile java.lang.Object uid_; + + @SuppressWarnings("serial") + private volatile java.lang.Object uid_ = ""; /** * * @@ -198,7 +202,9 @@ public com.google.protobuf.ByteString getUidBytes() { } public static final int KIND_FIELD_NUMBER = 3; - private volatile java.lang.Object kind_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kind_ = ""; /** * * @@ -247,7 +253,9 @@ public com.google.protobuf.ByteString getKindBytes() { } public static final int DISPLAY_NAME_FIELD_NUMBER = 4; - private volatile java.lang.Object displayName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object displayName_ = ""; /** * * @@ -310,6 +318,7 @@ private static final class AnnotationsDefaultEntryHolder { ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField annotations_; private com.google.protobuf.MapField @@ -371,8 +380,10 @@ public java.util.Map getAnnotationsMap() { * map<string, string> annotations = 5; */ @java.lang.Override - public java.lang.String getAnnotationsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getAnnotationsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -402,7 +413,9 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) { } public static final int ETAG_FIELD_NUMBER = 6; - private volatile java.lang.Object etag_; + + @SuppressWarnings("serial") + private volatile java.lang.Object etag_ = ""; /** * * @@ -504,7 +517,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 8; @@ -553,7 +566,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } public static final int DELETE_TIME_FIELD_NUMBER = 9; @@ -602,10 +615,12 @@ public com.google.protobuf.Timestamp getDeleteTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() { - return getDeleteTime(); + return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_; } public static final int RULES_FIELD_NUMBER = 10; + + @SuppressWarnings("serial") private java.util.List rules_; /** * @@ -679,7 +694,9 @@ public com.google.iam.v2.PolicyRuleOrBuilder getRulesOrBuilder(int index) { } public static final int MANAGING_AUTHORITY_FIELD_NUMBER = 11; - private volatile java.lang.Object managingAuthority_; + + @SuppressWarnings("serial") + private volatile java.lang.Object managingAuthority_ = ""; /** * * @@ -1056,33 +1073,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - uid_ = ""; - kind_ = ""; - displayName_ = ""; - internalGetMutableAnnotations().clear(); etag_ = ""; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - if (deleteTimeBuilder_ == null) { - deleteTime_ = null; - } else { - deleteTime_ = null; + deleteTime_ = null; + if (deleteTimeBuilder_ != null) { + deleteTimeBuilder_.dispose(); deleteTimeBuilder_ = null; } if (rulesBuilder_ == null) { @@ -1091,9 +1101,8 @@ public Builder clear() { rules_ = null; rulesBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); managingAuthority_ = ""; - return this; } @@ -1119,41 +1128,59 @@ public com.google.iam.v2.Policy build() { @java.lang.Override public com.google.iam.v2.Policy buildPartial() { com.google.iam.v2.Policy result = new com.google.iam.v2.Policy(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.uid_ = uid_; - result.kind_ = kind_; - result.displayName_ = displayName_; - result.annotations_ = internalGetAnnotations(); - result.annotations_.makeImmutable(); - result.etag_ = etag_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); - } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); - } - if (deleteTimeBuilder_ == null) { - result.deleteTime_ = deleteTime_; - } else { - result.deleteTime_ = deleteTimeBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v2.Policy result) { if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000200) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); } result.rules_ = rules_; } else { result.rules_ = rulesBuilder_.build(); } - result.managingAuthority_ = managingAuthority_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v2.Policy result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.uid_ = uid_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.kind_ = kind_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.displayName_ = displayName_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.annotations_ = internalGetAnnotations(); + result.annotations_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.etag_ = etag_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.deleteTime_ = deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000400) != 0)) { + result.managingAuthority_ = managingAuthority_; + } } @java.lang.Override @@ -1203,23 +1230,29 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) { if (other == com.google.iam.v2.Policy.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getUid().isEmpty()) { uid_ = other.uid_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getKind().isEmpty()) { kind_ = other.kind_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getDisplayName().isEmpty()) { displayName_ = other.displayName_; + bitField0_ |= 0x00000008; onChanged(); } internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations()); + bitField0_ |= 0x00000010; if (!other.getEtag().isEmpty()) { etag_ = other.etag_; + bitField0_ |= 0x00000020; onChanged(); } if (other.hasCreateTime()) { @@ -1235,7 +1268,7 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) { if (!other.rules_.isEmpty()) { if (rules_.isEmpty()) { rules_ = other.rules_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); } else { ensureRulesIsMutable(); rules_.addAll(other.rules_); @@ -1248,7 +1281,7 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) { rulesBuilder_.dispose(); rulesBuilder_ = null; rules_ = other.rules_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); rulesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getRulesFieldBuilder() @@ -1260,6 +1293,7 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) { } if (!other.getManagingAuthority().isEmpty()) { managingAuthority_ = other.managingAuthority_; + bitField0_ |= 0x00000400; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -1291,25 +1325,25 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { uid_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { kind_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { displayName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: @@ -1321,30 +1355,31 @@ public Builder mergeFrom( internalGetMutableAnnotations() .getMutableMap() .put(annotations__.getKey(), annotations__.getValue()); + bitField0_ |= 0x00000010; break; } // case 42 case 50: { etag_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000020; break; } // case 50 case 58: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 58 case 66: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000080; break; } // case 66 case 74: { input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000100; break; } // case 74 case 82: @@ -1362,7 +1397,7 @@ public Builder mergeFrom( case 90: { managingAuthority_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000400; break; } // case 90 default: @@ -1469,8 +1504,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1494,8 +1529,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1524,8 +1559,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1594,8 +1629,8 @@ public Builder setUid(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - uid_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1612,8 +1647,8 @@ public Builder setUid(java.lang.String value) { * @return This builder for chaining. */ public Builder clearUid() { - uid_ = getDefaultInstance().getUid(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1635,8 +1670,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - uid_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1702,8 +1737,8 @@ public Builder setKind(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kind_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1719,8 +1754,8 @@ public Builder setKind(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKind() { - kind_ = getDefaultInstance().getKind(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1741,8 +1776,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - kind_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1811,8 +1846,8 @@ public Builder setDisplayName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - displayName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1829,8 +1864,8 @@ public Builder setDisplayName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDisplayName() { - displayName_ = getDefaultInstance().getDisplayName(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1852,8 +1887,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - displayName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1871,8 +1906,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { private com.google.protobuf.MapField internalGetMutableAnnotations() { - onChanged(); - ; if (annotations_ == null) { annotations_ = com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry); @@ -1880,6 +1913,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { if (!annotations_.isMutable()) { annotations_ = annotations_.copy(); } + bitField0_ |= 0x00000010; + onChanged(); return annotations_; } @@ -1934,8 +1969,10 @@ public java.util.Map getAnnotationsMap() { * map<string, string> annotations = 5; */ @java.lang.Override - public java.lang.String getAnnotationsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getAnnotationsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -1965,6 +2002,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) { } public Builder clearAnnotations() { + bitField0_ = (bitField0_ & ~0x00000010); internalGetMutableAnnotations().getMutableMap().clear(); return this; } @@ -1988,6 +2026,7 @@ public Builder removeAnnotations(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableAnnotations() { + bitField0_ |= 0x00000010; return internalGetMutableAnnotations().getMutableMap(); } /** @@ -2007,8 +2046,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) { if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableAnnotations().getMutableMap().put(key, value); + bitField0_ |= 0x00000010; return this; } /** @@ -2023,6 +2062,7 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) { */ public Builder putAllAnnotations(java.util.Map values) { internalGetMutableAnnotations().getMutableMap().putAll(values); + bitField0_ |= 0x00000010; return this; } @@ -2099,8 +2139,8 @@ public Builder setEtag(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - etag_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2120,8 +2160,8 @@ public Builder setEtag(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEtag() { - etag_ = getDefaultInstance().getEtag(); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } @@ -2146,8 +2186,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - etag_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2172,7 +2212,7 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -2213,11 +2253,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2234,11 +2274,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2254,17 +2294,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2279,14 +2320,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2301,7 +2341,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -2373,7 +2413,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -2414,11 +2454,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2435,11 +2475,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2455,17 +2495,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000080) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2480,14 +2521,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2502,7 +2542,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000080; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } @@ -2574,7 +2614,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { * @return Whether the deleteTime field is set. */ public boolean hasDeleteTime() { - return deleteTimeBuilder_ != null || deleteTime_ != null; + return ((bitField0_ & 0x00000100) != 0); } /** * @@ -2615,11 +2655,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } deleteTime_ = value; - onChanged(); } else { deleteTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2636,11 +2676,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) { public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (deleteTimeBuilder_ == null) { deleteTime_ = builderForValue.build(); - onChanged(); } else { deleteTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2656,17 +2696,18 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) { if (deleteTimeBuilder_ == null) { - if (deleteTime_ != null) { - deleteTime_ = - com.google.protobuf.Timestamp.newBuilder(deleteTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000100) != 0) + && deleteTime_ != null + && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getDeleteTimeBuilder().mergeFrom(value); } else { deleteTime_ = value; } - onChanged(); } else { deleteTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2681,14 +2722,13 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) { * */ public Builder clearDeleteTime() { - if (deleteTimeBuilder_ == null) { - deleteTime_ = null; - onChanged(); - } else { - deleteTime_ = null; + bitField0_ = (bitField0_ & ~0x00000100); + deleteTime_ = null; + if (deleteTimeBuilder_ != null) { + deleteTimeBuilder_.dispose(); deleteTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2703,7 +2743,7 @@ public Builder clearDeleteTime() { * */ public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() { - + bitField0_ |= 0x00000100; onChanged(); return getDeleteTimeFieldBuilder().getBuilder(); } @@ -2758,9 +2798,9 @@ public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() { private java.util.List rules_ = java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000200) != 0)) { rules_ = new java.util.ArrayList(rules_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000200; } } @@ -2983,7 +3023,7 @@ public Builder addAllRules(java.lang.Iterable getRulesBuilderList( com.google.iam.v2.PolicyRule, com.google.iam.v2.PolicyRule.Builder, com.google.iam.v2.PolicyRuleOrBuilder>( - rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + rules_, ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; @@ -3179,8 +3219,8 @@ public Builder setManagingAuthority(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - managingAuthority_ = value; + bitField0_ |= 0x00000400; onChanged(); return this; } @@ -3197,8 +3237,8 @@ public Builder setManagingAuthority(java.lang.String value) { * @return This builder for chaining. */ public Builder clearManagingAuthority() { - managingAuthority_ = getDefaultInstance().getManagingAuthority(); + bitField0_ = (bitField0_ & ~0x00000400); onChanged(); return this; } @@ -3220,8 +3260,8 @@ public Builder setManagingAuthorityBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - managingAuthority_ = value; + bitField0_ |= 0x00000400; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java index b8aae54471..15a04e7840 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java @@ -108,7 +108,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } private byte memoizedIsInitialized = -1; @@ -313,10 +313,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + bitField0_ = 0; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } return this; @@ -346,15 +346,20 @@ public com.google.iam.v2.PolicyOperationMetadata build() { public com.google.iam.v2.PolicyOperationMetadata buildPartial() { com.google.iam.v2.PolicyOperationMetadata result = new com.google.iam.v2.PolicyOperationMetadata(this); - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.PolicyOperationMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -432,7 +437,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +457,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -470,7 +477,7 @@ public Builder mergeFrom( * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -507,11 +514,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -526,11 +533,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -544,17 +551,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -567,14 +575,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp create_time = 1; */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -587,7 +594,7 @@ public Builder clearCreateTime() { * .google.protobuf.Timestamp create_time = 1; */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java index 84433497c5..44e15c3d3b 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java @@ -189,7 +189,6 @@ public interface PolicyOrBuilder * * map<string, string> annotations = 5; */ - /* nullable */ java.lang.String getAnnotationsOrDefault( java.lang.String key, diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java index 032fa2bba2..9e842ab3f1 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java @@ -160,7 +160,9 @@ public com.google.iam.v2.DenyRuleOrBuilder getDenyRuleOrBuilder() { } public static final int DESCRIPTION_FIELD_NUMBER = 1; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -427,11 +429,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (denyRuleBuilder_ != null) { denyRuleBuilder_.clear(); } description_ = ""; - kindCase_ = 0; kind_ = null; return this; @@ -459,19 +461,29 @@ public com.google.iam.v2.PolicyRule build() { @java.lang.Override public com.google.iam.v2.PolicyRule buildPartial() { com.google.iam.v2.PolicyRule result = new com.google.iam.v2.PolicyRule(this); - if (kindCase_ == 2) { - if (denyRuleBuilder_ == null) { - result.kind_ = kind_; - } else { - result.kind_ = denyRuleBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.description_ = description_; - result.kindCase_ = kindCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.PolicyRule result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.description_ = description_; + } + } + + private void buildPartialOneofs(com.google.iam.v2.PolicyRule result) { + result.kindCase_ = kindCase_; + result.kind_ = this.kind_; + if (kindCase_ == 2 && denyRuleBuilder_ != null) { + result.kind_ = denyRuleBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -519,6 +531,7 @@ public Builder mergeFrom(com.google.iam.v2.PolicyRule other) { if (other == com.google.iam.v2.PolicyRule.getDefaultInstance()) return this; if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000002; onChanged(); } switch (other.getKindCase()) { @@ -561,7 +574,7 @@ public Builder mergeFrom( case 10: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 10 case 18: @@ -601,6 +614,8 @@ public Builder clearKind() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.iam.v2.DenyRule, com.google.iam.v2.DenyRule.Builder, @@ -802,7 +817,6 @@ public com.google.iam.v2.DenyRuleOrBuilder getDenyRuleOrBuilder() { } kindCase_ = 2; onChanged(); - ; return denyRuleBuilder_; } @@ -870,8 +884,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -888,8 +902,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -911,8 +925,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java index d7810fed39..bc506e2671 100644 --- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java +++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java @@ -117,7 +117,7 @@ public com.google.iam.v2.Policy getPolicy() { */ @java.lang.Override public com.google.iam.v2.PolicyOrBuilder getPolicyOrBuilder() { - return getPolicy(); + return policy_ == null ? com.google.iam.v2.Policy.getDefaultInstance() : policy_; } private byte memoizedIsInitialized = -1; @@ -320,10 +320,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (policyBuilder_ == null) { - policy_ = null; - } else { - policy_ = null; + bitField0_ = 0; + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } return this; @@ -353,15 +353,20 @@ public com.google.iam.v2.UpdatePolicyRequest build() { public com.google.iam.v2.UpdatePolicyRequest buildPartial() { com.google.iam.v2.UpdatePolicyRequest result = new com.google.iam.v2.UpdatePolicyRequest(this); - if (policyBuilder_ == null) { - result.policy_ = policy_; - } else { - result.policy_ = policyBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2.UpdatePolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -439,7 +444,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -459,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.iam.v2.Policy policy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.iam.v2.Policy, @@ -480,7 +487,7 @@ public Builder mergeFrom( * @return Whether the policy field is set. */ public boolean hasPolicy() { - return policyBuilder_ != null || policy_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -521,11 +528,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) { throw new NullPointerException(); } policy_ = value; - onChanged(); } else { policyBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -543,11 +550,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) { public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) { if (policyBuilder_ == null) { policy_ = builderForValue.build(); - onChanged(); } else { policyBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -564,16 +571,18 @@ public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) { */ public Builder mergePolicy(com.google.iam.v2.Policy value) { if (policyBuilder_ == null) { - if (policy_ != null) { - policy_ = com.google.iam.v2.Policy.newBuilder(policy_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && policy_ != null + && policy_ != com.google.iam.v2.Policy.getDefaultInstance()) { + getPolicyBuilder().mergeFrom(value); } else { policy_ = value; } - onChanged(); } else { policyBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -589,14 +598,13 @@ public Builder mergePolicy(com.google.iam.v2.Policy value) { * .google.iam.v2.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearPolicy() { - if (policyBuilder_ == null) { - policy_ = null; - onChanged(); - } else { - policy_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } - + onChanged(); return this; } /** @@ -612,7 +620,7 @@ public Builder clearPolicy() { * .google.iam.v2.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.iam.v2.Policy.Builder getPolicyBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPolicyFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java index 4c91193e2d..370189917a 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -174,11 +176,13 @@ public com.google.iam.v2beta.Policy getPolicy() { */ @java.lang.Override public com.google.iam.v2beta.PolicyOrBuilder getPolicyOrBuilder() { - return getPolicy(); + return policy_ == null ? com.google.iam.v2beta.Policy.getDefaultInstance() : policy_; } public static final int POLICY_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object policyId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object policyId_ = ""; /** * * @@ -452,16 +456,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (policyBuilder_ == null) { - policy_ = null; - } else { - policy_ = null; + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } policyId_ = ""; - return this; } @@ -489,17 +491,26 @@ public com.google.iam.v2beta.CreatePolicyRequest build() { public com.google.iam.v2beta.CreatePolicyRequest buildPartial() { com.google.iam.v2beta.CreatePolicyRequest result = new com.google.iam.v2beta.CreatePolicyRequest(this); - result.parent_ = parent_; - if (policyBuilder_ == null) { - result.policy_ = policy_; - } else { - result.policy_ = policyBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.policyId_ = policyId_; onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.CreatePolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.policyId_ = policyId_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -547,6 +558,7 @@ public Builder mergeFrom(com.google.iam.v2beta.CreatePolicyRequest other) { if (other == com.google.iam.v2beta.CreatePolicyRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasPolicy()) { @@ -554,6 +566,7 @@ public Builder mergeFrom(com.google.iam.v2beta.CreatePolicyRequest other) { } if (!other.getPolicyId().isEmpty()) { policyId_ = other.policyId_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -585,19 +598,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { policyId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -617,6 +630,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -699,8 +714,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -723,8 +738,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -752,8 +767,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -776,7 +791,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the policy field is set. */ public boolean hasPolicy() { - return policyBuilder_ != null || policy_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -811,11 +826,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) { throw new NullPointerException(); } policy_ = value; - onChanged(); } else { policyBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -830,11 +845,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) { public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) { if (policyBuilder_ == null) { policy_ = builderForValue.build(); - onChanged(); } else { policyBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -848,17 +863,18 @@ public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) { */ public Builder mergePolicy(com.google.iam.v2beta.Policy value) { if (policyBuilder_ == null) { - if (policy_ != null) { - policy_ = - com.google.iam.v2beta.Policy.newBuilder(policy_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && policy_ != null + && policy_ != com.google.iam.v2beta.Policy.getDefaultInstance()) { + getPolicyBuilder().mergeFrom(value); } else { policy_ = value; } - onChanged(); } else { policyBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -871,14 +887,13 @@ public Builder mergePolicy(com.google.iam.v2beta.Policy value) { * .google.iam.v2beta.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearPolicy() { - if (policyBuilder_ == null) { - policy_ = null; - onChanged(); - } else { - policy_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } - + onChanged(); return this; } /** @@ -891,7 +906,7 @@ public Builder clearPolicy() { * .google.iam.v2beta.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.iam.v2beta.Policy.Builder getPolicyBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getPolicyFieldBuilder().getBuilder(); } @@ -1007,8 +1022,8 @@ public Builder setPolicyId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - policyId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1027,8 +1042,8 @@ public Builder setPolicyId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPolicyId() { - policyId_ = getDefaultInstance().getPolicyId(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1052,8 +1067,8 @@ public Builder setPolicyIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - policyId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java index 255a71ece4..9eae189aef 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int ETAG_FIELD_NUMBER = 2; - private volatile java.lang.Object etag_; + + @SuppressWarnings("serial") + private volatile java.lang.Object etag_ = ""; /** * * @@ -392,10 +396,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - etag_ = ""; - return this; } @@ -423,12 +426,23 @@ public com.google.iam.v2beta.DeletePolicyRequest build() { public com.google.iam.v2beta.DeletePolicyRequest buildPartial() { com.google.iam.v2beta.DeletePolicyRequest result = new com.google.iam.v2beta.DeletePolicyRequest(this); - result.name_ = name_; - result.etag_ = etag_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.DeletePolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.etag_ = etag_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -476,10 +490,12 @@ public Builder mergeFrom(com.google.iam.v2beta.DeletePolicyRequest other) { if (other == com.google.iam.v2beta.DeletePolicyRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getEtag().isEmpty()) { etag_ = other.etag_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -511,13 +527,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { etag_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -537,6 +553,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -616,8 +634,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -639,8 +657,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -667,8 +685,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -746,8 +764,8 @@ public Builder setEtag(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - etag_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -767,8 +785,8 @@ public Builder setEtag(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEtag() { - etag_ = getDefaultInstance().getEtag(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -793,8 +811,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - etag_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java index b776f7b169..2d2a3b6363 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java @@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int DENIED_PRINCIPALS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList deniedPrincipals_; /** * @@ -255,6 +257,8 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) { } public static final int EXCEPTION_PRINCIPALS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList exceptionPrincipals_; /** * @@ -340,6 +344,8 @@ public com.google.protobuf.ByteString getExceptionPrincipalsBytes(int index) { } public static final int DENIED_PERMISSIONS_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList deniedPermissions_; /** * @@ -413,6 +419,8 @@ public com.google.protobuf.ByteString getDeniedPermissionsBytes(int index) { } public static final int EXCEPTION_PERMISSIONS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList exceptionPermissions_; /** * @@ -560,7 +568,7 @@ public com.google.type.Expr getDenialCondition() { */ @java.lang.Override public com.google.type.ExprOrBuilder getDenialConditionOrBuilder() { - return getDenialCondition(); + return denialCondition_ == null ? com.google.type.Expr.getDefaultInstance() : denialCondition_; } private byte memoizedIsInitialized = -1; @@ -827,6 +835,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY; @@ -835,10 +844,9 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000004); exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000008); - if (denialConditionBuilder_ == null) { - denialCondition_ = null; - } else { - denialCondition_ = null; + denialCondition_ = null; + if (denialConditionBuilder_ != null) { + denialConditionBuilder_.dispose(); denialConditionBuilder_ = null; } return this; @@ -867,7 +875,15 @@ public com.google.iam.v2beta.DenyRule build() { @java.lang.Override public com.google.iam.v2beta.DenyRule buildPartial() { com.google.iam.v2beta.DenyRule result = new com.google.iam.v2beta.DenyRule(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v2beta.DenyRule result) { if (((bitField0_ & 0x00000001) != 0)) { deniedPrincipals_ = deniedPrincipals_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); @@ -888,13 +904,14 @@ public com.google.iam.v2beta.DenyRule buildPartial() { bitField0_ = (bitField0_ & ~0x00000008); } result.exceptionPermissions_ = exceptionPermissions_; - if (denialConditionBuilder_ == null) { - result.denialCondition_ = denialCondition_; - } else { - result.denialCondition_ = denialConditionBuilder_.build(); + } + + private void buildPartial0(com.google.iam.v2beta.DenyRule result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000010) != 0)) { + result.denialCondition_ = + denialConditionBuilder_ == null ? denialCondition_ : denialConditionBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -1042,7 +1059,7 @@ public Builder mergeFrom( case 42: { input.readMessage(getDenialConditionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -2165,7 +2182,7 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value * @return Whether the denialCondition field is set. */ public boolean hasDenialCondition() { - return denialConditionBuilder_ != null || denialCondition_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -2218,11 +2235,11 @@ public Builder setDenialCondition(com.google.type.Expr value) { throw new NullPointerException(); } denialCondition_ = value; - onChanged(); } else { denialConditionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2245,11 +2262,11 @@ public Builder setDenialCondition(com.google.type.Expr value) { public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue) { if (denialConditionBuilder_ == null) { denialCondition_ = builderForValue.build(); - onChanged(); } else { denialConditionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2271,17 +2288,18 @@ public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue) */ public Builder mergeDenialCondition(com.google.type.Expr value) { if (denialConditionBuilder_ == null) { - if (denialCondition_ != null) { - denialCondition_ = - com.google.type.Expr.newBuilder(denialCondition_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && denialCondition_ != null + && denialCondition_ != com.google.type.Expr.getDefaultInstance()) { + getDenialConditionBuilder().mergeFrom(value); } else { denialCondition_ = value; } - onChanged(); } else { denialConditionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2302,14 +2320,13 @@ public Builder mergeDenialCondition(com.google.type.Expr value) { * .google.type.Expr denial_condition = 5; */ public Builder clearDenialCondition() { - if (denialConditionBuilder_ == null) { - denialCondition_ = null; - onChanged(); - } else { - denialCondition_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + denialCondition_ = null; + if (denialConditionBuilder_ != null) { + denialConditionBuilder_.dispose(); denialConditionBuilder_ = null; } - + onChanged(); return this; } /** @@ -2330,7 +2347,7 @@ public Builder clearDenialCondition() { * .google.type.Expr denial_condition = 5; */ public com.google.type.Expr.Builder getDenialConditionBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getDenialConditionFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java index b579600e91..fbe4827adc 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -324,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -353,11 +355,20 @@ public com.google.iam.v2beta.GetPolicyRequest build() { public com.google.iam.v2beta.GetPolicyRequest buildPartial() { com.google.iam.v2beta.GetPolicyRequest result = new com.google.iam.v2beta.GetPolicyRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.GetPolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -405,6 +416,7 @@ public Builder mergeFrom(com.google.iam.v2beta.GetPolicyRequest other) { if (other == com.google.iam.v2beta.GetPolicyRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -436,7 +448,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -456,6 +468,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -535,8 +549,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -558,8 +572,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -586,8 +600,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java index c66f7d36cd..36db2f0ff0 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -134,7 +136,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 2; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -153,7 +155,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -418,12 +422,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -451,13 +453,26 @@ public com.google.iam.v2beta.ListPoliciesRequest build() { public com.google.iam.v2beta.ListPoliciesRequest buildPartial() { com.google.iam.v2beta.ListPoliciesRequest result = new com.google.iam.v2beta.ListPoliciesRequest(this); - result.parent_ = parent_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.ListPoliciesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -505,6 +520,7 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesRequest other) { if (other == com.google.iam.v2beta.ListPoliciesRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getPageSize() != 0) { @@ -512,6 +528,7 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesRequest other) { } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -543,19 +560,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -575,6 +592,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -660,8 +679,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -685,8 +704,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -715,8 +734,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -754,6 +773,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -770,7 +790,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000002); pageSize_ = 0; onChanged(); return this; @@ -840,8 +860,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -858,8 +878,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -881,8 +901,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java index b7559c5045..423bc3f3ff 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int POLICIES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List policies_; /** * @@ -138,7 +140,9 @@ public com.google.iam.v2beta.PolicyOrBuilder getPoliciesOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -396,6 +400,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (policiesBuilder_ == null) { policies_ = java.util.Collections.emptyList(); } else { @@ -404,7 +409,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -432,7 +436,15 @@ public com.google.iam.v2beta.ListPoliciesResponse build() { public com.google.iam.v2beta.ListPoliciesResponse buildPartial() { com.google.iam.v2beta.ListPoliciesResponse result = new com.google.iam.v2beta.ListPoliciesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v2beta.ListPoliciesResponse result) { if (policiesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { policies_ = java.util.Collections.unmodifiableList(policies_); @@ -442,9 +454,13 @@ public com.google.iam.v2beta.ListPoliciesResponse buildPartial() { } else { result.policies_ = policiesBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v2beta.ListPoliciesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -521,6 +537,7 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -564,7 +581,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -996,8 +1013,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1014,8 +1031,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1037,8 +1054,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java index a2e1a8b7dc..55ce515fb5 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java @@ -82,7 +82,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -147,7 +149,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int UID_FIELD_NUMBER = 2; - private volatile java.lang.Object uid_; + + @SuppressWarnings("serial") + private volatile java.lang.Object uid_ = ""; /** * * @@ -198,7 +202,9 @@ public com.google.protobuf.ByteString getUidBytes() { } public static final int KIND_FIELD_NUMBER = 3; - private volatile java.lang.Object kind_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kind_ = ""; /** * * @@ -247,7 +253,9 @@ public com.google.protobuf.ByteString getKindBytes() { } public static final int DISPLAY_NAME_FIELD_NUMBER = 4; - private volatile java.lang.Object displayName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object displayName_ = ""; /** * * @@ -310,6 +318,7 @@ private static final class AnnotationsDefaultEntryHolder { ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField annotations_; private com.google.protobuf.MapField @@ -371,8 +380,10 @@ public java.util.Map getAnnotationsMap() { * map<string, string> annotations = 5; */ @java.lang.Override - public java.lang.String getAnnotationsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getAnnotationsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -402,7 +413,9 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) { } public static final int ETAG_FIELD_NUMBER = 6; - private volatile java.lang.Object etag_; + + @SuppressWarnings("serial") + private volatile java.lang.Object etag_ = ""; /** * * @@ -504,7 +517,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 8; @@ -553,7 +566,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } public static final int DELETE_TIME_FIELD_NUMBER = 9; @@ -602,10 +615,12 @@ public com.google.protobuf.Timestamp getDeleteTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() { - return getDeleteTime(); + return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_; } public static final int RULES_FIELD_NUMBER = 10; + + @SuppressWarnings("serial") private java.util.List rules_; /** * @@ -998,33 +1013,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - uid_ = ""; - kind_ = ""; - displayName_ = ""; - internalGetMutableAnnotations().clear(); etag_ = ""; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - if (deleteTimeBuilder_ == null) { - deleteTime_ = null; - } else { - deleteTime_ = null; + deleteTime_ = null; + if (deleteTimeBuilder_ != null) { + deleteTimeBuilder_.dispose(); deleteTimeBuilder_ = null; } if (rulesBuilder_ == null) { @@ -1033,7 +1041,7 @@ public Builder clear() { rules_ = null; rulesBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); return this; } @@ -1059,40 +1067,56 @@ public com.google.iam.v2beta.Policy build() { @java.lang.Override public com.google.iam.v2beta.Policy buildPartial() { com.google.iam.v2beta.Policy result = new com.google.iam.v2beta.Policy(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.uid_ = uid_; - result.kind_ = kind_; - result.displayName_ = displayName_; - result.annotations_ = internalGetAnnotations(); - result.annotations_.makeImmutable(); - result.etag_ = etag_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); - } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); - } - if (deleteTimeBuilder_ == null) { - result.deleteTime_ = deleteTime_; - } else { - result.deleteTime_ = deleteTimeBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.iam.v2beta.Policy result) { if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000200) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); } result.rules_ = rules_; } else { result.rules_ = rulesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.iam.v2beta.Policy result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.uid_ = uid_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.kind_ = kind_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.displayName_ = displayName_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.annotations_ = internalGetAnnotations(); + result.annotations_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.etag_ = etag_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.deleteTime_ = deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build(); + } } @java.lang.Override @@ -1142,23 +1166,29 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) { if (other == com.google.iam.v2beta.Policy.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getUid().isEmpty()) { uid_ = other.uid_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getKind().isEmpty()) { kind_ = other.kind_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getDisplayName().isEmpty()) { displayName_ = other.displayName_; + bitField0_ |= 0x00000008; onChanged(); } internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations()); + bitField0_ |= 0x00000010; if (!other.getEtag().isEmpty()) { etag_ = other.etag_; + bitField0_ |= 0x00000020; onChanged(); } if (other.hasCreateTime()) { @@ -1174,7 +1204,7 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) { if (!other.rules_.isEmpty()) { if (rules_.isEmpty()) { rules_ = other.rules_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); } else { ensureRulesIsMutable(); rules_.addAll(other.rules_); @@ -1187,7 +1217,7 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) { rulesBuilder_.dispose(); rulesBuilder_ = null; rules_ = other.rules_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); rulesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getRulesFieldBuilder() @@ -1226,25 +1256,25 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { uid_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { kind_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { displayName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: @@ -1256,30 +1286,31 @@ public Builder mergeFrom( internalGetMutableAnnotations() .getMutableMap() .put(annotations__.getKey(), annotations__.getValue()); + bitField0_ |= 0x00000010; break; } // case 42 case 50: { etag_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000020; break; } // case 50 case 58: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 58 case 66: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000080; break; } // case 66 case 74: { input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000100; break; } // case 74 case 82: @@ -1398,8 +1429,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1423,8 +1454,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1453,8 +1484,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1523,8 +1554,8 @@ public Builder setUid(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - uid_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1541,8 +1572,8 @@ public Builder setUid(java.lang.String value) { * @return This builder for chaining. */ public Builder clearUid() { - uid_ = getDefaultInstance().getUid(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1564,8 +1595,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - uid_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1631,8 +1662,8 @@ public Builder setKind(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kind_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1648,8 +1679,8 @@ public Builder setKind(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKind() { - kind_ = getDefaultInstance().getKind(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1670,8 +1701,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - kind_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1740,8 +1771,8 @@ public Builder setDisplayName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - displayName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1758,8 +1789,8 @@ public Builder setDisplayName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDisplayName() { - displayName_ = getDefaultInstance().getDisplayName(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1781,8 +1812,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - displayName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1800,8 +1831,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { private com.google.protobuf.MapField internalGetMutableAnnotations() { - onChanged(); - ; if (annotations_ == null) { annotations_ = com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry); @@ -1809,6 +1838,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { if (!annotations_.isMutable()) { annotations_ = annotations_.copy(); } + bitField0_ |= 0x00000010; + onChanged(); return annotations_; } @@ -1863,8 +1894,10 @@ public java.util.Map getAnnotationsMap() { * map<string, string> annotations = 5; */ @java.lang.Override - public java.lang.String getAnnotationsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getAnnotationsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -1894,6 +1927,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) { } public Builder clearAnnotations() { + bitField0_ = (bitField0_ & ~0x00000010); internalGetMutableAnnotations().getMutableMap().clear(); return this; } @@ -1917,6 +1951,7 @@ public Builder removeAnnotations(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableAnnotations() { + bitField0_ |= 0x00000010; return internalGetMutableAnnotations().getMutableMap(); } /** @@ -1936,8 +1971,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) { if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableAnnotations().getMutableMap().put(key, value); + bitField0_ |= 0x00000010; return this; } /** @@ -1952,6 +1987,7 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) { */ public Builder putAllAnnotations(java.util.Map values) { internalGetMutableAnnotations().getMutableMap().putAll(values); + bitField0_ |= 0x00000010; return this; } @@ -2028,8 +2064,8 @@ public Builder setEtag(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - etag_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2049,8 +2085,8 @@ public Builder setEtag(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEtag() { - etag_ = getDefaultInstance().getEtag(); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } @@ -2075,8 +2111,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - etag_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2101,7 +2137,7 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -2142,11 +2178,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2163,11 +2199,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2183,17 +2219,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2208,14 +2245,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2230,7 +2266,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -2302,7 +2338,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -2343,11 +2379,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2364,11 +2400,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2384,17 +2420,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000080) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2409,14 +2446,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2431,7 +2467,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000080; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } @@ -2503,7 +2539,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { * @return Whether the deleteTime field is set. */ public boolean hasDeleteTime() { - return deleteTimeBuilder_ != null || deleteTime_ != null; + return ((bitField0_ & 0x00000100) != 0); } /** * @@ -2544,11 +2580,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } deleteTime_ = value; - onChanged(); } else { deleteTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2565,11 +2601,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) { public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (deleteTimeBuilder_ == null) { deleteTime_ = builderForValue.build(); - onChanged(); } else { deleteTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2585,17 +2621,18 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) { if (deleteTimeBuilder_ == null) { - if (deleteTime_ != null) { - deleteTime_ = - com.google.protobuf.Timestamp.newBuilder(deleteTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000100) != 0) + && deleteTime_ != null + && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getDeleteTimeBuilder().mergeFrom(value); } else { deleteTime_ = value; } - onChanged(); } else { deleteTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2610,14 +2647,13 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) { * */ public Builder clearDeleteTime() { - if (deleteTimeBuilder_ == null) { - deleteTime_ = null; - onChanged(); - } else { - deleteTime_ = null; + bitField0_ = (bitField0_ & ~0x00000100); + deleteTime_ = null; + if (deleteTimeBuilder_ != null) { + deleteTimeBuilder_.dispose(); deleteTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2632,7 +2668,7 @@ public Builder clearDeleteTime() { * */ public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() { - + bitField0_ |= 0x00000100; onChanged(); return getDeleteTimeFieldBuilder().getBuilder(); } @@ -2688,9 +2724,9 @@ public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() { java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000200) != 0)) { rules_ = new java.util.ArrayList(rules_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000200; } } @@ -2914,7 +2950,7 @@ public Builder addAllRules( public Builder clearRules() { if (rulesBuilder_ == null) { rules_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000200); onChanged(); } else { rulesBuilder_.clear(); @@ -3042,7 +3078,7 @@ public java.util.List getRulesBuilderL com.google.iam.v2beta.PolicyRule, com.google.iam.v2beta.PolicyRule.Builder, com.google.iam.v2beta.PolicyRuleOrBuilder>( - rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + rules_, ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java index 766a87f7cb..7c1c6a9bb9 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java @@ -108,7 +108,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } private byte memoizedIsInitialized = -1; @@ -313,10 +313,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + bitField0_ = 0; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } return this; @@ -346,15 +346,20 @@ public com.google.iam.v2beta.PolicyOperationMetadata build() { public com.google.iam.v2beta.PolicyOperationMetadata buildPartial() { com.google.iam.v2beta.PolicyOperationMetadata result = new com.google.iam.v2beta.PolicyOperationMetadata(this); - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.PolicyOperationMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -432,7 +437,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +457,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -470,7 +477,7 @@ public Builder mergeFrom( * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -507,11 +514,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -526,11 +533,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -544,17 +551,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -567,14 +575,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp create_time = 1; */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -587,7 +594,7 @@ public Builder clearCreateTime() { * .google.protobuf.Timestamp create_time = 1; */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java index fdfbab3396..a1a4d2a7b2 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java @@ -189,7 +189,6 @@ public interface PolicyOrBuilder * * map<string, string> annotations = 5; */ - /* nullable */ java.lang.String getAnnotationsOrDefault( java.lang.String key, diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java index 27084c7ca3..8da3bc2c5e 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java @@ -162,7 +162,9 @@ public com.google.iam.v2beta.DenyRuleOrBuilder getDenyRuleOrBuilder() { } public static final int DESCRIPTION_FIELD_NUMBER = 1; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -431,11 +433,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (denyRuleBuilder_ != null) { denyRuleBuilder_.clear(); } description_ = ""; - kindCase_ = 0; kind_ = null; return this; @@ -464,19 +466,29 @@ public com.google.iam.v2beta.PolicyRule build() { @java.lang.Override public com.google.iam.v2beta.PolicyRule buildPartial() { com.google.iam.v2beta.PolicyRule result = new com.google.iam.v2beta.PolicyRule(this); - if (kindCase_ == 2) { - if (denyRuleBuilder_ == null) { - result.kind_ = kind_; - } else { - result.kind_ = denyRuleBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.description_ = description_; - result.kindCase_ = kindCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.PolicyRule result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.description_ = description_; + } + } + + private void buildPartialOneofs(com.google.iam.v2beta.PolicyRule result) { + result.kindCase_ = kindCase_; + result.kind_ = this.kind_; + if (kindCase_ == 2 && denyRuleBuilder_ != null) { + result.kind_ = denyRuleBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -524,6 +536,7 @@ public Builder mergeFrom(com.google.iam.v2beta.PolicyRule other) { if (other == com.google.iam.v2beta.PolicyRule.getDefaultInstance()) return this; if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000002; onChanged(); } switch (other.getKindCase()) { @@ -566,7 +579,7 @@ public Builder mergeFrom( case 10: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 10 case 18: @@ -606,6 +619,8 @@ public Builder clearKind() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.iam.v2beta.DenyRule, com.google.iam.v2beta.DenyRule.Builder, @@ -807,7 +822,6 @@ public com.google.iam.v2beta.DenyRuleOrBuilder getDenyRuleOrBuilder() { } kindCase_ = 2; onChanged(); - ; return denyRuleBuilder_; } @@ -875,8 +889,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -893,8 +907,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -916,8 +930,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java index 95eabcdd8b..97a01efac9 100644 --- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java +++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java @@ -117,7 +117,7 @@ public com.google.iam.v2beta.Policy getPolicy() { */ @java.lang.Override public com.google.iam.v2beta.PolicyOrBuilder getPolicyOrBuilder() { - return getPolicy(); + return policy_ == null ? com.google.iam.v2beta.Policy.getDefaultInstance() : policy_; } private byte memoizedIsInitialized = -1; @@ -322,10 +322,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (policyBuilder_ == null) { - policy_ = null; - } else { - policy_ = null; + bitField0_ = 0; + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } return this; @@ -355,15 +355,20 @@ public com.google.iam.v2beta.UpdatePolicyRequest build() { public com.google.iam.v2beta.UpdatePolicyRequest buildPartial() { com.google.iam.v2beta.UpdatePolicyRequest result = new com.google.iam.v2beta.UpdatePolicyRequest(this); - if (policyBuilder_ == null) { - result.policy_ = policy_; - } else { - result.policy_ = policyBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.iam.v2beta.UpdatePolicyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -441,7 +446,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -461,6 +466,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.iam.v2beta.Policy policy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.iam.v2beta.Policy, @@ -482,7 +489,7 @@ public Builder mergeFrom( * @return Whether the policy field is set. */ public boolean hasPolicy() { - return policyBuilder_ != null || policy_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -523,11 +530,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) { throw new NullPointerException(); } policy_ = value; - onChanged(); } else { policyBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -545,11 +552,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) { public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) { if (policyBuilder_ == null) { policy_ = builderForValue.build(); - onChanged(); } else { policyBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -566,17 +573,18 @@ public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) { */ public Builder mergePolicy(com.google.iam.v2beta.Policy value) { if (policyBuilder_ == null) { - if (policy_ != null) { - policy_ = - com.google.iam.v2beta.Policy.newBuilder(policy_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && policy_ != null + && policy_ != com.google.iam.v2beta.Policy.getDefaultInstance()) { + getPolicyBuilder().mergeFrom(value); } else { policy_ = value; } - onChanged(); } else { policyBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -592,14 +600,13 @@ public Builder mergePolicy(com.google.iam.v2beta.Policy value) { * .google.iam.v2beta.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearPolicy() { - if (policyBuilder_ == null) { - policy_ = null; - onChanged(); - } else { - policy_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + policy_ = null; + if (policyBuilder_ != null) { + policyBuilder_.dispose(); policyBuilder_ = null; } - + onChanged(); return this; } /** @@ -615,7 +622,7 @@ public Builder clearPolicy() { * .google.iam.v2beta.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.iam.v2beta.Policy.Builder getPolicyBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPolicyFieldBuilder().getBuilder(); }