Merge pull request #4045 from pherl/deprecate

Add deprecation annotation for oneof case.

java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java

@@ -73,6 +73,14 @@ public class DeprecatedFieldTest extends TestCase {
     }
   }
 
+  public void testDeprecatedFieldInOneof() throws Exception {
+    Class<?> oneofCase = TestDeprecatedFields.OneofFieldsCase.class;
+    String name = "DEPRECATED_INT32_IN_ONEOF";
+    java.lang.reflect.Field enumValue = oneofCase.getField(name);
+    assertTrue("Enum value " + name + " should be deprecated.",
+       isDeprecated(enumValue));
+  }
+
   private boolean isDeprecated(AnnotatedElement annotated) {
     return annotated.isAnnotationPresent(Deprecated.class);
   }

python/google/protobuf/internal/descriptor_test.py

@@ -742,6 +742,19 @@ class DescriptorCopyToProtoTest(unittest.TestCase):
           deprecated: true
         >
       >
+      field {
+        name: "deprecated_int32_in_oneof"
+        number: 2
+        label: LABEL_OPTIONAL
+        type: TYPE_INT32
+        options {
+          deprecated: true
+        }
+        oneof_index: 0
+      }
+      oneof_decl {
+        name: "oneof_fields"
+      }
       """
 
     self._InternalTestCopyToProto(

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",
+        "$deprecation$$field_name$($field_number$),\n",
-        "field_name",
+        "deprecation", field->options().deprecated() ? "@java.lang.Deprecated " : "",
-        ToUpper(field->name()),
+        "field_name", ToUpper(field->name()),
-        "field_number",
+        "field_number", SimpleItoa(field->number()));
-        SimpleItoa(field->number()));
     }
     printer->Print(
       "$cap_oneof_name$_NOT_SET(0);\n",

src/google/protobuf/unittest.proto

@@ -189,6 +189,9 @@ message NestedTestAllTypes {
 
 message TestDeprecatedFields {
   optional int32 deprecated_int32 = 1 [deprecated=true];
+  oneof oneof_fields {
+    int32 deprecated_int32_in_oneof = 2 [deprecated=true];
+  }
 }
 
 message TestDeprecatedMessage {