organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Change java descriptor back to private

Browse source
This commit is contained in:
jieluo@google.com 2014-08-07 22:22:00 +00:00
parent 83964a9ab4
commit d7339318a3
3 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/compiler/java/java_enum.cc
View file

@ -231,7 +231,7 @@ void EnumGenerator::Generate(io::Printer* printer) {
"index", SimpleItoa(descriptor_->index()));
}
printer->Print(
"return $immutable_package$.$descriptor_class$.descriptor\n"
"return $immutable_package$.$descriptor_class$.getDescriptor()\n"
" .getEnumTypes().get($index$);\n",
"immutable_package", FileJavaPackage(descriptor_->file(), true),
"descriptor_class",

2
src/google/protobuf/compiler/java/java_file.cc
View file

@ -315,7 +315,7 @@ void FileGenerator::GenerateDescriptorInitializationCodeForImmutable(
" getDescriptor() {\n"
" return descriptor;\n"
"}\n"
"public static com.google.protobuf.Descriptors.FileDescriptor\n"
"private static com.google.protobuf.Descriptors.FileDescriptor\n"
" descriptor;\n"
"static {\n");
printer->Indent();

26
src/google/protobuf/compiler/java/java_shared_code_generator.cc
View file

@ -176,36 +176,16 @@ void SharedCodeGenerator::GenerateDescriptors(io::Printer* printer) {
// Invoke internalBuildGeneratedFileFrom() to build the file.
printer->Print(
"com.google.protobuf.Descriptors.FileDescriptor\n"
" .internalBuildGeneratedFileFrom(descriptorData,\n");
" .internalBuildGeneratedFileFrom(descriptorData,\n"
" new com.google.protobuf.Descriptors.FileDescriptor[] {\n");
printer->Print(
" $classname$.class,\n"
" new java.lang.String[] {\n",
"classname", name_resolver_->GetDescriptorClassName(file_));
for (int i = 0; i < dependencies.size(); i++) {
const string& dependency = dependencies[i].second;
printer->Print(
// Here we load the dependency FileDescriptors lazily via Java
// reflection. This is to avoid breaking proto1 targets who have
// genproto dependencies for which we can't generate the descriptor
// class. They will compile fine but when users try to call reflection
// functions upon them it will fail. Users will have to get rid of
// genproto dependencies before they can use proto2 reflection on
// proto1 messages.
" \"$dependency$\",\n",
" $dependency$.getDescriptor(),\n",
"dependency", dependency);
}
printer->Print(
" }, new java.lang.String[] {\n");
for (int i = 0; i < dependencies.size(); i++) {
const string& filename = dependencies[i].first;
printer->Print(
" \"$filename$\",\n",
"filename", filename);
}
printer->Print(
" }, assigner);\n");
}