Skip to content

fix(types): Reorder nested types for legacy protos w/ java_outer_class in one file [ggj] #724

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.

Sign up for GitHub

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

Merged
miraleung merged 4 commits into from
May 17, 2021
Merged

fix(types): Reorder nested types for legacy protos w/ java_outer_class in one file [ggj] #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
836a45f
fix(types): Use fully-qualified message type names
miraleung May 11, 2021
13c92e1
fix: cleanup
miraleung May 13, 2021
891c458
fix(types): Reorder nested types for legacy protos w/o java_multiple_…
miraleung May 14, 2021
5708fa4
Merge branch 'master' into dev/full_msg_types
miraleung May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/google/api/generator/engine/ast/Reference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public interface Reference extends AstNode {

boolean useFullName();

// The nested types in left-to-right order, if any.
// Example: com.google.Foo.Bar.Car.ThisType will have the outer types listed in the order
// [Foo, Bar, Car].
@Nullable
ImmutableList<String> enclosingClassNames();

Expand Down
17 changes: 11 additions & 6 deletions src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ static Reference parseMessageReference(@Nonnull Descriptor messageDescriptor) {
// Handles nesting.
while (containingType != null) {
// Outermost type in the nested type hierarchy lies at index 0.
outerNestedTypeNames.add(0, containingType.getName());
// If the Java outer proto class has already been set, apapend after it at index 1.
outerNestedTypeNames.add(hasJavaOuterClass ? 1 : 0, containingType.getName());
containingType = containingType.getContainingType();
}

Expand All @@ -158,15 +159,17 @@ static Reference parseMessageReference(@Nonnull Descriptor messageDescriptor) {
.setPakkage(pakkage)
.setEnclosingClassNames(outerNestedTypeNames)
.build();

String protoPackage = messageDescriptor.getFile().getPackage();
String messageFullName = messageDescriptor.getFullName();
if (hasJavaOuterClass) {
int packageIndex = protoPackage.length();
messageFullName =
String.format(
"%s.%s.%s",
messageFullName.substring(0, messageFullName.lastIndexOf(DOT)),
messageFullName.substring(0, packageIndex),
javaOuterClassname,
messageFullName.substring(messageFullName.lastIndexOf(DOT) + 1));
messageFullName.substring(packageIndex + 1));
}
Preconditions.checkState(
messageReference.fullName().replace(pakkage, protoPackage).equals(messageFullName),
Expand Down Expand Up @@ -207,7 +210,8 @@ static Reference parseEnumReference(@Nonnull EnumDescriptor enumDescriptor) {
// Handles nesting.
while (containingType != null) {
// Outermost type in the nested type hierarchy lies at index 0.
outerNestedTypeNames.add(0, containingType.getName());
// If the Java outer proto class has already been set, apapend after it at index 1.
outerNestedTypeNames.add(hasJavaOuterClass ? 1 : 0, containingType.getName());
containingType = containingType.getContainingType();
}

Expand All @@ -221,12 +225,13 @@ static Reference parseEnumReference(@Nonnull EnumDescriptor enumDescriptor) {
String protoPackage = enumDescriptor.getFile().getPackage();
String enumFullName = enumDescriptor.getFullName();
if (hasJavaOuterClass) {
int packageIndex = protoPackage.length();
enumFullName =
String.format(
"%s.%s.%s",
enumFullName.substring(0, enumFullName.lastIndexOf(DOT)),
enumFullName.substring(0, packageIndex),
javaOuterClassname,
enumFullName.substring(enumFullName.lastIndexOf(DOT) + 1));
enumFullName.substring(packageIndex + 1));
}

Preconditions.checkState(
Expand Down