chore: Java µgen dev workflow demo DO NOT SUBMIT #786

miraleung · 2021-07-01T18:19:26Z

No description provided.

Prepare `gapic-generator-java` for the DIREGAPIC implementation changes. 1) Splitting Grpc-specific classes into their own package (mainly `composer` classes) 2) Extract the transport-agnostic logic of the composer classes into the set of abstract classes. 3) Convert most of the static methods in the `ClassComposer` classes into instance methods to leverage the class inheritance (transport-agnostic logic in abstract class, transport-specific portions are in transport-specific classes extending the abstract ones) 4) The resultant architecture resembles the [Template Method](https://en.wikipedia.org/wiki/Template_method_pattern) design pattern where `Abstract<Name>ClassComposer.generate()` (and potentially the the other private/protected methods called from `generate()`) call transport-specific logic (implemented in the concrete `<Transport><Name>ClassComposer` classes), when appropriate. 5) Refactor the tests and golden files file structure to match the main classes package structure. 6) The golden files were split to be placed under the same directory as the clases which generate them. This was matching the existing infrastructure the best: (1) as the golden files updater makes this assumption (golden file is under the same package as the `<Name>Test.java` which creates it); (2) the repo currently does not have a dedicated test resources directory (there are multiple resource-like subfolders under test, it is hard to keep thing under control and avoid propagating magical path constants); (3) keeping golden files and tests together seems ok, since if the golden files were smaller they would be simply put as the expected constants in the tests themselves. 7) This PR tries to preserve the original history of the files as accurately as possible (i.e. prioritizes clear move semantics over delete/create semantics in terms of file diff, where possible). The subsequent PR with rest implementation will looks something like [this](vam-google/gapic-generator-java@master...vam-google:diregapic_main)

Release-As: 1.0.10

* chore: release 1.0.10 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

…#743) * fix(tests): Ensure deterministic field ordering in test classes * fix(bazel): fix recursive integration test file diffs (#744)

* fix(tests): Ensure deterministic field ordering in test classes * fix(bazel): fix recursive integration test file diffs

…ds in test/mock classes [ggj] (#750) * chore: add context to diff * fix: Sort services and methods by name * fix: add more context * fix: more service ordering * fix: test * fix: test * fix: test * fix: test * fix: test * fix: test ordering again * fix: cleanup

…751)

ntegration tests (compute_small) are not present in this commit, as they depend on #743 and #744. Also, as a prerequisite, at least a basic implementation of DIREGAPIC must be merged in gapic-generator-java, to integrate it with [googleapis-discovery](https://github.com/googleapis/googleapis-discovery) first (since integration test infra depends on the actual googleapis/googleapis-discovery targets). Please check vam-google@8983e23 to see how it would look like with compute integration tests not excluded. `compliance.proto` is used as a basis for the REST composer tests. It was copied as is from [showcase/compliance.proto](https://github.com/googleapis/gapic-showcase/blob/master/schema/google/showcase/v1beta1/compliance.proto). Changes in `WORKSPACE` and `repositories.bzl` are necessary to make this repo work with gax-java `1.63.0` and above (`gax-java` vs `gapic-generator-java` java dependencies imports precedence). The other dependencies changes are either to bring deps in sync with the actual ones in googleapis, or to fix a specific import precedence issue. I also added (in a form of bazel rules) a proto descriptor dumper and a runner from the dumped file (for debugging purposes). Not technically required here (but was very helpful for debugging purposes, so hopefully we can preserve it).

Release-As: 1.0.11

* chore: release 1.0.11 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

* chore: Add comment context on null protobuf check * Update AbstractServiceStubSettingsClassComposer.java

…ggj] (#760) * fix(mocks): Use java.lang.Object if there are protos named 'Object' * fix: add tests * Update MockServiceImplClassComposer.java * Update MockServiceImplClassComposer.java * Update MockServiceImplClassComposer.java * fix(resnames): Use anon resname classes when no non-only ds are present (#761)

Release-As: 1.0.12

…nt [ggj] (#763) * fix(mocks): Use java.lang.Object if there are protos named 'Object' * fix: add tests * Update MockServiceImplClassComposer.java * Update MockServiceImplClassComposer.java * Update MockServiceImplClassComposer.java * fix(resnames): Use anon resname classes when no non-only ds are present

* chore: release 1.0.12 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

…or from dumped file (#765) For debugging purposes. Usage example: ```bzl load("@gapic_generator_java//rules_java_gapic:java_gapic.bzl", "java_generator_request_dump") java_generator_request_dump( name = "compute_small_request_dump", srcs = [":compute_small_proto_with_info"], transport = "rest", )

…ssignment (#769)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

…[ggj] (#764) * fix(bazel): Remove monolith rule deps from the Java µgen Bazel rules * fix: update library rules, add bazel clean to CI * fix: remove Bazel clean from CI * fix: add compute * fix: update library goldens * fix: simplify integration test targets in CI * fix: CI build * fix: CI build

Release-As: 1.0.14

* chore: release 1.0.14 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

Release-As: 1.0.15

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

…on test (#782)

…client generation [ggj] (#781) * fix(protoc): Mirror protoc's field name conflict resolution logic in client gen * fix: update Field - set default value for originalName * fix: update googleapis-discovery hash with monolith removal * fix: post-conflict resolution goldens * fix(build): Update googleapis-discovery hash to fix compute integration test * fix(protoc): Mirror protoc's field name conflict resolution logic in client gen * fix: update Field - set default value for originalName * fix: post-conflict resolution goldens * Update Parser.java * Update Field.java

* fix(bazel): Eradicate monolith deps from Java µgen repo * fix: update googleapis hash * fix: update googleapis-discovery and deps' hashes

codecov · 2021-07-01T18:31:25Z

Codecov Report

Merging #786 (02be3ab) into diregapic (79b5504) will decrease coverage by 0.14%.
The diff coverage is 89.11%.

❗ Current head 02be3ab differs from pull request most recent head b856140. Consider uploading reports for the commit b856140 to get more accurate results

@@              Coverage Diff              @@
##           diregapic     #786      +/-   ##
=============================================
- Coverage      91.42%   91.28%   -0.15%     
=============================================
  Files            125      140      +15     
  Lines          13750    14951    +1201     
  Branches        1029     1074      +45     
=============================================
+ Hits           12571    13648    +1077     
- Misses           900     1010     +110     
- Partials         279      293      +14

Impacted Files	Coverage Δ
...oogle/api/generator/engine/ast/AssignmentExpr.java	`73.33% <0.00%> (-5.24%)`	⬇️
.../google/api/generator/gapic/composer/Composer.java	`10.11% <0.00%> (-2.57%)`	⬇️
...ic/composer/common/BatchingDescriptorComposer.java	`99.73% <ø> (ø)`
...r/gapic/composer/common/RetrySettingsComposer.java	`97.76% <ø> (ø)`
...apic/composer/common/ServiceStubClassComposer.java	`99.18% <ø> (ø)`
.../gapic/composer/grpc/MockServiceClassComposer.java	`100.00% <ø> (ø)`
...google/api/generator/gapic/model/GapicContext.java	`94.73% <ø> (ø)`
...erator/gapic/protoparser/PluginArgumentParser.java	`51.61% <30.76%> (-17.96%)`	⬇️
.../com/google/api/generator/gapic/model/Message.java	`64.10% <47.05%> (-16.67%)`	⬇️
...ic/composer/common/ServiceClientClassComposer.java	`98.70% <50.00%> (ø)`
... and 53 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 79b5504...b856140. Read the comment docs.

miraleung · 2021-07-01T19:08:47Z

This PR was made for development demo purposes - closing.

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [io.grpc:grpc-bom](https://togithub.com/grpc/grpc-java) | `1.48.1` -> `1.49.0` | [![age](https://badges.renovateapi.com/packages/maven/io.grpc:grpc-bom/1.49.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/io.grpc:grpc-bom/1.49.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/io.grpc:grpc-bom/1.49.0/compatibility-slim/1.48.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/io.grpc:grpc-bom/1.49.0/confidence-slim/1.48.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>grpc/grpc-java</summary> ### [`v1.49.0`](https://togithub.com/grpc/grpc-java/compare/v1.48.1...v1.49.0) [Compare Source](https://togithub.com/grpc/grpc-java/compare/v1.48.1...v1.49.0) </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. --- - [ ] 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/java-shared-dependencies).

🤖 I have created a release *beep* *boop* --- ## [2.6.0](googleapis/java-core@v2.5.11...v2.6.0) (2022-04-14) ### Features * **java:** remove GoogleJsonClentFeature and OpenCensusFeature after relocation ([#793](googleapis/java-core#793)) ([cafd489](googleapis/java-core@cafd489)) * **java:** remove Netty Native Image configuration after relocation to gax ([#771](googleapis/java-core#771)) ([9cc7dba](googleapis/java-core@9cc7dba)) * **java:** remove protobuf Native Image configuration ([#784](googleapis/java-core#784)) ([7a8df66](googleapis/java-core@7a8df66)) * remove native-image.properties settings after relocation ([#794](googleapis/java-core#794)) ([219a519](googleapis/java-core@219a519)) * remove resource-config after relocation ([#795](googleapis/java-core#795)) ([8ed3110](googleapis/java-core@8ed3110)) * remove substitutions after relocation to gax ([#789](googleapis/java-core#789)) ([85280b1](googleapis/java-core@85280b1)) ### Bug Fixes * **java:** register test class for reflection to fix native image test ([#766](googleapis/java-core#766)) ([fa07125](googleapis/java-core@fa07125)) ### Dependencies * revert protobuf to 3.19 and common-protos 2.8.3 ([#798](googleapis/java-core#798)) ([27ca70c](googleapis/java-core@27ca70c)) * update dependency com.google.api-client:google-api-client-bom to v1.34.0 ([#800](googleapis/java-core#800)) ([3abc47d](googleapis/java-core@3abc47d)) * update dependency com.google.api:gax-bom to v2.16.0 ([#785](googleapis/java-core#785)) ([bd33a76](googleapis/java-core@bd33a76)) * update dependency com.google.api.grpc:proto-google-common-protos to v2.8.1 ([#792](googleapis/java-core#792)) ([3f85e62](googleapis/java-core@3f85e62)) * update dependency com.google.api.grpc:proto-google-common-protos to v2.8.2 ([#796](googleapis/java-core#796)) ([d6ea18e](googleapis/java-core@d6ea18e)) * update dependency com.google.api.grpc:proto-google-iam-v1 to v1.3.0 ([#783](googleapis/java-core#783)) ([48594f3](googleapis/java-core@48594f3)) * update dependency com.google.api.grpc:proto-google-iam-v1 to v1.3.1 ([#799](googleapis/java-core#799)) ([9fe7d35](googleapis/java-core@9fe7d35)) * update dependency com.google.errorprone:error_prone_annotations to v2.12.1 ([#788](googleapis/java-core#788)) ([cfdabb4](googleapis/java-core@cfdabb4)) * update dependency com.google.http-client:google-http-client-bom to v1.41.6 ([#791](googleapis/java-core#791)) ([d9ff405](googleapis/java-core@d9ff405)) * update dependency com.google.http-client:google-http-client-bom to v1.41.7 ([#797](googleapis/java-core#797)) ([dfc3c57](googleapis/java-core@dfc3c57)) * update dependency com.google.protobuf:protobuf-bom to v3.20.0 ([#787](googleapis/java-core#787)) ([51f59fc](googleapis/java-core@51f59fc)) * update dependency io.grpc:grpc-bom to v1.45.1 ([#780](googleapis/java-core#780)) ([cd8a078](googleapis/java-core@cd8a078)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

vam-google and others added 30 commits May 26, 2021 15:21

chore: release 1.0.10

0de5212

Release-As: 1.0.10

Merge remote-tracking branch 'origin/master'

36d9336

chore: release 1.0.10 (#742)

8f6f40e

* chore: release 1.0.10 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

fix(tests): Ensure deterministic field ordering in test classes [ggj] (…

fdb705b

…#743) * fix(tests): Ensure deterministic field ordering in test classes * fix(bazel): fix recursive integration test file diffs (#744)

fix(bazel): ensure integration tests diff files recursively [ggj] (#745)

ddc75f9

* fix(tests): Ensure deterministic field ordering in test classes * fix(bazel): fix recursive integration test file diffs

fix(resnames): filter out mixin services from resname pkg candidates (#…

72fa76f

…751)

chore: release 1.0.11

626cb51

Release-As: 1.0.11

chore: release 1.0.11 (#756)

9591f8d

* chore: release 1.0.11 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

feat: add mtls support (#672)

1e24893

chore: Add comment context on null protobuf check [ggj] (#754)

eb17120

* chore: Add comment context on null protobuf check * Update AbstractServiceStubSettingsClassComposer.java

chore: add integration tests for compute (DIREGAPIC) (#757)

2091141

chore: release 1.0.12

02eab0e

Release-As: 1.0.12

chore: release 1.0.12 (#762)

ae07f3e

* chore: release 1.0.12 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

chore: disable snippet-bot (#766)

6d14628

chore: fix formatting and formatting validation logic (#768)

b7d9399

fix(resnames): Fix resname builder name conflicts in ctor with this a…

edac844

…ssignment (#769)

chore: release 1.0.13 (#770)

bc6eb85

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

feat: Add DIREGAPIC-specific pagination (#767)

1294c29

chore: release 1.0.14

acf7765

Release-As: 1.0.14

chore(ci): Fix GitHub CI (#773)

705b3b1

chore: release 1.0.14 (#772)

68de8da

* chore: release 1.0.14 * Update CHANGELOG.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Mira Leung <miraleung@users.noreply.github.com>

feat: Implement field presence support for DIREGAPIC (#774)

c820361

fix(service.yaml): Remove allowlist restriction (#776)

8f42efd

miraleung and others added 6 commits June 22, 2021 13:27

chore: release 1.0.15

f752478

Release-As: 1.0.15

chore: release 1.0.15 (#779)

0e7893e

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

fix(build): Update googleapis-discovery hash to fix compute integrati…

46bb19a

…on test (#782)

fix(bazel): Eradicate monolith deps from Java µgen repo (#778)

86f2472

* fix(bazel): Eradicate monolith deps from Java µgen repo * fix: update googleapis hash * fix: update googleapis-discovery and deps' hashes

chore: test change

02be3ab

miraleung requested a review from a team as a code owner July 1, 2021 18:19

google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Jul 1, 2021

miraleung requested a review from GabrielGonzalezDiaz July 1, 2021 18:19

miraleung changed the base branch from master to diregapic July 1, 2021 18:20

fix: add extra string, update goldens

b856140

miraleung closed this Jul 1, 2021

miraleung changed the title ~~chore: test change DO NOT SUBMIT~~ chore: Java µgen dev workflow demo DO NOT SUBMIT Jul 2, 2021

chanseokoh deleted the dev/demo branch November 10, 2021 15:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Java µgen dev workflow demo DO NOT SUBMIT #786

chore: Java µgen dev workflow demo DO NOT SUBMIT #786

miraleung commented Jul 1, 2021

codecov bot commented Jul 1, 2021 •

edited

Loading

miraleung commented Jul 1, 2021

chore: Java µgen dev workflow demo DO NOT SUBMIT #786

chore: Java µgen dev workflow demo DO NOT SUBMIT #786

Conversation

miraleung commented Jul 1, 2021

codecov bot commented Jul 1, 2021 • edited Loading

Codecov Report

miraleung commented Jul 1, 2021

codecov bot commented Jul 1, 2021 •

edited

Loading