From 42fca3228672371a1e740c8d60a22539b67c32a0 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Wed, 29 Jan 2025 02:22:58 +0000 Subject: [PATCH 1/5] chore: update googleapis commit at Wed Jan 29 02:22:50 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 7c83d41f4d..446ca6e1ad 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,4 +1,4 @@ -googleapis_commitish: 27aa9d542f54ae1ea1277580550dd04aeb5b09f9 +googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54 # the libraries are ordered with respect to library name, which is # java-{library.library_name} or java-{library.api-shortname} when # library.library_name is not defined. From a945fcb7548a870c0354b80633066dacfd6d510d Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Thu, 30 Jan 2025 02:22:14 +0000 Subject: [PATCH 2/5] chore: update googleapis commit at Thu Jan 30 02:22:09 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 446ca6e1ad..6ad62bac2d 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,4 +1,4 @@ -googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54 +googleapis_commitish: 2a3db2e19f48a139db9f40278c0217df110add9b # the libraries are ordered with respect to library name, which is # java-{library.library_name} or java-{library.api-shortname} when # library.library_name is not defined. From e06849acfe6557ad1441af1c24b9950440d1a577 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Fri, 31 Jan 2025 02:23:21 +0000 Subject: [PATCH 3/5] chore: update googleapis commit at Fri Jan 31 02:23:15 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 6ad62bac2d..3ac9cdb6fb 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,4 +1,4 @@ -googleapis_commitish: 2a3db2e19f48a139db9f40278c0217df110add9b +googleapis_commitish: dd1210af5bee414c9e606f5637e0eb0fd9d894e8 # the libraries are ordered with respect to library name, which is # java-{library.library_name} or java-{library.api-shortname} when # library.library_name is not defined. From 33c56fba9ef47528d4d1ace19bbda1072e1368ba Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Fri, 31 Jan 2025 02:29:08 +0000 Subject: [PATCH 4/5] chore: generate libraries at Fri Jan 31 02:27:47 UTC 2025 --- .../main/java/com/google/api/ClientProto.java | 37 +++--- .../google/api/SelectiveGapicGeneration.java | 113 ++++++++++++++++++ .../SelectiveGapicGenerationOrBuilder.java | 18 +++ .../src/main/proto/google/api/client.proto | 8 ++ 4 files changed, 158 insertions(+), 18 deletions(-) diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java index 19554c91eb..c403b35264 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java @@ -330,23 +330,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "oll_delay_multiplier\030\002 \001(\002\0221\n\016max_poll_d" + "elay\030\003 \001(\0132\031.google.protobuf.Duration\0225\n" + "\022total_poll_timeout\030\004 \001(\0132\031.google.proto" - + "buf.Duration\"+\n\030SelectiveGapicGeneration" - + "\022\017\n\007methods\030\001 \003(\t*\243\001\n\031ClientLibraryOrgan" - + "ization\022+\n\'CLIENT_LIBRARY_ORGANIZATION_U" - + "NSPECIFIED\020\000\022\t\n\005CLOUD\020\001\022\007\n\003ADS\020\002\022\n\n\006PHOT" - + "OS\020\003\022\017\n\013STREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003G" - + "EO\020\006\022\021\n\rGENERATIVE_AI\020\007*g\n\030ClientLibrary" - + "Destination\022*\n&CLIENT_LIBRARY_DESTINATIO" - + "N_UNSPECIFIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_M" - + "ANAGER\020\024:9\n\020method_signature\022\036.google.pr" - + "otobuf.MethodOptions\030\233\010 \003(\t:6\n\014default_h" - + "ost\022\037.google.protobuf.ServiceOptions\030\231\010 " - + "\001(\t:6\n\014oauth_scopes\022\037.google.protobuf.Se" - + "rviceOptions\030\232\010 \001(\t:8\n\013api_version\022\037.goo" - + "gle.protobuf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n" - + "\016com.google.apiB\013ClientProtoP\001ZAgoogle.g" - + "olang.org/genproto/googleapis/api/annota" - + "tions;annotations\242\002\004GAPIb\006proto3" + + "buf.Duration\"Q\n\030SelectiveGapicGeneration" + + "\022\017\n\007methods\030\001 \003(\t\022$\n\034generate_omitted_as" + + "_internal\030\002 \001(\010*\243\001\n\031ClientLibraryOrganiz" + + "ation\022+\n\'CLIENT_LIBRARY_ORGANIZATION_UNS" + + "PECIFIED\020\000\022\t\n\005CLOUD\020\001\022\007\n\003ADS\020\002\022\n\n\006PHOTOS" + + "\020\003\022\017\n\013STREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO" + + "\020\006\022\021\n\rGENERATIVE_AI\020\007*g\n\030ClientLibraryDe" + + "stination\022*\n&CLIENT_LIBRARY_DESTINATION_" + + "UNSPECIFIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MAN" + + "AGER\020\024:9\n\020method_signature\022\036.google.prot" + + "obuf.MethodOptions\030\233\010 \003(\t:6\n\014default_hos" + + "t\022\037.google.protobuf.ServiceOptions\030\231\010 \001(" + + "\t:6\n\014oauth_scopes\022\037.google.protobuf.Serv" + + "iceOptions\030\232\010 \001(\t:8\n\013api_version\022\037.googl" + + "e.protobuf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016c" + + "om.google.apiB\013ClientProtoP\001ZAgoogle.gol" + + "ang.org/genproto/googleapis/api/annotati" + + "ons;annotations\242\002\004GAPIb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -522,7 +523,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_api_SelectiveGapicGeneration_descriptor, new java.lang.String[] { - "Methods", + "Methods", "GenerateOmittedAsInternal", }); methodSignature.internalInit(descriptor.getExtensions().get(0)); defaultHost.internalInit(descriptor.getExtensions().get(1)); diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java index 003fe17265..a0731795ac 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java @@ -132,6 +132,29 @@ public com.google.protobuf.ByteString getMethodsBytes(int index) { return methods_.getByteString(index); } + public static final int GENERATE_OMITTED_AS_INTERNAL_FIELD_NUMBER = 2; + private boolean generateOmittedAsInternal_ = false; + /** + * + * + * 
+   * Setting this to true indicates to the client generators that methods
+   * that would be excluded from the generation should instead be generated
+   * in a way that indicates these methods should not be consumed by
+   * end users. How this is expressed is up to individual language
+   * implementations to decide. Some examples may be: added annotations,
+   * obfuscated identifiers, or other language idiomatic patterns.
+   *
+ * + * bool generate_omitted_as_internal = 2; + * + * @return The generateOmittedAsInternal. + */ + @java.lang.Override + public boolean getGenerateOmittedAsInternal() { + return generateOmittedAsInternal_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -149,6 +172,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < methods_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, methods_.getRaw(i)); } + if (generateOmittedAsInternal_ != false) { + output.writeBool(2, generateOmittedAsInternal_); + } getUnknownFields().writeTo(output); } @@ -166,6 +192,9 @@ public int getSerializedSize() { size += dataSize; size += 1 * getMethodsList().size(); } + if (generateOmittedAsInternal_ != false) { + size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, generateOmittedAsInternal_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -182,6 +211,7 @@ public boolean equals(final java.lang.Object obj) { com.google.api.SelectiveGapicGeneration other = (com.google.api.SelectiveGapicGeneration) obj; if (!getMethodsList().equals(other.getMethodsList())) return false; + if (getGenerateOmittedAsInternal() != other.getGenerateOmittedAsInternal()) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -197,6 +227,8 @@ public int hashCode() { hash = (37 * hash) + METHODS_FIELD_NUMBER; hash = (53 * hash) + getMethodsList().hashCode(); } + hash = (37 * hash) + GENERATE_OMITTED_AS_INTERNAL_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getGenerateOmittedAsInternal()); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -338,6 +370,7 @@ public Builder clear() { super.clear(); bitField0_ = 0; methods_ = com.google.protobuf.LazyStringArrayList.emptyList(); + generateOmittedAsInternal_ = false; return this; } @@ -378,6 +411,9 @@ private void buildPartial0(com.google.api.SelectiveGapicGeneration result) { methods_.makeImmutable(); result.methods_ = methods_; } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.generateOmittedAsInternal_ = generateOmittedAsInternal_; + } } @java.lang.Override @@ -435,6 +471,9 @@ public Builder mergeFrom(com.google.api.SelectiveGapicGeneration other) { } onChanged(); } + if (other.getGenerateOmittedAsInternal() != false) { + setGenerateOmittedAsInternal(other.getGenerateOmittedAsInternal()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -468,6 +507,12 @@ public Builder mergeFrom( methods_.add(s); break; } // case 10 + case 16: + { + generateOmittedAsInternal_ = input.readBool(); + bitField0_ |= 0x00000002; + break; + } // case 16 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -670,6 +715,74 @@ public Builder addMethodsBytes(com.google.protobuf.ByteString value) { return this; } + private boolean generateOmittedAsInternal_; + /** + * + * + * 
+     * Setting this to true indicates to the client generators that methods
+     * that would be excluded from the generation should instead be generated
+     * in a way that indicates these methods should not be consumed by
+     * end users. How this is expressed is up to individual language
+     * implementations to decide. Some examples may be: added annotations,
+     * obfuscated identifiers, or other language idiomatic patterns.
+     *
+ * + * bool generate_omitted_as_internal = 2; + * + * @return The generateOmittedAsInternal. + */ + @java.lang.Override + public boolean getGenerateOmittedAsInternal() { + return generateOmittedAsInternal_; + } + /** + * + * + * 
+     * Setting this to true indicates to the client generators that methods
+     * that would be excluded from the generation should instead be generated
+     * in a way that indicates these methods should not be consumed by
+     * end users. How this is expressed is up to individual language
+     * implementations to decide. Some examples may be: added annotations,
+     * obfuscated identifiers, or other language idiomatic patterns.
+     *
+ * + * bool generate_omitted_as_internal = 2; + * + * @param value The generateOmittedAsInternal to set. + * @return This builder for chaining. + */ + public Builder setGenerateOmittedAsInternal(boolean value) { + + generateOmittedAsInternal_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * + * + * 
+     * Setting this to true indicates to the client generators that methods
+     * that would be excluded from the generation should instead be generated
+     * in a way that indicates these methods should not be consumed by
+     * end users. How this is expressed is up to individual language
+     * implementations to decide. Some examples may be: added annotations,
+     * obfuscated identifiers, or other language idiomatic patterns.
+     *
+ * + * bool generate_omitted_as_internal = 2; + * + * @return This builder for chaining. + */ + public Builder clearGenerateOmittedAsInternal() { + bitField0_ = (bitField0_ & ~0x00000002); + generateOmittedAsInternal_ = false; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java index e2d3c21970..3c016846bc 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java @@ -78,4 +78,22 @@ public interface SelectiveGapicGenerationOrBuilder * @return The bytes of the methods at the given index. */ com.google.protobuf.ByteString getMethodsBytes(int index); + + /** + * + * + * 
+   * Setting this to true indicates to the client generators that methods
+   * that would be excluded from the generation should instead be generated
+   * in a way that indicates these methods should not be consumed by
+   * end users. How this is expressed is up to individual language
+   * implementations to decide. Some examples may be: added annotations,
+   * obfuscated identifiers, or other language idiomatic patterns.
+   *
+ * + * bool generate_omitted_as_internal = 2; + * + * @return The generateOmittedAsInternal. + */ + boolean getGenerateOmittedAsInternal(); } diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto index 7e3e66e9ed..5bb9f91101 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto @@ -469,4 +469,12 @@ message SelectiveGapicGeneration { // An allowlist of the fully qualified names of RPCs that should be included // on public client surfaces. repeated string methods = 1; + + // Setting this to true indicates to the client generators that methods + // that would be excluded from the generation should instead be generated + // in a way that indicates these methods should not be consumed by + // end users. How this is expressed is up to individual language + // implementations to decide. Some examples may be: added annotations, + // obfuscated identifiers, or other language idiomatic patterns. + bool generate_omitted_as_internal = 2; } From ab6bb94156635d1cfe5d5f188e19eeb6e5fbc651 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 3 Feb 2025 02:23:56 +0000 Subject: [PATCH 5/5] chore: update googleapis commit at Mon Feb 3 02:23:51 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 3ac9cdb6fb..80fca506e8 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,4 +1,4 @@ -googleapis_commitish: dd1210af5bee414c9e606f5637e0eb0fd9d894e8 +googleapis_commitish: 3cf61b2df20eace09e6336c23f9e08859c0d87ae # the libraries are ordered with respect to library name, which is # java-{library.library_name} or java-{library.api-shortname} when # library.library_name is not defined.