Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(bazel): [iam] update protobuf to v3.21.12 #1262

Merged
merged 3 commits into from
Feb 27, 2023
Merged

chore(bazel): [iam] update protobuf to v3.21.12 #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b635b0
chore(bazel): update protobuf to v3.21.12
gcf-owl-bot[bot] Feb 22, 2023
1189b52
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Feb 22, 2023
eaf9a18
Merge branch 'main' into owl-bot-copy-java-iam
diegomarquezp Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ = "";
/**
*
*
Expand Down Expand Up @@ -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<com.google.iam.v1.AuditLogConfig> auditLogConfigs_;
/**
*
Expand Down Expand Up @@ -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;
}

Expand All @@ -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
Expand Down Expand Up @@ -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_);
Expand All @@ -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()
Expand Down Expand Up @@ -638,7 +655,7 @@ public Builder mergeFrom(
case 10:
{
service_ = input.readStringRequireUtf8();

bitField0_ |= 0x00000001;
break;
} // case 10
case 26:
Expand Down Expand Up @@ -739,8 +756,8 @@ public Builder setService(java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}

service_ = value;
bitField0_ |= 0x00000001;
onChanged();
return this;
}
Expand All @@ -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;
}
Expand All @@ -782,8 +799,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
throw new NullPointerException();
}
checkByteStringIsUtf8(value);

service_ = value;
bitField0_ |= 0x00000001;
onChanged();
return this;
}
Expand All @@ -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<com.google.iam.v1.AuditLogConfig>(auditLogConfigs_);
bitField0_ |= 0x00000001;
bitField0_ |= 0x00000002;
}
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
Loading