From 1568d52589ef2dd49c2b8e9dee087f696fa32c6f Mon Sep 17 00:00:00 2001 From: Kannan J Date: Mon, 19 Jan 2026 06:45:28 +0000 Subject: [PATCH 1/2] compiler: Replace usages of deprecated protobuf method `protobuf::compiler::java::ClassName` with `proto2::compiler::java::QualifiedClassName` Fixes #12464. --- compiler/src/java_plugin/cpp/java_generator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 659d7ccca47..7fe4b509e57 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -213,7 +213,7 @@ static inline std::string MethodIdFieldName(const MethodDescriptor* method) { } static inline std::string MessageFullJavaName(const Descriptor* desc) { - return protobuf::compiler::java::ClassName(desc); + return proto2::compiler::java::QualifiedClassName(desc); } // TODO(nmittler): Remove once protobuf includes javadoc methods in distribution. @@ -1050,7 +1050,7 @@ static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service, (*vars)["proto_base_descriptor_supplier"] = service_name + "BaseDescriptorSupplier"; (*vars)["proto_file_descriptor_supplier"] = service_name + "FileDescriptorSupplier"; (*vars)["proto_method_descriptor_supplier"] = service_name + "MethodDescriptorSupplier"; - (*vars)["proto_class_name"] = protobuf::compiler::java::ClassName(service->file()); + (*vars)["proto_class_name"] = proto2::compiler::java::QualifiedClassName(service->file()); p->Print( *vars, "private static abstract class $proto_base_descriptor_supplier$\n" @@ -1384,7 +1384,7 @@ void GenerateService(const ServiceDescriptor* service, } std::string ServiceJavaPackage(const FileDescriptor* file) { - std::string result = protobuf::compiler::java::ClassName(file); + std::string result = proto2::compiler::java::QualifiedClassName(file); size_t last_dot_pos = result.find_last_of('.'); if (last_dot_pos != std::string::npos) { result.resize(last_dot_pos); From 21f5cf3e6fe59df6d5a16033ee32a3661ee8fa84 Mon Sep 17 00:00:00 2001 From: Kannan J Date: Mon, 19 Jan 2026 07:08:43 +0000 Subject: [PATCH 2/2] compiler: Replace usages of deprecated protobuf method `protobuf::compiler::java::ClassName` with `protobuf::compiler::java::QualifiedClassName` Fixes #12464. --- compiler/src/java_plugin/cpp/java_generator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 7fe4b509e57..a81d54791b4 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -213,7 +213,7 @@ static inline std::string MethodIdFieldName(const MethodDescriptor* method) { } static inline std::string MessageFullJavaName(const Descriptor* desc) { - return proto2::compiler::java::QualifiedClassName(desc); + return protobuf::compiler::java::QualifiedClassName(desc); } // TODO(nmittler): Remove once protobuf includes javadoc methods in distribution. @@ -1050,7 +1050,7 @@ static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service, (*vars)["proto_base_descriptor_supplier"] = service_name + "BaseDescriptorSupplier"; (*vars)["proto_file_descriptor_supplier"] = service_name + "FileDescriptorSupplier"; (*vars)["proto_method_descriptor_supplier"] = service_name + "MethodDescriptorSupplier"; - (*vars)["proto_class_name"] = proto2::compiler::java::QualifiedClassName(service->file()); + (*vars)["proto_class_name"] = protobuf::compiler::java::QualifiedClassName(service->file()); p->Print( *vars, "private static abstract class $proto_base_descriptor_supplier$\n" @@ -1384,7 +1384,7 @@ void GenerateService(const ServiceDescriptor* service, } std::string ServiceJavaPackage(const FileDescriptor* file) { - std::string result = proto2::compiler::java::QualifiedClassName(file); + std::string result = protobuf::compiler::java::QualifiedClassName(file); size_t last_dot_pos = result.find_last_of('.'); if (last_dot_pos != std::string::npos) { result.resize(last_dot_pos);