diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-12-14 12:20:26 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-14 12:20:26 -0800 |
| commit | 1237c3f1f72ba0764801910ae2c284c8c2400b3a (patch) | |
| tree | 3d0ca209d284ae8afcdbaa1d281939ed31242d64 /src/google/protobuf/compiler | |
| parent | 426cf6f31ed5efae703d7a1f31edc841205414e2 (diff) | |
| parent | 594ec2262c30cb1bd19fc43c2799cfeca31603ac (diff) | |
Merge pull request #4045 from pherl/deprecate
Add deprecation annotation for oneof case.
Diffstat (limited to 'src/google/protobuf/compiler')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_message.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc index f2ff2800..eca7cf9a 100644 --- a/src/google/protobuf/compiler/java/java_message.cc +++ b/src/google/protobuf/compiler/java/java_message.cc @@ -437,11 +437,10 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) { for (int j = 0; j < descriptor_->oneof_decl(i)->field_count(); j++) { const FieldDescriptor* field = descriptor_->oneof_decl(i)->field(j); printer->Print( - "$field_name$($field_number$),\n", - "field_name", - ToUpper(field->name()), - "field_number", - SimpleItoa(field->number())); + "$deprecation$$field_name$($field_number$),\n", + "deprecation", field->options().deprecated() ? "@java.lang.Deprecated " : "", + "field_name", ToUpper(field->name()), + "field_number", SimpleItoa(field->number())); } printer->Print( "$cap_oneof_name$_NOT_SET(0);\n", |