commit fed4977027f2a305d9de5c19b0dc606550eea41b
author Lázaro Clapp <lazaro.clapp@gmail.com> Mon Nov 05 22:55:55 2018 -0800
committer Duru Can Celasun <can@dcc.im> Tue Nov 06 07:55:55 2018 +0100
tree 5f6d6badf84ba4c8477b51b30704a5261a8f4e6f
parent 718a63c85b64f1c60b262229b812eabd40863d9f

THRIFT-4660: Include Generated and Nullable as needed for enums

Client: Java

compiler/cpp/src/thrift/generate/t_java_generator.cc

diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 4780dc7..2c84551 100644
--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
@@ -498,6 +498,11 @@
   f_enum << autogen_comment() << java_package() << endl;
 
   generate_java_doc(f_enum, tenum);
+
+  if (!suppress_generated_annotations_) {
+    generate_javax_generated_annotation(f_enum);
+  }
+
   if (is_deprecated) {
     indent(f_enum) << "@Deprecated" << endl;
   }
@@ -544,6 +549,7 @@
                  << endl;
   indent(f_enum) << " * @return null if the value is not found." << endl;
   indent(f_enum) << " */" << endl;
+  indent(f_enum) << java_nullable_annotation() << endl;
   indent(f_enum) << "public static " + tenum->get_name() + " findByValue(int value) { " << endl;
 
   indent_up();