Deprecate ClassName methods in favor of new QualifiedClassName ones.

mkruskal-google · mkruskal-google · commit ca4fb2fdab93 · 2025-10-09T09:55:12.000-07:00
This will make their behavior clearer, and leave space for unqualified helpers matching our naming helpers in other languages.

PiperOrigin-RevId: 814356089
diff --git a/src/google/protobuf/compiler/java/names.cc b/src/google/protobuf/compiler/java/names.cc
@@ -96,22 +96,22 @@ std::string FieldName(const FieldDescriptor* field) {
 
 }  // namespace
 
-std::string ClassName(const Descriptor* descriptor) {
+std::string QualifiedClassName(const Descriptor* descriptor) {
   ClassNameResolver name_resolver;
   return name_resolver.GetClassName(descriptor, true);
 }
 
-std::string ClassName(const EnumDescriptor* descriptor) {
+std::string QualifiedClassName(const EnumDescriptor* descriptor) {
   ClassNameResolver name_resolver;
   return name_resolver.GetClassName(descriptor, true);
 }
 
-std::string ClassName(const ServiceDescriptor* descriptor) {
+std::string QualifiedClassName(const ServiceDescriptor* descriptor) {
   ClassNameResolver name_resolver;
   return name_resolver.GetClassName(descriptor, true);
 }
 
-std::string ClassName(const FileDescriptor* descriptor) {
+std::string QualifiedClassName(const FileDescriptor* descriptor) {
   ClassNameResolver name_resolver;
   return name_resolver.GetClassName(descriptor, true);
 }
diff --git a/src/google/protobuf/compiler/java/names.h b/src/google/protobuf/compiler/java/names.h
@@ -42,28 +42,53 @@ namespace java {
 //
 // Returns:
 //   The fully-qualified Java class name.
-PROTOC_EXPORT std::string ClassName(const Descriptor* descriptor);
+PROTOC_EXPORT std::string QualifiedClassName(const Descriptor* descriptor);
+
+// TODO Remove this in the next breaking release.
+ABSL_DEPRECATE_AND_INLINE()
+inline std::string ClassName(const Descriptor* descriptor) {
+  return QualifiedClassName(descriptor);
+}
 
 // Requires:
 //   descriptor != NULL
 //
 // Returns:
 //   The fully-qualified Java class name.
-PROTOC_EXPORT std::string ClassName(const EnumDescriptor* descriptor);
+PROTOC_EXPORT std::string QualifiedClassName(const EnumDescriptor* descriptor);
+
+// TODO Remove this in the next breaking release.
+ABSL_DEPRECATE_AND_INLINE()
+inline std::string ClassName(const EnumDescriptor* descriptor) {
+  return QualifiedClassName(descriptor);
+}
 
 // Requires:
 //   descriptor != NULL
 //
 // Returns:
 //   The fully-qualified Java class name.
-PROTOC_EXPORT std::string ClassName(const FileDescriptor* descriptor);
+PROTOC_EXPORT std::string QualifiedClassName(const FileDescriptor* descriptor);
+
+// TODO Remove this in the next breaking release.
+ABSL_DEPRECATE_AND_INLINE()
+inline std::string ClassName(const FileDescriptor* descriptor) {
+  return QualifiedClassName(descriptor);
+}
 
 // Requires:
 //   descriptor != NULL
 //
 // Returns:
 //   The fully-qualified Java class name.
-PROTOC_EXPORT std::string ClassName(const ServiceDescriptor* descriptor);
+PROTOC_EXPORT std::string QualifiedClassName(
+    const ServiceDescriptor* descriptor);
+
+// TODO Remove this in the next breaking release.
+ABSL_DEPRECATE_AND_INLINE()
+inline std::string ClassName(const ServiceDescriptor* descriptor) {
+  return QualifiedClassName(descriptor);
+}
 
 // Requires:
 //   descriptor != NULL

Original file line number	Diff line number	Diff line change
`@@ -96,22 +96,22 @@ std::string FieldName(const FieldDescriptor* field) {`
`96`	`96`
`97`	`97`	`} // namespace`
`98`	`98`
`99`		`-std::string ClassName(const Descriptor* descriptor) {`
	`99`	`+std::string QualifiedClassName(const Descriptor* descriptor) {`
`100`	`100`	`ClassNameResolver name_resolver;`
`101`	`101`	`return name_resolver.GetClassName(descriptor, true);`
`102`	`102`	`}`
`103`	`103`
`104`		`-std::string ClassName(const EnumDescriptor* descriptor) {`
	`104`	`+std::string QualifiedClassName(const EnumDescriptor* descriptor) {`
`105`	`105`	`ClassNameResolver name_resolver;`
`106`	`106`	`return name_resolver.GetClassName(descriptor, true);`
`107`	`107`	`}`
`108`	`108`
`109`		`-std::string ClassName(const ServiceDescriptor* descriptor) {`
	`109`	`+std::string QualifiedClassName(const ServiceDescriptor* descriptor) {`
`110`	`110`	`ClassNameResolver name_resolver;`
`111`	`111`	`return name_resolver.GetClassName(descriptor, true);`
`112`	`112`	`}`
`113`	`113`
`114`		`-std::string ClassName(const FileDescriptor* descriptor) {`
	`114`	`+std::string QualifiedClassName(const FileDescriptor* descriptor) {`
`115`	`115`	`ClassNameResolver name_resolver;`
`116`	`116`	`return name_resolver.GetClassName(descriptor, true);`
`117`	`117`	`}`