Skip to content

Fix a bug calculating the file name in the absense of directories. #23772

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
merged 1 commit into from
Oct 3, 2025
Merged

Fix a bug calculating the file name in the absense of directories. #23772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion java/core/src/main/java/com/google/protobuf/GeneratorNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ static String getDefaultFileClassName(
FileDescriptorProtoOrBuilder file, boolean useOldOuterClassnameDefault) {
// Replicates the logic of ClassNameResolver::GetFileDefaultImmutableClassName.
String name = file.getName();
name = name.substring(name.lastIndexOf('/'));
// The `+ 1` includes the case where no '/' is present.
name = name.substring(name.lastIndexOf('/') + 1);
name = underscoresToCamelCase(stripProto(name));
return useOldOuterClassnameDefault ? name : name + "Proto";
}
Expand Down
9 changes: 9 additions & 0 deletions java/core/src/test/java/com/google/protobuf/GeneratorNamesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,15 @@ public void getFileClassName_weirdExtension() {
.isEqualTo("BarNotproto");
}

@Test
public void getFileClassName_noDirectory() {
// This isn't exercisable in blazel because all our tests are in a directory.
assertThat(
GeneratorNames.getFileClassName(
FileDescriptorProto.newBuilder().setName("bar.proto").build()))
.isEqualTo("Bar");
}

@Test
public void getFileClassName_conflictingName2024() {
// This isn't exercisable in blazel because conflicts trigger a protoc error in edition 2024.
Expand Down
Loading