[thrift] branch master updated: THRIFT-4660: Include Generated and Nullable as needed for enums

[dcelasun]

This is an automated email from the ASF dual-hosted git repository.

dcelasun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new fed4977  THRIFT-4660: Include Generated and Nullable as needed for 
enums
fed4977 is described below

commit fed4977027f2a305d9de5c19b0dc606550eea41b
Author: Lázaro Clapp <lazaro.cl...@gmail.com>
AuthorDate: Mon Nov 5 22:55:55 2018 -0800

    THRIFT-4660: Include Generated and Nullable as needed for enums
    
    Client: Java
---
 compiler/cpp/src/thrift/generate/t_java_generator.cc | 6 ++++++
 1 file changed, 6 insertions(+)

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 @@ void t_java_generator::generate_enum(t_enum* tenum) {
   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 @@ void t_java_generator::generate_enum(t_enum* tenum) {
                  << 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();