summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLázaro Clapp <lazaro.clapp@gmail.com>2018-11-05 22:55:55 -0800
committerDuru Can Celasun <can@dcc.im>2018-11-06 07:55:55 +0100
commitfed4977027f2a305d9de5c19b0dc606550eea41b (patch)
tree5f6d6badf84ba4c8477b51b30704a5261a8f4e6f
parent718a63c85b64f1c60b262229b812eabd40863d9f (diff)
downloadthrift-fed4977027f2a305d9de5c19b0dc606550eea41b.tar.gz
THRIFT-4660: Include Generated and Nullable as needed for enums
Client: Java
-rw-r--r--compiler/cpp/src/thrift/generate/t_java_generator.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 4780dc76c..2c845512c 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();