Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add google/shopping/type/types.proto when generating shopping APIs #2414

Merged
merged 3 commits into from
Jan 25, 2024

Conversation

JoeWang1127
Copy link
Collaborator

@JoeWang1127 JoeWang1127 commented Jan 24, 2024

In this PR:

  • add google/shopping/type/types.proto when generating from google/shopping.

We decided to add an edge case in generate_library.sh as a temporary fix. The long-term solution will be adding an org-level common protos in sdk-platform-java.

@product-auto-label product-auto-label bot added the size: xs Pull request size is extra small. label Jan 24, 2024
@JoeWang1127 JoeWang1127 marked this pull request as ready for review January 24, 2024 16:14
@JoeWang1127 JoeWang1127 requested a review from a team as a code owner January 24, 2024 16:14
# this proto is included in //google/shopping/css/v1:google-cloud-shopping-css-v1-java
# and //google/shopping/merchant/inventories/v1beta:google-cloud-merchant-inventories-v1beta-java
# and //google/shopping/merchant/reports/v1beta:google-cloud-merchant-reports-v1beta-java
proto_files="${proto_files} google/shopping/type/types.proto"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need to include them here if these are included in java-common-protos?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some classes are missing in proto-* directory if google/shopping/type/types.proto is excluded.

deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/Channel.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/ChannelOrBuilder.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/CustomAttribute.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/CustomAttributeOrBuilder.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/Destination.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/DestinationOrBuilder.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/Price.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/PriceOrBuilder.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/ReportingContext.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/ReportingContextOrBuilder.java
deleted:    java-shopping-css/proto-google-shopping-css-v1/src/main/java/com/google/shopping/type/TypesProto.java

So I think the answer to your question is no (these classes can be inherited from shared dependencies).

@JoeWang1127
Copy link
Collaborator Author

Hold this PR until #2018 is resolved.

Copy link

sonarcloud bot commented Jan 24, 2024

Quality Gate Passed Quality Gate passed for 'gapic-generator-java-root'

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Copy link

sonarcloud bot commented Jan 24, 2024

Quality Gate Passed Quality Gate passed for 'java_showcase_integration_tests'

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@JoeWang1127 JoeWang1127 merged commit a34d3dd into main Jan 25, 2024
32 checks passed
@JoeWang1127 JoeWang1127 deleted the chore/add-type branch January 25, 2024 00:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size: xs Pull request size is extra small.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants