Skip to content

Commit 01c14d4

Browse files
alicejlirenovate-botblakeli0
authored
fix: update sample region tag to parse host instead of proto package (#1040)
* fix: update sample region tag to parse host instead of proto package * update goldens * update to lowerCamelCase * use explicit imports * remove setting default host where it's not needed for samples and refactor parseDefaultHost * fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 (#1039) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.2` -> `3.0.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/compatibility-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/confidence-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>googleapis/java-shared-dependencies</summary> ### [`v3.0.3`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#&#8203;303-httpsgithubcomgoogleapisjava-shared-dependenciescomparev302v303-2022-09-14) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.2...v3.0.3) ##### Dependencies - Google-cloud-core 2.8.12 ([#&#8203;799](https://togithub.com/googleapis/java-shared-dependencies/issues/799)) ([1b3db8d](https://togithub.com/googleapis/java-shared-dependencies/commit/1b3db8d1e17c49ebae79fc96164fa9058e1df6e3)) - Moving gson to first-party-dependencies ([#&#8203;800](https://togithub.com/googleapis/java-shared-dependencies/issues/800)) ([a41fcc1](https://togithub.com/googleapis/java-shared-dependencies/commit/a41fcc11d32e02e5af2837561792e3919f6d4b3f)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.6 ([#&#8203;797](https://togithub.com/googleapis/java-shared-dependencies/issues/797)) ([bc5fdc9](https://togithub.com/googleapis/java-shared-dependencies/commit/bc5fdc9b3af7973c28f063a9ac156fe2af562814)) - Update gax.version to v2.19.1 ([#&#8203;798](https://togithub.com/googleapis/java-shared-dependencies/issues/798)) ([84e5487](https://togithub.com/googleapis/java-shared-dependencies/commit/84e5487b2e3dce4bb60badecebde788c3cb702b8)) - Update google.core.version to v2.8.11 ([#&#8203;793](https://togithub.com/googleapis/java-shared-dependencies/issues/793)) ([63c1297](https://togithub.com/googleapis/java-shared-dependencies/commit/63c129722aa0b821031ff5b4c11004adf7b12044)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xOTUuNSIsInVwZGF0ZWRJblZlciI6IjMyLjE5NS41In0=--> * chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 (#1038) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-shade-plugin)) | `3.3.0` -> `3.4.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/confidence-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xOTQuNSIsInVwZGF0ZWRJblZlciI6IjMyLjE5OC4xIn0=--> * update iam oneoff * linter * fix(deps): update dependency org.yaml:snakeyaml to v1.33 (#1043) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml/src) | `1.32` -> `1.33` | [![age](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/compatibility-slim/1.32)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/confidence-slim/1.32)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4yMDIuNCIsInVwZGF0ZWRJblZlciI6IjMyLjIwMi40In0=--> * refactor prepareExecutableSamples * fix imports * update name of unit test * update comment * fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 (#1050) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.3` -> `3.0.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/compatibility-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/confidence-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>googleapis/java-shared-dependencies</summary> ### [`v3.0.4`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#&#8203;304-httpsgithubcomgoogleapisjava-shared-dependenciescomparev303v304-2022-10-03) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.3...v3.0.4) ##### Dependencies - Update dependency cachetools to v5 ([#&#8203;816](https://togithub.com/googleapis/java-shared-dependencies/issues/816)) ([3f6c408](https://togithub.com/googleapis/java-shared-dependencies/commit/3f6c408210c931c286235f61c7aadea5bf5cfe4d)) - Update dependency certifi to v2022.9.24 ([#&#8203;818](https://togithub.com/googleapis/java-shared-dependencies/issues/818)) ([5f04b97](https://togithub.com/googleapis/java-shared-dependencies/commit/5f04b97c2343146600e8c9ee65afdeb58f5743a6)) - Update dependency charset-normalizer to v2.1.1 ([#&#8203;822](https://togithub.com/googleapis/java-shared-dependencies/issues/822)) ([6997c5a](https://togithub.com/googleapis/java-shared-dependencies/commit/6997c5acad937ebe3594330de73261a424d42cf3)) - Update dependency click to v8.1.3 ([#&#8203;823](https://togithub.com/googleapis/java-shared-dependencies/issues/823)) ([42bf9f8](https://togithub.com/googleapis/java-shared-dependencies/commit/42bf9f834fdafea60f2be7ccbf7d363e058cd7c2)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.7 ([#&#8203;837](https://togithub.com/googleapis/java-shared-dependencies/issues/837)) ([d31e507](https://togithub.com/googleapis/java-shared-dependencies/commit/d31e5077c7e036de5e238e9a611df7ced527574a)) - Update dependency gcp-releasetool to v1.8.8 ([#&#8203;819](https://togithub.com/googleapis/java-shared-dependencies/issues/819)) ([8245d97](https://togithub.com/googleapis/java-shared-dependencies/commit/8245d975fb12e81454ec7664f9a7c9809bbac697)) - Update dependency gcp-releasetool to v1.8.9 ([#&#8203;846](https://togithub.com/googleapis/java-shared-dependencies/issues/846)) ([04e3283](https://togithub.com/googleapis/java-shared-dependencies/commit/04e32831c6e87c372444901013a747d2d02ce38d)) - Update dependency google-api-core to v2.10.1 ([#&#8203;824](https://togithub.com/googleapis/java-shared-dependencies/issues/824)) ([818b9aa](https://togithub.com/googleapis/java-shared-dependencies/commit/818b9aa2ac99d8b1f9b39a74b626122aed5f1d94)) - Update dependency google-auth to v2.12.0 ([#&#8203;825](https://togithub.com/googleapis/java-shared-dependencies/issues/825)) ([07c544b](https://togithub.com/googleapis/java-shared-dependencies/commit/07c544b5e0fa9f7110bbc957570f7a405962072e)) - Update dependency google-cloud-core to v2.3.2 ([#&#8203;820](https://togithub.com/googleapis/java-shared-dependencies/issues/820)) ([2a219e8](https://togithub.com/googleapis/java-shared-dependencies/commit/2a219e86f187ba5ad72f2570bd58ca6100128c43)) - Update dependency google-cloud-storage to v2.5.0 ([#&#8203;826](https://togithub.com/googleapis/java-shared-dependencies/issues/826)) ([bb10d18](https://togithub.com/googleapis/java-shared-dependencies/commit/bb10d1858a515f09d365362ffa0110a5b362c96b)) - Update dependency google-crc32c to v1.5.0 ([#&#8203;827](https://togithub.com/googleapis/java-shared-dependencies/issues/827)) ([7e5dae6](https://togithub.com/googleapis/java-shared-dependencies/commit/7e5dae60d667cb84b9ee4f6c977bdc35e79e4cf6)) - Update dependency google-resumable-media to v2.4.0 ([#&#8203;838](https://togithub.com/googleapis/java-shared-dependencies/issues/838)) ([ad82d63](https://togithub.com/googleapis/java-shared-dependencies/commit/ad82d6378f64039da383509638fb4782908eb4bc)) - Update dependency googleapis-common-protos to v1.56.4 ([#&#8203;821](https://togithub.com/googleapis/java-shared-dependencies/issues/821)) ([93d7745](https://togithub.com/googleapis/java-shared-dependencies/commit/93d77458c9bbf84ec367cdb4caaa41e6f71675c6)) - Update dependency importlib-metadata to v4.12.0 ([#&#8203;832](https://togithub.com/googleapis/java-shared-dependencies/issues/832)) ([ee19fb1](https://togithub.com/googleapis/java-shared-dependencies/commit/ee19fb1ca5a2a2e1985297e3b72d44de68bc72e3)) - Update dependency importlib-metadata to v4.13.0 ([#&#8203;843](https://togithub.com/googleapis/java-shared-dependencies/issues/843)) ([d2ede60](https://togithub.com/googleapis/java-shared-dependencies/commit/d2ede601eee8c875780c7eb5924623537480c509)) - Update dependency importlib-metadata to v5 ([#&#8203;845](https://togithub.com/googleapis/java-shared-dependencies/issues/845)) ([03ac7e8](https://togithub.com/googleapis/java-shared-dependencies/commit/03ac7e800274c5f58d2bc4ddd0561bfcdea1bb27)) - Update dependency io.grpc:grpc-bom to v1.49.1 ([#&#8203;802](https://togithub.com/googleapis/java-shared-dependencies/issues/802)) ([b8c54bf](https://togithub.com/googleapis/java-shared-dependencies/commit/b8c54bf8f1ddecc788cee151f8afe42de45bdc9d)) - Update dependency io.grpc:grpc-bom to v1.49.2 ([#&#8203;842](https://togithub.com/googleapis/java-shared-dependencies/issues/842)) ([1b1cfa2](https://togithub.com/googleapis/java-shared-dependencies/commit/1b1cfa27d05f7732da12721305cf41dcbebda232)) - Update dependency jeepney to v0.8.0 ([#&#8203;833](https://togithub.com/googleapis/java-shared-dependencies/issues/833)) ([15d2f9f](https://togithub.com/googleapis/java-shared-dependencies/commit/15d2f9f52b5a3259db0813df3d2424e256ccb372)) - Update dependency jinja2 to v3.1.2 ([#&#8203;834](https://togithub.com/googleapis/java-shared-dependencies/issues/834)) ([c188f95](https://togithub.com/googleapis/java-shared-dependencies/commit/c188f95acdb3349f1c4b3ed56e5fffb75e8fbc8d)) - Update dependency keyring to v23.9.3 ([#&#8203;828](https://togithub.com/googleapis/java-shared-dependencies/issues/828)) ([b185aaa](https://togithub.com/googleapis/java-shared-dependencies/commit/b185aaae716d4d97cb64f0426cac0e778f11223d)) - Update dependency markupsafe to v2.1.1 ([#&#8203;829](https://togithub.com/googleapis/java-shared-dependencies/issues/829)) ([add2825](https://togithub.com/googleapis/java-shared-dependencies/commit/add2825bd34cd80f529dbe0dadb3c84219177916)) - Update dependency org.threeten:threetenbp to v1.6.2 ([#&#8203;808](https://togithub.com/googleapis/java-shared-dependencies/issues/808)) ([2d2eabd](https://togithub.com/googleapis/java-shared-dependencies/commit/2d2eabd14d8150207885ea47280c0f7ff3d2962f)) - Update dependency protobuf to v3.20.2 ([#&#8203;830](https://togithub.com/googleapis/java-shared-dependencies/issues/830)) ([5afa76f](https://togithub.com/googleapis/java-shared-dependencies/commit/5afa76f9ef4705aecba49abc7bb93982fb1ecf3e)) - Update dependency protobuf to v3.20.3 ([#&#8203;839](https://togithub.com/googleapis/java-shared-dependencies/issues/839)) ([d9fc7dd](https://togithub.com/googleapis/java-shared-dependencies/commit/d9fc7ddd3e663458e6ea3f78a3c6241377df0319)) - Update dependency protobuf to v4 ([#&#8203;817](https://togithub.com/googleapis/java-shared-dependencies/issues/817)) ([ee8d154](https://togithub.com/googleapis/java-shared-dependencies/commit/ee8d154287ccd256b4dcfa48f28f5ec61a91fe3e)) - Update dependency pyjwt to v2.5.0 ([#&#8203;812](https://togithub.com/googleapis/java-shared-dependencies/issues/812)) ([4d4528e](https://togithub.com/googleapis/java-shared-dependencies/commit/4d4528e8ce269d49b99d2dbc4fcda2dc37a058cb)) - Update dependency requests to v2.28.1 ([#&#8203;813](https://togithub.com/googleapis/java-shared-dependencies/issues/813)) ([a3a8d89](https://togithub.com/googleapis/java-shared-dependencies/commit/a3a8d89b0117007a7108553c70aa82dd289e1691)) - Update dependency typing-extensions to v4.3.0 ([#&#8203;814](https://togithub.com/googleapis/java-shared-dependencies/issues/814)) ([da875e5](https://togithub.com/googleapis/java-shared-dependencies/commit/da875e5e91fa9d8c177e6c3afc9e34242eb914b7)) - Update dependency zipp to v3.8.1 ([#&#8203;815](https://togithub.com/googleapis/java-shared-dependencies/issues/815)) ([15585fd](https://togithub.com/googleapis/java-shared-dependencies/commit/15585fd0216013fe93be011f93f391f6269aa777)) - Update gax.version to v2.19.2 ([#&#8203;847](https://togithub.com/googleapis/java-shared-dependencies/issues/847)) ([c4afe1f](https://togithub.com/googleapis/java-shared-dependencies/commit/c4afe1fdc88af29ab039cea618d52c15c90e43e9)) - Update google.common-protos.version to v2.9.3 ([#&#8203;803](https://togithub.com/googleapis/java-shared-dependencies/issues/803)) ([a3e8e5e](https://togithub.com/googleapis/java-shared-dependencies/commit/a3e8e5eb53a8da14abf3b8d81a4f34fbb2f3b8f9)) - Update google.common-protos.version to v2.9.5 ([#&#8203;831](https://togithub.com/googleapis/java-shared-dependencies/issues/831)) ([1c901db](https://togithub.com/googleapis/java-shared-dependencies/commit/1c901db8a7740afaec3e809e51d4d369fbf469c4)) - Update google.common-protos.version to v2.9.6 ([#&#8203;844](https://togithub.com/googleapis/java-shared-dependencies/issues/844)) ([9e156be](https://togithub.com/googleapis/java-shared-dependencies/commit/9e156be59bd89959f04252c3045b8cd7a8be8070)) - Update google.core.version to v2.8.13 ([#&#8203;804](https://togithub.com/googleapis/java-shared-dependencies/issues/804)) ([45ae571](https://togithub.com/googleapis/java-shared-dependencies/commit/45ae57142bd6d5334eedd46243736b200a459795)) - Update google.core.version to v2.8.14 ([#&#8203;805](https://togithub.com/googleapis/java-shared-dependencies/issues/805)) ([02c9397](https://togithub.com/googleapis/java-shared-dependencies/commit/02c9397a84bf3fcca8d04e4c9867cc47689abde2)) - Update google.core.version to v2.8.15 ([#&#8203;807](https://togithub.com/googleapis/java-shared-dependencies/issues/807)) ([980856c](https://togithub.com/googleapis/java-shared-dependencies/commit/980856c43981992a3d08f69eac83aeada752d244)) - Update google.core.version to v2.8.16 ([#&#8203;810](https://togithub.com/googleapis/java-shared-dependencies/issues/810)) ([c2b2c9a](https://togithub.com/googleapis/java-shared-dependencies/commit/c2b2c9a327fd588f69524bb93a17e5d4ae8f5a42)) - Update google.core.version to v2.8.17 ([#&#8203;835](https://togithub.com/googleapis/java-shared-dependencies/issues/835)) ([3def21d](https://togithub.com/googleapis/java-shared-dependencies/commit/3def21df2e4253e3df0da064b6c4e472df079d2b)) - Update google.core.version to v2.8.18 ([#&#8203;840](https://togithub.com/googleapis/java-shared-dependencies/issues/840)) ([46566dc](https://togithub.com/googleapis/java-shared-dependencies/commit/46566dc18c4b1ed41c482b4ce21b92651e2f9dc5)) - Update google.core.version to v2.8.19 ([#&#8203;841](https://togithub.com/googleapis/java-shared-dependencies/issues/841)) ([99afde9](https://togithub.com/googleapis/java-shared-dependencies/commit/99afde97ea498f549eb75cc58c4ed88edf81b20d)) - Update google.core.version to v2.8.20 ([#&#8203;848](https://togithub.com/googleapis/java-shared-dependencies/issues/848)) ([c980c4f](https://togithub.com/googleapis/java-shared-dependencies/commit/c980c4fdfc8890d812b4881ba5b87bfd21269a5f)) - Update iam.version to v1.6.1 ([#&#8203;806](https://togithub.com/googleapis/java-shared-dependencies/issues/806)) ([a50158d](https://togithub.com/googleapis/java-shared-dependencies/commit/a50158d3b83cf8e02d8ee08c94e512b5669a927b)) - Update iam.version to v1.6.2 ([#&#8203;849](https://togithub.com/googleapis/java-shared-dependencies/issues/849)) ([e43ac96](https://togithub.com/googleapis/java-shared-dependencies/commit/e43ac96bc189a096a9311c9b03e85c86bea07e99)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4yMTMuMCIsInVwZGF0ZWRJblZlciI6IjMyLjIxMy4wIn0=--> * fix: Get numeric value for Enum fields if it is configured as query param or path param (#1042) Get numeric value for Enum fields if it is configured as query param or path param. Refactor HttpBinding to include Field info and use builder. * refactor unit tests * refactor composers * chore(deps): update dependency com.google.auto.value:auto-value to v1.10 (#1058) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.value:auto-value](https://togithub.com/google/auto/tree/master/value) ([source](https://togithub.com/google/auto)) | `1.9` -> `1.10` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/compatibility-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/confidence-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4yMTkuMSIsInVwZGF0ZWRJblZlciI6IjMyLjIxOS4xIn0=--> * update comment * fix lint Co-authored-by: WhiteSource Renovate <[email protected]> Co-authored-by: Blake Li <[email protected]>
1 parent d222af1 commit 01c14d4

File tree

233 files changed

+650
-510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+650
-510
lines changed

src/main/java/com/google/api/generator/gapic/composer/Composer.java

+42-18
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.google.api.generator.gapic.composer;
1616

1717
import com.google.api.generator.engine.ast.ClassDefinition;
18+
import com.google.api.generator.engine.ast.CommentStatement;
1819
import com.google.api.generator.gapic.composer.comment.CommentComposer;
1920
import com.google.api.generator.gapic.composer.grpc.GrpcServiceCallableFactoryClassComposer;
2021
import com.google.api.generator.gapic.composer.grpc.GrpcServiceStubClassComposer;
@@ -36,6 +37,8 @@
3637
import com.google.api.generator.gapic.model.Service;
3738
import com.google.api.generator.gapic.model.Transport;
3839
import com.google.common.annotations.VisibleForTesting;
40+
import com.google.common.base.Splitter;
41+
import com.google.common.collect.Iterables;
3942
import java.util.ArrayList;
4043
import java.util.Arrays;
4144
import java.util.List;
@@ -191,36 +194,57 @@ public static List<GapicClass> generateTestClasses(GapicContext context) {
191194

192195
@VisibleForTesting
193196
static List<GapicClass> prepareExecutableSamples(List<GapicClass> clazzes, String protoPackage) {
194-
// parse protoPackage for apiVersion and apiShortName
197+
// parse protoPackage for apiVersion
195198
String[] pakkage = protoPackage.split("\\.");
196199
String apiVersion;
197-
String apiShortName;
198200
// e.g. v1, v2, v1beta1
199201
if (pakkage[pakkage.length - 1].matches("v[0-9].*")) {
200202
apiVersion = pakkage[pakkage.length - 1];
201-
apiShortName = pakkage[pakkage.length - 2];
202203
} else {
203204
apiVersion = "";
204-
apiShortName = pakkage[pakkage.length - 1];
205205
}
206-
// Include license header, apiShortName, and apiVersion
207-
return clazzes.stream()
208-
.map(
209-
gapicClass -> {
210-
List<Sample> samples =
211-
gapicClass.samples().stream()
212-
.map(
213-
sample -> addRegionTagAndHeaderToSample(sample, apiShortName, apiVersion))
214-
.collect(Collectors.toList());
215-
return gapicClass.withSamples(samples);
216-
})
217-
.collect(Collectors.toList());
206+
// Include license header, apiShortName, and apiVersion
207+
List<GapicClass> clazzesWithSamples = new ArrayList<>();
208+
clazzes.forEach(
209+
gapicClass -> {
210+
List<Sample> samples = new ArrayList<>();
211+
gapicClass
212+
.samples()
213+
.forEach(
214+
sample ->
215+
samples.add(
216+
addRegionTagAndHeaderToSample(
217+
sample, parseDefaultHost(gapicClass.defaultHost()), apiVersion)));
218+
clazzesWithSamples.add(gapicClass.withSamples(samples));
219+
});
220+
return clazzesWithSamples;
218221
}
219222

220-
private static Sample addRegionTagAndHeaderToSample(
223+
// Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default
224+
// endpoints like
225+
// "us-east1-pubsub.googleapis.com".
226+
@VisibleForTesting
227+
protected static String parseDefaultHost(String defaultHost) {
228+
// If the defaultHost is of the format "**.googleapis.com", take the name before the first
229+
// period.
230+
String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost);
231+
// If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the
232+
// first period and after the last dash to follow CSharp's implementation here:
233+
// https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70
234+
apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost);
235+
// `iam-meta-api` service is an exceptional case and is handled as a one-off
236+
if (defaultHost.contains("iam-meta-api")) {
237+
apiShortName = "iam";
238+
}
239+
return apiShortName;
240+
}
241+
242+
@VisibleForTesting
243+
protected static Sample addRegionTagAndHeaderToSample(
221244
Sample sample, String apiShortName, String apiVersion) {
245+
final List<CommentStatement> header = Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT);
222246
return sample
223-
.withHeader(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT))
247+
.withHeader(header)
224248
.withRegionTag(
225249
sample.regionTag().withApiVersion(apiVersion).withApiShortName(apiShortName));
226250
}

src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ public GapicClass generate(GapicContext context, Service service) {
163163
.build();
164164

165165
updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames);
166-
return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples));
166+
return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples))
167+
.withDefaultHost(service.defaultHost());
167168
}
168169

169170
private static List<AnnotationNode> createClassAnnotations(Service service, TypeStore typeStore) {

src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ public GapicClass generate(GapicContext context, Service service) {
126126
.setMethods(createClassMethods(service, typeStore))
127127
.setNestedClasses(Arrays.asList(createNestedBuilderClass(service, typeStore)))
128128
.build();
129-
return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples));
129+
return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples))
130+
.withDefaultHost(service.defaultHost());
130131
}
131132

132133
private static List<CommentStatement> createClassHeaderComments(

src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ public GapicClass generate(GapicContext context, Service service) {
201201
Arrays.asList(createNestedBuilderClass(service, serviceConfig, typeStore)))
202202
.build();
203203
return GapicClass.create(
204-
GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples));
204+
GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples))
205+
.withDefaultHost(service.defaultHost());
205206
}
206207

207208
protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() {

src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java

+1
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ public static Optional<Sample> composeSettingsSample(
145145
.map(e -> ExprStatement.withExpr(e))
146146
.collect(Collectors.toList());
147147

148+
// TODO: alicejli edit RegionTag to match other languages
148149
RegionTag regionTag =
149150
RegionTag.builder()
150151
.setServiceName(classType.reference().name())

src/main/java/com/google/api/generator/gapic/model/GapicClass.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ public enum Kind {
3535

3636
public abstract List<Sample> samples();
3737

38+
// Represents the host URL for the service. May or may not contain a regional endpoint. Only used
39+
// for generating the region tag for samples; therefore only used in select Composers.
40+
public abstract String defaultHost();
41+
3842
public static GapicClass create(Kind kind, ClassDefinition classDefinition) {
3943
return builder().setKind(kind).setClassDefinition(classDefinition).build();
4044
}
@@ -45,7 +49,9 @@ public static GapicClass create(
4549
}
4650

4751
static Builder builder() {
48-
return new AutoValue_GapicClass.Builder().setSamples(Collections.emptyList());
52+
return new AutoValue_GapicClass.Builder()
53+
.setSamples(Collections.emptyList())
54+
.setDefaultHost("");
4955
}
5056

5157
abstract Builder toBuilder();
@@ -54,6 +60,10 @@ public final GapicClass withSamples(List<Sample> samples) {
5460
return toBuilder().setSamples(samples).build();
5561
}
5662

63+
public final GapicClass withDefaultHost(String defaultHost) {
64+
return toBuilder().setDefaultHost(defaultHost).build();
65+
}
66+
5767
@AutoValue.Builder
5868
abstract static class Builder {
5969
abstract Builder setKind(Kind kind);
@@ -62,6 +72,8 @@ abstract static class Builder {
6272

6373
abstract Builder setSamples(List<Sample> samples);
6474

75+
abstract Builder setDefaultHost(String defaultHost);
76+
6577
abstract GapicClass build();
6678
}
6779
}

src/main/java/com/google/api/generator/gapic/model/RegionTag.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.auto.value.AutoValue;
2121
import com.google.common.base.Preconditions;
2222

23+
// TODO: alicejli edit RegionTag to match other languages
2324
/**
2425
* This model represents a code sample region tag. Matching region start and end region tag comments
2526
* are used to determine the boundaries of code snippets to be used in documentation.

src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java

+81-31
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.google.api.generator.gapic.composer;
1616

1717
import static org.junit.Assert.assertEquals;
18+
import static org.junit.Assert.assertFalse;
1819

1920
import com.google.api.generator.engine.ast.ClassDefinition;
2021
import com.google.api.generator.engine.ast.ScopeNode;
@@ -25,11 +26,11 @@
2526
import com.google.api.generator.gapic.model.GapicClass;
2627
import com.google.api.generator.gapic.model.GapicClass.Kind;
2728
import com.google.api.generator.gapic.model.GapicContext;
29+
import com.google.api.generator.gapic.model.RegionTag;
2830
import com.google.api.generator.gapic.model.Sample;
2931
import com.google.api.generator.gapic.model.Service;
3032
import com.google.api.generator.test.framework.Assert;
3133
import com.google.api.generator.test.framework.Utils;
32-
import com.google.common.collect.ImmutableList;
3334
import java.nio.file.Path;
3435
import java.nio.file.Paths;
3536
import java.util.Arrays;
@@ -42,8 +43,13 @@ public class ComposerTest {
4243
private final List<GapicClass> clazzes =
4344
Arrays.asList(
4445
GrpcServiceCallableFactoryClassComposer.instance().generate(context, echoProtoService));
45-
private final String protoPackage = context.gapicMetadata().getProtoPackage();
46-
private final List<Sample> samples = clazzes.get(0).samples();
46+
private final Sample sample =
47+
Sample.builder()
48+
.setRegionTag(
49+
RegionTag.builder().setServiceName("serviceName").setRpcName("rpcName").build())
50+
.build();
51+
private List<Sample> ListofSamples = Arrays.asList(new Sample[] {sample});
52+
private final String protoPackage = echoProtoService.protoPakkage();
4753

4854
@Test
4955
public void gapicClass_addApacheLicense() {
@@ -65,58 +71,102 @@ public void gapicClass_addApacheLicense() {
6571

6672
@Test
6773
public void composeSamples_showcase() {
68-
for (Sample sample : samples) {
69-
assertEquals(
70-
"File header will be empty before composing samples",
71-
sample.fileHeader(),
72-
ImmutableList.of());
73-
assertEquals(
74-
"ApiShortName will be empty before composing samples",
75-
sample.regionTag().apiShortName(),
76-
"");
77-
assertEquals(
78-
"ApiVersion will be empty before composing samples", sample.regionTag().apiVersion(), "");
79-
}
74+
GapicClass testClass = clazzes.get(0).withSamples(ListofSamples);
75+
List<GapicClass> testClassList = Arrays.asList(new GapicClass[] {testClass});
8076

8177
List<Sample> composedSamples =
82-
Composer.prepareExecutableSamples(clazzes, protoPackage).get(0).samples();
78+
Composer.prepareExecutableSamples(testClassList, protoPackage).get(0).samples();
8379

80+
assertFalse(composedSamples.isEmpty());
8481
for (Sample sample : composedSamples) {
8582
assertEquals(
86-
"File header should be apache",
87-
sample.fileHeader(),
88-
Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT));
89-
assertEquals(
90-
"ApiShortName should be showcase", sample.regionTag().apiShortName(), "showcase");
91-
assertEquals("ApiVersion should be v1beta1", sample.regionTag().apiVersion(), "v1beta1");
83+
"File header should be APACHE",
84+
Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT),
85+
sample.fileHeader());
86+
assertEquals("ApiShortName should be empty", "", sample.regionTag().apiShortName());
87+
assertEquals("ApiVersion should be V1beta1", "V1Beta1", sample.regionTag().apiVersion());
9288
}
9389
}
9490

91+
@Test
92+
public void parseDefaultHost_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() {
93+
String defaultHost = "us-east1-pubsub.googleapis.com";
94+
String apiShortName = Composer.parseDefaultHost(defaultHost);
95+
assertEquals("pubsub", apiShortName);
96+
}
97+
98+
@Test
99+
public void parseDefaultHost_shouldReturnApiShortName() {
100+
String defaultHost = "logging.googleapis.com";
101+
String apiShortName = Composer.parseDefaultHost(defaultHost);
102+
assertEquals("logging", apiShortName);
103+
}
104+
105+
@Test
106+
public void parseDefaultHost_shouldReturnApiShortNameForIam() {
107+
String defaultHost = "iam-meta-api.googleapis.com";
108+
String apiShortName = Composer.parseDefaultHost(defaultHost);
109+
assertEquals("iam", apiShortName);
110+
}
111+
112+
@Test
113+
public void parseDefaultHost_shouldReturnHostIfNoPeriods() {
114+
String defaultHost = "logging:7469";
115+
String apiShortName = Composer.parseDefaultHost(defaultHost);
116+
assertEquals("logging:7469", apiShortName);
117+
}
118+
119+
@Test
120+
public void gapicClass_addRegionTagAndHeaderToSample() {
121+
Sample testSample;
122+
testSample = Composer.addRegionTagAndHeaderToSample(sample, "showcase", "v1");
123+
assertEquals("Showcase", testSample.regionTag().apiShortName());
124+
assertEquals("V1", testSample.regionTag().apiVersion());
125+
assertEquals(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), testSample.fileHeader());
126+
}
127+
95128
@Test
96129
public void composeSamples_parseProtoPackage() {
130+
131+
String defaultHost = "accessapproval.googleapis.com:443";
132+
GapicClass testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost);
133+
List<GapicClass> testClassList = Arrays.asList(new GapicClass[] {testClass});
97134
String protoPack = "google.cloud.accessapproval.v1";
135+
98136
List<Sample> composedSamples =
99-
Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples();
137+
Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples();
138+
139+
// If samples is empty, the test automatically passes without checking.
140+
assertFalse(composedSamples.isEmpty());
100141

101142
for (Sample sample : composedSamples) {
102143
assertEquals(
103-
"ApiShortName should be accessapproval",
144+
"ApiShortName should be Accessapproval",
104145
sample.regionTag().apiShortName(),
105-
"accessapproval");
106-
assertEquals("ApiVersion should be v1", sample.regionTag().apiVersion(), "v1");
146+
"Accessapproval");
147+
assertEquals("ApiVersion should be V1", sample.regionTag().apiVersion(), "V1");
107148
}
108149

109150
protoPack = "google.cloud.vision.v1p1beta1";
110-
composedSamples = Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples();
151+
defaultHost = "vision.googleapis.com";
152+
testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost);
153+
testClassList = Arrays.asList(new GapicClass[] {testClass});
154+
composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples();
155+
// If samples is empty, the test automatically passes without checking.
156+
assertFalse(composedSamples.isEmpty());
157+
111158
for (Sample sample : composedSamples) {
112-
assertEquals("ApiShortName should be vision", sample.regionTag().apiShortName(), "vision");
113-
assertEquals("ApiVersion should be v1p1beta1", sample.regionTag().apiVersion(), "v1p1beta1");
159+
assertEquals("ApiShortName should be Vision", sample.regionTag().apiShortName(), "Vision");
160+
assertEquals("ApiVersion should be V1P1Beta1", sample.regionTag().apiVersion(), "V1P1Beta1");
114161
}
115162

116163
protoPack = "google.cloud.vision";
117-
composedSamples = Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples();
164+
composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples();
165+
// If samples is empty, the test automatically passes without checking.
166+
assertFalse(composedSamples.isEmpty());
167+
118168
for (Sample sample : composedSamples) {
119-
assertEquals("ApiShortName should be vision", sample.regionTag().apiShortName(), "vision");
169+
assertEquals("ApiShortName should be Vision", sample.regionTag().apiShortName(), "Vision");
120170
assertEquals("ApiVersion should be empty", sample.regionTag().apiVersion(), "");
121171
}
122172
}

0 commit comments

Comments
 (0)