Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions compiler/src/java_plugin/cpp/java_generator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 protobuf::compiler::java::QualifiedClassName(desc);
}

// TODO(nmittler): Remove once protobuf includes javadoc methods in distribution.
Expand Down Expand Up @@ -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"] = protobuf::compiler::java::QualifiedClassName(service->file());
p->Print(
*vars,
"private static abstract class $proto_base_descriptor_supplier$\n"
Expand Down Expand Up @@ -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 = 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);
Expand Down