Skip to content

Commit 122a493

Browse files
JoeWang1127JoeWang1127
authored
chore: add iam logging (#2932)
In this PR: - Add logging module in `google/iam/v1`. - Regenerate iam.
1 parent 9ab3e1d commit 122a493

File tree

9 files changed

+334
-181
lines changed

9 files changed

+334
-181
lines changed

‎java-iam/.OwlBot-hermetic.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ deep-remove-regex:
1717
- "/java-iam/grpc-google-.*/src"
1818
- "/java-iam/proto-google-.*/src"
1919

20-
deep-preserve-regex:
21-
- "/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging"
22-
- "/java-iam/proto-google-iam-v1/src/main/proto/google/iam/v1"
23-
2420
deep-copy-regex:
2521
- source: "/google/iam/(v.*)/.*-java/grpc-google-.*/src"
2622
dest: "/owl-bot-staging/java-iam/$1/grpc-google-iam-$1/src"

‎java-iam/.repo-metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"api_description": "Manages access control for Google Cloud Platform resources",
66
"client_documentation": "https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/overview",
77
"release_level": "stable",
8-
"transport": "grpc",
8+
"transport": "both",
99
"language": "java",
1010
"repo": "googleapis/sdk-platform-java",
1111
"repo_short": "java-iam",

‎java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java

+92-103
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/iam/v1/logging/audit_data.proto
1818

19+
// Protobuf Java Version: 3.25.3
1920
package com.google.iam.v1.logging;
2021

2122
/**
@@ -47,63 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
4748
return new AuditData();
4849
}
4950

50-
@java.lang.Override
51-
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
52-
return this.unknownFields;
53-
}
54-
55-
private AuditData(
56-
com.google.protobuf.CodedInputStream input,
57-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
58-
throws com.google.protobuf.InvalidProtocolBufferException {
59-
this();
60-
if (extensionRegistry == null) {
61-
throw new java.lang.NullPointerException();
62-
}
63-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
64-
com.google.protobuf.UnknownFieldSet.newBuilder();
65-
try {
66-
boolean done = false;
67-
while (!done) {
68-
int tag = input.readTag();
69-
switch (tag) {
70-
case 0:
71-
done = true;
72-
break;
73-
case 18:
74-
{
75-
com.google.iam.v1.PolicyDelta.Builder subBuilder = null;
76-
if (policyDelta_ != null) {
77-
subBuilder = policyDelta_.toBuilder();
78-
}
79-
policyDelta_ =
80-
input.readMessage(com.google.iam.v1.PolicyDelta.parser(), extensionRegistry);
81-
if (subBuilder != null) {
82-
subBuilder.mergeFrom(policyDelta_);
83-
policyDelta_ = subBuilder.buildPartial();
84-
}
85-
86-
break;
87-
}
88-
default:
89-
{
90-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
91-
done = true;
92-
}
93-
break;
94-
}
95-
}
96-
}
97-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
98-
throw e.setUnfinishedMessage(this);
99-
} catch (java.io.IOException e) {
100-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
101-
} finally {
102-
this.unknownFields = unknownFields.build();
103-
makeExtensionsImmutable();
104-
}
105-
}
106-
10751
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
10852
return com.google.iam.v1.logging.AuditDataProto
10953
.internal_static_google_iam_v1_logging_AuditData_descriptor;
@@ -119,6 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11963
com.google.iam.v1.logging.AuditData.Builder.class);
12064
}
12165

66+
private int bitField0_;
12267
public static final int POLICY_DELTA_FIELD_NUMBER = 2;
12368
private com.google.iam.v1.PolicyDelta policyDelta_;
12469
/**
@@ -134,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
13479
*/
13580
@java.lang.Override
13681
public boolean hasPolicyDelta() {
137-
return policyDelta_ != null;
82+
return ((bitField0_ & 0x00000001) != 0);
13883
}
13984
/**
14085
*
@@ -162,7 +107,7 @@ public com.google.iam.v1.PolicyDelta getPolicyDelta() {
162107
*/
163108
@java.lang.Override
164109
public com.google.iam.v1.PolicyDeltaOrBuilder getPolicyDeltaOrBuilder() {
165-
return getPolicyDelta();
110+
return policyDelta_ == null ? com.google.iam.v1.PolicyDelta.getDefaultInstance() : policyDelta_;
166111
}
167112

168113
private byte memoizedIsInitialized = -1;
@@ -179,10 +124,10 @@ public final boolean isInitialized() {
179124

180125
@java.lang.Override
181126
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
182-
if (policyDelta_ != null) {
127+
if (((bitField0_ & 0x00000001) != 0)) {
183128
output.writeMessage(2, getPolicyDelta());
184129
}
185-
unknownFields.writeTo(output);
130+
getUnknownFields().writeTo(output);
186131
}
187132

188133
@java.lang.Override
@@ -191,10 +136,10 @@ public int getSerializedSize() {
191136
if (size != -1) return size;
192137

193138
size = 0;
194-
if (policyDelta_ != null) {
139+
if (((bitField0_ & 0x00000001) != 0)) {
195140
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicyDelta());
196141
}
197-
size += unknownFields.getSerializedSize();
142+
size += getUnknownFields().getSerializedSize();
198143
memoizedSize = size;
199144
return size;
200145
}
@@ -213,7 +158,7 @@ public boolean equals(final java.lang.Object obj) {
213158
if (hasPolicyDelta()) {
214159
if (!getPolicyDelta().equals(other.getPolicyDelta())) return false;
215160
}
216-
if (!unknownFields.equals(other.unknownFields)) return false;
161+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
217162
return true;
218163
}
219164

@@ -228,7 +173,7 @@ public int hashCode() {
228173
hash = (37 * hash) + POLICY_DELTA_FIELD_NUMBER;
229174
hash = (53 * hash) + getPolicyDelta().hashCode();
230175
}
231-
hash = (29 * hash) + unknownFields.hashCode();
176+
hash = (29 * hash) + getUnknownFields().hashCode();
232177
memoizedHashCode = hash;
233178
return hash;
234179
}
@@ -368,16 +313,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
368313
}
369314

370315
private void maybeForceBuilderInitialization() {
371-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
316+
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
317+
getPolicyDeltaFieldBuilder();
318+
}
372319
}
373320

374321
@java.lang.Override
375322
public Builder clear() {
376323
super.clear();
377-
if (policyDeltaBuilder_ == null) {
378-
policyDelta_ = null;
379-
} else {
380-
policyDelta_ = null;
324+
bitField0_ = 0;
325+
policyDelta_ = null;
326+
if (policyDeltaBuilder_ != null) {
327+
policyDeltaBuilder_.dispose();
381328
policyDeltaBuilder_ = null;
382329
}
383330
return this;
@@ -406,15 +353,24 @@ public com.google.iam.v1.logging.AuditData build() {
406353
@java.lang.Override
407354
public com.google.iam.v1.logging.AuditData buildPartial() {
408355
com.google.iam.v1.logging.AuditData result = new com.google.iam.v1.logging.AuditData(this);
409-
if (policyDeltaBuilder_ == null) {
410-
result.policyDelta_ = policyDelta_;
411-
} else {
412-
result.policyDelta_ = policyDeltaBuilder_.build();
356+
if (bitField0_ != 0) {
357+
buildPartial0(result);
413358
}
414359
onBuilt();
415360
return result;
416361
}
417362

363+
private void buildPartial0(com.google.iam.v1.logging.AuditData result) {
364+
int from_bitField0_ = bitField0_;
365+
int to_bitField0_ = 0;
366+
if (((from_bitField0_ & 0x00000001) != 0)) {
367+
result.policyDelta_ =
368+
policyDeltaBuilder_ == null ? policyDelta_ : policyDeltaBuilder_.build();
369+
to_bitField0_ |= 0x00000001;
370+
}
371+
result.bitField0_ |= to_bitField0_;
372+
}
373+
418374
@java.lang.Override
419375
public Builder clone() {
420376
return super.clone();
@@ -463,7 +419,7 @@ public Builder mergeFrom(com.google.iam.v1.logging.AuditData other) {
463419
if (other.hasPolicyDelta()) {
464420
mergePolicyDelta(other.getPolicyDelta());
465421
}
466-
this.mergeUnknownFields(other.unknownFields);
422+
this.mergeUnknownFields(other.getUnknownFields());
467423
onChanged();
468424
return this;
469425
}
@@ -478,20 +434,42 @@ public Builder mergeFrom(
478434
com.google.protobuf.CodedInputStream input,
479435
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
480436
throws java.io.IOException {
481-
com.google.iam.v1.logging.AuditData parsedMessage = null;
437+
if (extensionRegistry == null) {
438+
throw new java.lang.NullPointerException();
439+
}
482440
try {
483-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
441+
boolean done = false;
442+
while (!done) {
443+
int tag = input.readTag();
444+
switch (tag) {
445+
case 0:
446+
done = true;
447+
break;
448+
case 18:
449+
{
450+
input.readMessage(getPolicyDeltaFieldBuilder().getBuilder(), extensionRegistry);
451+
bitField0_ |= 0x00000001;
452+
break;
453+
} // case 18
454+
default:
455+
{
456+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
457+
done = true; // was an endgroup tag
458+
}
459+
break;
460+
} // default:
461+
} // switch (tag)
462+
} // while (!done)
484463
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
485-
parsedMessage = (com.google.iam.v1.logging.AuditData) e.getUnfinishedMessage();
486464
throw e.unwrapIOException();
487465
} finally {
488-
if (parsedMessage != null) {
489-
mergeFrom(parsedMessage);
490-
}
491-
}
466+
onChanged();
467+
} // finally
492468
return this;
493469
}
494470

471+
private int bitField0_;
472+
495473
private com.google.iam.v1.PolicyDelta policyDelta_;
496474
private com.google.protobuf.SingleFieldBuilderV3<
497475
com.google.iam.v1.PolicyDelta,
@@ -510,7 +488,7 @@ public Builder mergeFrom(
510488
* @return Whether the policyDelta field is set.
511489
*/
512490
public boolean hasPolicyDelta() {
513-
return policyDeltaBuilder_ != null || policyDelta_ != null;
491+
return ((bitField0_ & 0x00000001) != 0);
514492
}
515493
/**
516494
*
@@ -547,11 +525,11 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta value) {
547525
throw new NullPointerException();
548526
}
549527
policyDelta_ = value;
550-
onChanged();
551528
} else {
552529
policyDeltaBuilder_.setMessage(value);
553530
}
554-
531+
bitField0_ |= 0x00000001;
532+
onChanged();
555533
return this;
556534
}
557535
/**
@@ -566,11 +544,11 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta value) {
566544
public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta.Builder builderForValue) {
567545
if (policyDeltaBuilder_ == null) {
568546
policyDelta_ = builderForValue.build();
569-
onChanged();
570547
} else {
571548
policyDeltaBuilder_.setMessage(builderForValue.build());
572549
}
573-
550+
bitField0_ |= 0x00000001;
551+
onChanged();
574552
return this;
575553
}
576554
/**
@@ -584,19 +562,20 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta.Builder builderForVa
584562
*/
585563
public Builder mergePolicyDelta(com.google.iam.v1.PolicyDelta value) {
586564
if (policyDeltaBuilder_ == null) {
587-
if (policyDelta_ != null) {
588-
policyDelta_ =
589-
com.google.iam.v1.PolicyDelta.newBuilder(policyDelta_)
590-
.mergeFrom(value)
591-
.buildPartial();
565+
if (((bitField0_ & 0x00000001) != 0)
566+
&& policyDelta_ != null
567+
&& policyDelta_ != com.google.iam.v1.PolicyDelta.getDefaultInstance()) {
568+
getPolicyDeltaBuilder().mergeFrom(value);
592569
} else {
593570
policyDelta_ = value;
594571
}
595-
onChanged();
596572
} else {
597573
policyDeltaBuilder_.mergeFrom(value);
598574
}
599-
575+
if (policyDelta_ != null) {
576+
bitField0_ |= 0x00000001;
577+
onChanged();
578+
}
600579
return this;
601580
}
602581
/**
@@ -609,14 +588,13 @@ public Builder mergePolicyDelta(com.google.iam.v1.PolicyDelta value) {
609588
* <code>.google.iam.v1.PolicyDelta policy_delta = 2;</code>
610589
*/
611590
public Builder clearPolicyDelta() {
612-
if (policyDeltaBuilder_ == null) {
613-
policyDelta_ = null;
614-
onChanged();
615-
} else {
616-
policyDelta_ = null;
591+
bitField0_ = (bitField0_ & ~0x00000001);
592+
policyDelta_ = null;
593+
if (policyDeltaBuilder_ != null) {
594+
policyDeltaBuilder_.dispose();
617595
policyDeltaBuilder_ = null;
618596
}
619-
597+
onChanged();
620598
return this;
621599
}
622600
/**
@@ -629,7 +607,7 @@ public Builder clearPolicyDelta() {
629607
* <code>.google.iam.v1.PolicyDelta policy_delta = 2;</code>
630608
*/
631609
public com.google.iam.v1.PolicyDelta.Builder getPolicyDeltaBuilder() {
632-
610+
bitField0_ |= 0x00000001;
633611
onChanged();
634612
return getPolicyDeltaFieldBuilder().getBuilder();
635613
}
@@ -709,7 +687,18 @@ public AuditData parsePartialFrom(
709687
com.google.protobuf.CodedInputStream input,
710688
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
711689
throws com.google.protobuf.InvalidProtocolBufferException {
712-
return new AuditData(input, extensionRegistry);
690+
Builder builder = newBuilder();
691+
try {
692+
builder.mergeFrom(input, extensionRegistry);
693+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
694+
throw e.setUnfinishedMessage(builder.buildPartial());
695+
} catch (com.google.protobuf.UninitializedMessageException e) {
696+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
697+
} catch (java.io.IOException e) {
698+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
699+
.setUnfinishedMessage(builder.buildPartial());
700+
}
701+
return builder.buildPartial();
713702
}
714703
};
715704

0 commit comments

Comments
 (0)