Commitc4ff7a6

committed

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

PiperOrigin-RevId: 814799893

1 parent537ac35 commitc4ff7a6Copy full SHA for c4ff7a6

File tree

+11

-1

lines changed

java/core/src
- main/java/com/google/protobuf
  - GeneratorNames.java
- test/java/com/google/protobuf
  - GeneratorNamesTest.java

+11

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ static String getDefaultFileClassName(`
`139`	`139`	`FileDescriptorProtoOrBuilderfile,booleanuseOldOuterClassnameDefault) {`
`140`	`140`	`// Replicates the logic of ClassNameResolver::GetFileDefaultImmutableClassName.`
`141`	`141`	`Stringname =file.getName();`
`142`		`-name =name.substring(name.lastIndexOf('/'));`
	`142`	+// The `+ 1` includes the case where no '/' is present.
	`143`	`+name =name.substring(name.lastIndexOf('/') +1);`
`143`	`144`	`name =underscoresToCamelCase(stripProto(name));`
`144`	`145`	`returnuseOldOuterClassnameDefault ?name :name +"Proto";`
`145`	`146`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,15 @@ public void getFileClassName_weirdExtension() {`
`234`	`234`	`.isEqualTo("BarNotproto");`
`235`	`235`	`}`
`236`	`236`
	`237`	`+@Test`
	`238`	`+publicvoidgetFileClassName_noDirectory() {`
	`239`	`+// This isn't exercisable in blazel because all our tests are in a directory.`
	`240`	`+assertThat(`
	`241`	`+GeneratorNames.getFileClassName(`
	`242`	`+FileDescriptorProto.newBuilder().setName("bar.proto").build()))`
	`243`	`+ .isEqualTo("Bar");`
	`244`	`+ }`
	`245`	`+`
`237`	`246`	`@Test`
`238`	`247`	`publicvoidgetFileClassName_conflictingName2024() {`
`239`	`248`	`// This isn't exercisable in blazel because conflicts trigger a protoc error in edition 2024.`

Comments

(0)