fix: resource name class deduplication #1854
Conversation
diegomarquezp
changed the title
...va/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java
Outdated
Show resolved
Hide resolved
gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/store/TypeStore.java
Outdated
Show resolved
Hide resolved
| * @return | ||
| */ | ||
| private static List<TypeNode> createImplementsTypes(String implementingClassName) { | ||
| List<TypeNode> preprocessed = Arrays.asList(FIXED_TYPESTORE.get("ResourceName")); |
There was a problem hiding this comment.
FIXED_TYPESTORE always returns only one result. Can we check if there is conflict and fix it first, then wrap it as a list in the end?
There was a problem hiding this comment.
I used a slightly different but similarly concise way (wrap both possible results in the end). Hope you agree it's good too.
There was a problem hiding this comment.
Thanks, this looks much better!
nit: It would be great if we can return TypeNode only in this private method and wrap it as a list when we call it, since the list always contains just one element.
There was a problem hiding this comment.
Ah I only saw the review comment instead of this one. I'll leave it as a quick follow up
...va/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java
Outdated
Show resolved
Hide resolved
|
[gapic-generator-java-root] Kudos, SonarCloud Quality Gate passed! |
|
[java_showcase_integration_tests] Kudos, SonarCloud Quality Gate passed!
|
|
[java_showcase_unit_tests] Kudos, SonarCloud Quality Gate passed!
|
diegomarquezp
changed the title
Adds deduplication logic for
com.google.api.resourcenames.ResourceNameimplementing classes. It is possible that a generated class is also namedResourceName, which is not currently handled by the generator.This approach consists of:
ResourceNameClassComposerto use the full name ofResourceName(the only implemented interface) if there is a name collision with the class being generated