aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-06-29 17:35:15 -0700
committerJisi Liu <jisi.liu@gmail.com>2015-06-29 18:27:34 -0700
commit927ef3f245d23fd67746561fc7a9986580f96d1f (patch)
tree1465b60569edd6da5c26c8bc6edbb39601e23a90
parent3e2c8a5dd79481e1d36572cdf65be93514ba6581 (diff)
downloadprotobuf-927ef3f245d23fd67746561fc7a9986580f96d1f.tar.gz
protobuf-927ef3f245d23fd67746561fc7a9986580f96d1f.tar.bz2
protobuf-927ef3f245d23fd67746561fc7a9986580f96d1f.zip
Add static MyMessage.parser().
In preparation of deprecating the PARSER public instance. Change-Id: I3e332d83bc4b4f8467769f8e45c758978ace8f21
-rw-r--r--src/google/protobuf/compiler/java/java_message.cc4
-rw-r--r--src/google/protobuf/compiler/java/java_message_lite.cc5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc
index 09b0fd94..0daf6aca 100644
--- a/src/google/protobuf/compiler/java/java_message.cc
+++ b/src/google/protobuf/compiler/java/java_message.cc
@@ -1250,6 +1250,10 @@ void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
"\n");
printer->Print(
+ "public static com.google.protobuf.Parser<$classname$> parser() {\n"
+ " return PARSER;\n"
+ "}\n"
+ "\n"
"@java.lang.Override\n"
"public com.google.protobuf.Parser<$classname$> getParserForType() {\n"
" return PARSER;\n"
diff --git a/src/google/protobuf/compiler/java/java_message_lite.cc b/src/google/protobuf/compiler/java/java_message_lite.cc
index 3accee92..f626a23d 100644
--- a/src/google/protobuf/compiler/java/java_message_lite.cc
+++ b/src/google/protobuf/compiler/java/java_message_lite.cc
@@ -1153,7 +1153,10 @@ void ImmutableMessageLiteGenerator::GenerateParser(io::Printer* printer) {
printer->Print(
"public static final com.google.protobuf.Parser<$classname$> PARSER =\n"
" new DefaultInstanceBasedParser(DEFAULT_INSTANCE);\n"
- "\n",
+ "\n"
+ "public static com.google.protobuf.Parser<$classname$> parser() {\n"
+ " return PARSER;\n"
+ "}\n",
"classname", descriptor_->name());
}