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
