From d7339318a33c5f9e8b5dded4077223fbd4ebf229 Mon Sep 17 00:00:00 2001 From: "jieluo@google.com" Date: Thu, 7 Aug 2014 22:22:00 +0000 Subject: Change java descriptor back to private --- src/google/protobuf/compiler/java/java_enum.cc | 2 +- src/google/protobuf/compiler/java/java_file.cc | 2 +- .../compiler/java/java_shared_code_generator.cc | 26 +++------------------- 3 files changed, 5 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/google/protobuf/compiler/java/java_enum.cc b/src/google/protobuf/compiler/java/java_enum.cc index 6bebe213..cd84cf8a 100644 --- a/src/google/protobuf/compiler/java/java_enum.cc +++ b/src/google/protobuf/compiler/java/java_enum.cc @@ -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", diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc index 2d825f65..5b165b13 100644 --- a/src/google/protobuf/compiler/java/java_file.cc +++ b/src/google/protobuf/compiler/java/java_file.cc @@ -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(); diff --git a/src/google/protobuf/compiler/java/java_shared_code_generator.cc b/src/google/protobuf/compiler/java/java_shared_code_generator.cc index e454a526..183b0ce6 100644 --- a/src/google/protobuf/compiler/java/java_shared_code_generator.cc +++ b/src/google/protobuf/compiler/java/java_shared_code_generator.cc @@ -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"); } -- cgit v1.2.3