From e9d9ff12e4db831fce097f55058a2ef7d0a19894 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 10 Aug 2026 22:15:09 +0000 Subject: [PATCH 1/4] chore: update legacy repo references to google-cloud-java --- .../google/auth/oauth2/GdchCredentialsTestUtil.java | 2 +- .../google-cloud-bigtable/EnableAutoValue.txt | 2 +- java-bigtable/test-proxy/EnableAutoValue.txt | 2 +- java-cloud-bom/README.md | 2 +- java-cloud-bom/libraries-bom/pom.xml | 2 +- java-common-protos/README.md | 6 +++--- .../showcase/v1beta1/it/ITAutoPopulatedFields.java | 2 +- sdk-platform-java/DEVELOPMENT.md | 2 +- sdk-platform-java/api-common-java/.repo-metadata.json | 4 ++-- sdk-platform-java/api-common-java/README.md | 4 ++-- sdk-platform-java/api-common-java/pom.xml | 2 +- sdk-platform-java/dependencies.txt | 6 +++--- .../gapic-generator-java-pom-parent/pom.xml | 10 +++++----- .../common/AbstractServiceClientClassComposer.java | 2 +- sdk-platform-java/gax-java/.repo-metadata.json | 4 ++-- sdk-platform-java/gax-java/README.md | 4 ++-- sdk-platform-java/gax-java/gax-bom/pom.xml | 8 ++++---- sdk-platform-java/gax-java/pom.xml | 2 +- sdk-platform-java/java-core/.repo-metadata.json | 4 ++-- sdk-platform-java/java-core/README.md | 6 +++--- .../src/main/java/com/google/cloud/ServiceOptions.java | 2 +- sdk-platform-java/java-shared-dependencies/README.md | 6 +++--- .../showcase/v1beta1/it/ITAutoPopulatedFields.java | 2 +- .../showcase/v1beta1/it/ITAutoPopulatedFields.java | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java index cddc70d06765..56785666641b 100644 --- a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java +++ b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java @@ -7,7 +7,7 @@ /** * This class marked public as it is used in showcase tests in sdk-platform-java to test GDCH: - * https://github.com/googleapis/sdk-platform-java/blob/3db61c211b757796a3e212c384487d0f2827322b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java#L215-L223 + * https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java#L217-L225 */ public class GdchCredentialsTestUtil { public static void registerGdchCredentialWithMockTransport( diff --git a/java-bigtable/google-cloud-bigtable/EnableAutoValue.txt b/java-bigtable/google-cloud-bigtable/EnableAutoValue.txt index e940c28979d0..e353d4315425 100644 --- a/java-bigtable/google-cloud-bigtable/EnableAutoValue.txt +++ b/java-bigtable/google-cloud-bigtable/EnableAutoValue.txt @@ -1,2 +1,2 @@ This is a marker file to trigger auto-value injection into the annotation processor path -https://github.com/googleapis/java-shared-config/blob/51c9f68ff1736761b21c921f078ab2c8675ff268/pom.xml#L758 +https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/java-shared-config/java-shared-config/pom.xml#L580-L598 diff --git a/java-bigtable/test-proxy/EnableAutoValue.txt b/java-bigtable/test-proxy/EnableAutoValue.txt index e8237e1cbc6d..cc45ef00b4d5 100644 --- a/java-bigtable/test-proxy/EnableAutoValue.txt +++ b/java-bigtable/test-proxy/EnableAutoValue.txt @@ -1,2 +1,2 @@ This is a marker file to trigger auto-value injection into the annotation processor path -https://github.com/googleapis/java-shared-config/blob/51c9f68ff1736761b21c921f078ab2c8675ff268/pom.xml#L758 \ No newline at end of file +https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/java-shared-config/java-shared-config/pom.xml#L580-L598 \ No newline at end of file diff --git a/java-cloud-bom/README.md b/java-cloud-bom/README.md index fbbf895495e0..e6a8aabcfe01 100644 --- a/java-cloud-bom/README.md +++ b/java-cloud-bom/README.md @@ -289,7 +289,7 @@ This is the table of modules included in the latest libraries-bom release: The [google-cloud-bom dashboard](https://storage.googleapis.com/java-cloud-bom-dashboard/com.google.cloud/google-cloud-bom/all-versions/index.html) provides client library consumers with easy access to dependency information pertaining to each client library that goes into the google-cloud-bom. -The dashboard shows the content of **each version** of the BOM which includes all the versions of the artifacts in it and their underlying [google-cloud-shared-dependencies BOM](https://github.com/googleapis/sdk-platform-java/tree/main/java-shared-dependencies) version. +The dashboard shows the content of **each version** of the BOM which includes all the versions of the artifacts in it and their underlying [google-cloud-shared-dependencies BOM](https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java/java-shared-dependencies) version. The dashboard also has an [all versions](https://storage.googleapis.com/java-cloud-bom-dashboard/com.google.cloud/google-cloud-bom/all-versions/index.html) page where user can easily search on any artifact or version to see which version of the google-cloud-bom it exists in -- this could be helpful in providing client library consumer advice on which version(s) of google-cloud-bom to import to address their needs. diff --git a/java-cloud-bom/libraries-bom/pom.xml b/java-cloud-bom/libraries-bom/pom.xml index 6ef991592a06..4a0fc38c8abe 100644 --- a/java-cloud-bom/libraries-bom/pom.xml +++ b/java-cloud-bom/libraries-bom/pom.xml @@ -62,7 +62,7 @@ com.google.cloud diff --git a/java-common-protos/README.md b/java-common-protos/README.md index 117fda794722..9356cd32ef0e 100644 --- a/java-common-protos/README.md +++ b/java-common-protos/README.md @@ -180,9 +180,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ [troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting -[contributing]: https://github.com/googleapis/sdk-platform-java/blob/main/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/sdk-platform-java/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/sdk-platform-java/blob/main/LICENSE +[contributing]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/google-cloud-java/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java index f73b6b3c7d13..886aae245007 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java @@ -134,7 +134,7 @@ void createClients() throws Exception { // Adding `Code.INTERNAL` is necessary because for httpJson requests, the httpJson status code // is mapped here: - // https://github.com/googleapis/sdk-platform-java/blob/acdde47445916dd306ce8b91489fab45c9c2ef50/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java#L96-L133 + // https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java#L99-L136 // Therefore, just setting the error code to `Code.UNKNOWN` for httpJson will get translated // instead to `Code.INTERNAL`. Set retryableCodes = ImmutableSet.of(Code.UNKNOWN, Code.INTERNAL); diff --git a/sdk-platform-java/DEVELOPMENT.md b/sdk-platform-java/DEVELOPMENT.md index 7743f0948157..6ddadd310278 100644 --- a/sdk-platform-java/DEVELOPMENT.md +++ b/sdk-platform-java/DEVELOPMENT.md @@ -45,7 +45,7 @@ There are 4 layers of testing in this repo: 1. Traditional unit tests. These tests usually focus on testing one very specific test case at a time. For example, [MethodTest](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/model/MethodTest.java) 2. Golden unit tests. These tests start with a test proto, we create different test cases in the proto, load the proto in unit tests and save the generated file as golden files. For example, [routing header proto](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/proto/explicit_dynamic_routing_header_testing.proto) -> Load in the [unit test](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java#L56-L64) -> Saved as [golden](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden) 3. Showcase integration tests. They test the generated library's behavior against a mock server, see [README.md](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-showcase/README.md) of showcase module for details. -4. Golden integration tests. These tests generate a full client library with real protos from googleapis, for example, golden integration tests for [compute](https://github.com/googleapis/sdk-platform-java/tree/main/test/integration/goldens/compute). However, we _should_ stop adding new ones, and rely on golden unit tests and showcase tests. +4. Golden integration tests. These tests generate a full client library with real protos from googleapis, for example, golden integration tests for [compute](https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java/test/integration/goldens/compute). However, we _should_ stop adding new ones, and rely on golden unit tests and showcase tests. Based on where the code changes are, we should add different tests, in general diff --git a/sdk-platform-java/api-common-java/.repo-metadata.json b/sdk-platform-java/api-common-java/.repo-metadata.json index d9098a224469..54bcbe96843f 100644 --- a/sdk-platform-java/api-common-java/.repo-metadata.json +++ b/sdk-platform-java/api-common-java/.repo-metadata.json @@ -1,12 +1,12 @@ { "api_shortname": "api-common", "client_documentation": "https://cloud.google.com/java/docs/reference/api-common/latest/overview", - "product_documentation": "https://github.com/googleapis/sdk-platform-java/tree/main/api-common-java", + "product_documentation": "https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java/api-common-java", "api_description": "API Common for Java is a library for foundational types relating to Google APIs.", "name_pretty": "API Common for Java", "release_level": "stable", "language": "java", - "repo": "googleapis/sdk-platform-java", + "repo": "googleapis/google-cloud-java", "repo_short": "api-common-java", "library_type": "OTHER", "distribution_name": "com.google.api:api-common" diff --git a/sdk-platform-java/api-common-java/README.md b/sdk-platform-java/api-common-java/README.md index 50419b011991..fe37510ea85b 100644 --- a/sdk-platform-java/api-common-java/README.md +++ b/sdk-platform-java/api-common-java/README.md @@ -65,6 +65,6 @@ mvn fmt:format mvn test ``` -[CONTRIBUTING]:https://github.com/googleapis/api-common-java/blob/main/CONTRIBUTING.md -[LICENSE]: https://github.com/googleapis/api-common-java/blob/main/LICENSE +[CONTRIBUTING]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md +[LICENSE]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE diff --git a/sdk-platform-java/api-common-java/pom.xml b/sdk-platform-java/api-common-java/pom.xml index 35875a4de1bf..8e749f5c56dd 100644 --- a/sdk-platform-java/api-common-java/pom.xml +++ b/sdk-platform-java/api-common-java/pom.xml @@ -29,7 +29,7 @@ BSD-3-Clause - https://github.com/googleapis/api-common-java/blob/main/LICENSE + https://github.com/googleapis/google-cloud-java/blob/main/LICENSE diff --git a/sdk-platform-java/dependencies.txt b/sdk-platform-java/dependencies.txt index 40e8048aa0e0..2b84619b3fc8 100644 --- a/sdk-platform-java/dependencies.txt +++ b/sdk-platform-java/dependencies.txt @@ -7,7 +7,7 @@ # "3P" refers to Third-Party dependencies. # Pom-Parent Dependencies -# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml +# These dependencies are declared: https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2 io.grpc:grpc-bom,grpc=1.83.0 com.google.auth:google-auth-library-bom,google.auth=1.49.0 @@ -24,13 +24,13 @@ org.jspecify:jspecify,jspecify=1.0.0 org.conscrypt:conscrypt-openjdk-uber,conscrypt=2.6.1 # 1P Shared-Deps -# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml +# These dependencies are declared: https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-shared-dependencies/first-party-dependencies/pom.xml com.google.cloud:grpc-gcp,grpc-gcp=1.12.0 com.google.oauth-client:google-oauth-client,google.oauth-client=1.39.0 com.google.api-client:google-api-client,google.api-client=2.9.0 # 3P Shared-Deps -# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/third-party-dependencies/pom.xml +# These dependencies are declared: https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml org.threeten:threeten-extra,threeten-extra=1.10.0 io.opencensus:opencensus-api,opencensus=0.31.1 com.google.code.findbugs:jsr305,findbugs=3.0.2 diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index 800881bdf0a1..304f7e258e4f 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -8,7 +8,7 @@ 2.76.0-SNAPSHOT pom GAPIC Generator Java POM Parent - https://github.com/googleapis/sdk-platform-java + https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java The top-level parent for all modules in the repository. @@ -63,13 +63,13 @@ - scm:git:git@github.com:googleapis/sdk-platform-java.git - scm:git:git@github.com:googleapis/sdk-platform-java.git - https://github.com/googleapis/sdk-platform-java + scm:git:git@github.com:googleapis/google-cloud-java.git + scm:git:git@github.com:googleapis/google-cloud-java.git + https://github.com/googleapis/google-cloud-java HEAD - https://github.com/googleapis/sdk-platform-java/issues + https://github.com/googleapis/google-cloud-java/issues GitHub Issues diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 8dfde93e22a5..ec32a4649596 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -1330,7 +1330,7 @@ private static ClassDefinition createNestedRpcPagedResponseClass( Variable.builder().setName("input").setType(methodPageType).build()); // Overrides ApiFunction.apply. - // (https://github.com/googleapis/api-common-java/blob/debf25960dea0367b0d3b5e16d57d76c1d01947e/src/main/java/com/google/api/core/ApiFunction.java). + // (https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/sdk-platform-java/api-common-java/src/main/java/com/google/api/core/ApiFunction.java). Expr pageToTransformExpr = LambdaExpr.builder() .setArguments(inputVarExpr.toBuilder().setIsDecl(true).build()) diff --git a/sdk-platform-java/gax-java/.repo-metadata.json b/sdk-platform-java/gax-java/.repo-metadata.json index 0e04b69bb869..72097483ea19 100644 --- a/sdk-platform-java/gax-java/.repo-metadata.json +++ b/sdk-platform-java/gax-java/.repo-metadata.json @@ -1,12 +1,12 @@ { "api_shortname": "gax", "name_pretty": "gax", - "product_documentation": "https://github.com/googleapis/sdk-platform-java/blob/main/gax-java/README.md", + "product_documentation": "https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gax-java/README.md", "api_description": "Google API Extensions for Java (GAX Java) is a library which aids in the development of client libraries for server APIs, based on GRPC and Google API conventions.", "client_documentation": "https://cloud.google.com/java/docs/reference/gax/latest/overview", "language": "java", "release_level": "stable", - "repo": "googleapis/sdk-platform-java", + "repo": "googleapis/google-cloud-java", "repo_short": "gax-java", "library_type": "OTHER", "distribution_name": "com.google.api:gax" diff --git a/sdk-platform-java/gax-java/README.md b/sdk-platform-java/gax-java/README.md index a8ca7b4a1a7f..7e4396fd4ee6 100644 --- a/sdk-platform-java/gax-java/README.md +++ b/sdk-platform-java/gax-java/README.md @@ -181,6 +181,6 @@ License BSD - See [LICENSE] for more information. -[CONTRIBUTING]:https://github.com/googleapis/gax-java/blob/main/CONTRIBUTING.md -[LICENSE]: https://github.com/googleapis/gax-java/blob/main/LICENSE +[CONTRIBUTING]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md +[LICENSE]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE diff --git a/sdk-platform-java/gax-java/gax-bom/pom.xml b/sdk-platform-java/gax-java/gax-bom/pom.xml index bd62b96230dd..691df5d8f18a 100644 --- a/sdk-platform-java/gax-java/gax-bom/pom.xml +++ b/sdk-platform-java/gax-java/gax-bom/pom.xml @@ -20,21 +20,21 @@ GoogleAPIs GoogleAPIs googleapis@googlegroups.com - https://github.com/googleapis/gax-java + https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java/gax-java Google, LLC https://www.google.com - scm:git:https://github.com/googleapis/gax-java.git - https://github.com/googleapis/gax-java + scm:git:https://github.com/googleapis/google-cloud-java.git + https://github.com/googleapis/google-cloud-java BSD-3-Clause - https://github.com/googleapis/gax-java/blob/master/LICENSE + https://github.com/googleapis/google-cloud-java/blob/main/LICENSE diff --git a/sdk-platform-java/gax-java/pom.xml b/sdk-platform-java/gax-java/pom.xml index 38d26edd1c3b..1e86a4c632b6 100644 --- a/sdk-platform-java/gax-java/pom.xml +++ b/sdk-platform-java/gax-java/pom.xml @@ -28,7 +28,7 @@ BSD-3-Clause - https://github.com/googleapis/gax-java/blob/master/LICENSE + https://github.com/googleapis/google-cloud-java/blob/main/LICENSE diff --git a/sdk-platform-java/java-core/.repo-metadata.json b/sdk-platform-java/java-core/.repo-metadata.json index 125e818f5e94..3f112c43bddb 100644 --- a/sdk-platform-java/java-core/.repo-metadata.json +++ b/sdk-platform-java/java-core/.repo-metadata.json @@ -1,12 +1,12 @@ { "api_shortname": "google-cloud-core", - "product_documentation": "https://github.com/googleapis/sdk-platform-java/tree/main/java-core", + "product_documentation": "https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java/java-core", "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-core/latest/overview", "api_description": "A set of classes and utilities used in Google Cloud Java libraries.", "name_pretty": "Google Cloud Core", "release_level": "stable", "language": "java", - "repo": "googleapis/sdk-platform-java", + "repo": "googleapis/google-cloud-java", "repo_short": "java-core", "library_type": "CORE", "distribution_name": "com.google.cloud:google-cloud-core" diff --git a/sdk-platform-java/java-core/README.md b/sdk-platform-java/java-core/README.md index a11a4dccdfcb..bce0f56eaf23 100644 --- a/sdk-platform-java/java-core/README.md +++ b/sdk-platform-java/java-core/README.md @@ -33,9 +33,9 @@ considered stable. Apache 2.0 - See [LICENSE][license] for more information. -[contributing]: https://github.com/googleapis/java-core/blob/main/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-core/blob/main/CODE_OF_CONDUCT.md -[license]: https://github.com/googleapis/java-core/blob/main/LICENSE +[contributing]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/google-cloud-java/blob/main/CODE_OF_CONDUCT.md +[license]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE [semver]: http://semver.org/ [cloud-platform]: https://cloud.google.com/ [api-docs]: https://googleapis.dev/java/google-cloud-core/latest diff --git a/sdk-platform-java/java-core/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/sdk-platform-java/java-core/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java index 89f96f4e38d8..4ce8cdf275f3 100644 --- a/sdk-platform-java/java-core/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java +++ b/sdk-platform-java/java-core/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java @@ -861,7 +861,7 @@ public boolean getUseJwtAccessWithScope() { * similar to the DEFAULT_HOST value in java-core. * * @see DEFAULT_HOST + * href="https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/sdk-platform-java/java-core/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java#L86">DEFAULT_HOST */ @InternalApi public String getResolvedHost(String serviceName) { diff --git a/sdk-platform-java/java-shared-dependencies/README.md b/sdk-platform-java/java-shared-dependencies/README.md index 90aeab064c12..42a9ec9a5f7f 100644 --- a/sdk-platform-java/java-shared-dependencies/README.md +++ b/sdk-platform-java/java-shared-dependencies/README.md @@ -43,6 +43,6 @@ Apache 2.0 - See [LICENSE][license] for more information. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-shared-dependencies.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shared-dependencies&core=gav -[contributing]: https://github.com/googleapis/java-shared-dependencies/blob/main/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-shared-dependencies/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-shared-dependencies/blob/main/LICENSE +[contributing]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/google-cloud-java/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE diff --git a/sdk-platform-java/java-showcase-3.21.0/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java b/sdk-platform-java/java-showcase-3.21.0/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java index f73b6b3c7d13..886aae245007 100644 --- a/sdk-platform-java/java-showcase-3.21.0/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java +++ b/sdk-platform-java/java-showcase-3.21.0/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java @@ -134,7 +134,7 @@ void createClients() throws Exception { // Adding `Code.INTERNAL` is necessary because for httpJson requests, the httpJson status code // is mapped here: - // https://github.com/googleapis/sdk-platform-java/blob/acdde47445916dd306ce8b91489fab45c9c2ef50/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java#L96-L133 + // https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java#L99-L136 // Therefore, just setting the error code to `Code.UNKNOWN` for httpJson will get translated // instead to `Code.INTERNAL`. Set retryableCodes = ImmutableSet.of(Code.UNKNOWN, Code.INTERNAL); diff --git a/sdk-platform-java/java-showcase-3.25.8/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java b/sdk-platform-java/java-showcase-3.25.8/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java index f73b6b3c7d13..886aae245007 100644 --- a/sdk-platform-java/java-showcase-3.25.8/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java +++ b/sdk-platform-java/java-showcase-3.25.8/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITAutoPopulatedFields.java @@ -134,7 +134,7 @@ void createClients() throws Exception { // Adding `Code.INTERNAL` is necessary because for httpJson requests, the httpJson status code // is mapped here: - // https://github.com/googleapis/sdk-platform-java/blob/acdde47445916dd306ce8b91489fab45c9c2ef50/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java#L96-L133 + // https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java#L99-L136 // Therefore, just setting the error code to `Code.UNKNOWN` for httpJson will get translated // instead to `Code.INTERNAL`. Set retryableCodes = ImmutableSet.of(Code.UNKNOWN, Code.INTERNAL); From d99375f60801bbcc09fc054480c2583c15cc932c Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 10 Aug 2026 22:27:35 +0000 Subject: [PATCH 2/4] chore: address review feedback on showcase links and stale comment --- .../com/google/auth/oauth2/GdchCredentialsTestUtil.java | 4 ---- sdk-platform-java/DEVELOPMENT.md | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java index 56785666641b..51880ddcc011 100644 --- a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java +++ b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java @@ -5,10 +5,6 @@ import java.net.URI; import java.util.Map; -/** - * This class marked public as it is used in showcase tests in sdk-platform-java to test GDCH: - * https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java#L217-L225 - */ public class GdchCredentialsTestUtil { public static void registerGdchCredentialWithMockTransport( GdchCredentials credentials, diff --git a/sdk-platform-java/DEVELOPMENT.md b/sdk-platform-java/DEVELOPMENT.md index 6ddadd310278..4ee93003b4f6 100644 --- a/sdk-platform-java/DEVELOPMENT.md +++ b/sdk-platform-java/DEVELOPMENT.md @@ -44,7 +44,7 @@ for gapic-generator-java's Bazel build. There are 4 layers of testing in this repo: 1. Traditional unit tests. These tests usually focus on testing one very specific test case at a time. For example, [MethodTest](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/model/MethodTest.java) 2. Golden unit tests. These tests start with a test proto, we create different test cases in the proto, load the proto in unit tests and save the generated file as golden files. For example, [routing header proto](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/proto/explicit_dynamic_routing_header_testing.proto) -> Load in the [unit test](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java#L56-L64) -> Saved as [golden](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden) -3. Showcase integration tests. They test the generated library's behavior against a mock server, see [README.md](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-showcase/README.md) of showcase module for details. +3. Showcase integration tests. They test the generated library's behavior against a mock server, see [README.md](https://github.com/googleapis/google-cloud-java/blob/main/java-showcase/README.md) of showcase module for details. 4. Golden integration tests. These tests generate a full client library with real protos from googleapis, for example, golden integration tests for [compute](https://github.com/googleapis/google-cloud-java/tree/main/sdk-platform-java/test/integration/goldens/compute). However, we _should_ stop adding new ones, and rely on golden unit tests and showcase tests. Based on where the code changes are, we should add different tests, in general @@ -60,7 +60,7 @@ Based on where the code changes are, we should add different tests, in general See the [Unit Tests](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/DEVELOPMENT.md#unit-tests) section in gapic-generator-java/DEVELOPMENT.md for how to run traditional and golden unit tests. -See [Running the Integration Tests](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-showcase/README.md#running-the-integration-tests) and [Update the Golden Showcase Files](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-showcase/README.md#update-the-golden-showcase-files) sections in java-showcase/README.md for how to run and update showcase integration tests. +See [Running the Integration Tests](https://github.com/googleapis/google-cloud-java/blob/main/java-showcase/README.md#running-the-integration-tests) and [Update the Golden Showcase Files](https://github.com/googleapis/google-cloud-java/blob/main/java-showcase/README.md#update-the-golden-showcase-files) sections in java-showcase/README.md for how to run and update showcase integration tests. See the [Integration Tests](https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/gapic-generator-java/DEVELOPMENT.md#integration-tests) section in gapic-generator-java/DEVELOPMENT.md for how to run golden integration tests. \ No newline at end of file From 419f8859157babf14a8f153592a6af484cc98157 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 10 Aug 2026 22:31:52 +0000 Subject: [PATCH 3/4] chore: restore GdchCredentialsTestUtil javadoc with updated showcase link --- .../com/google/auth/oauth2/GdchCredentialsTestUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java index 51880ddcc011..216d06c3b868 100644 --- a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java +++ b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java @@ -5,6 +5,10 @@ import java.net.URI; import java.util.Map; +/** + * This class marked public as it is used in showcase tests to test GDCH: + * https://github.com/googleapis/google-cloud-java/blob/e50b96b70826f173e6d23278fea96c2af9b6e817/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java#L217-L225 + */ public class GdchCredentialsTestUtil { public static void registerGdchCredentialWithMockTransport( GdchCredentials credentials, From ff0c3736031553d63ed9204c70faaf89b9a2bd59 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 10 Aug 2026 22:33:02 +0000 Subject: [PATCH 4/4] chore: add missing license header to GdchCredentialsTestUtil --- .../auth/oauth2/GdchCredentialsTestUtil.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java index 216d06c3b868..b61ec6c9a970 100644 --- a/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java +++ b/google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/GdchCredentialsTestUtil.java @@ -1,3 +1,34 @@ +/* + * Copyright 2023, Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + package com.google.auth.oauth2; import com.google.api.client.testing.http.FixedClock;