You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/06/30 21:32:30 UTC
[1/2] thrift git commit: THRIFT-3193 Option to supress date value in
@Generated annotation Client: Java Patch: Roshan George
Repository: thrift
Updated Branches:
refs/heads/master 5ef662b90 -> 770253624
THRIFT-3193 Option to supress date value in @Generated annotation
Client: Java
Patch: Roshan George <ro...@arjie.com>
This closes #531
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/24ef0d6f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/24ef0d6f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/24ef0d6f
Branch: refs/heads/master
Commit: 24ef0d6f51691134a52b22a3549695cb5ddd4993
Parents: 5ef662b
Author: Jens Geyer <je...@apache.org>
Authored: Tue Jun 30 21:14:23 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Tue Jun 30 21:31:48 2015 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_java_generator.cc | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/24ef0d6f/compiler/cpp/src/generate/t_java_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index 8c05d4a..d5b46f9 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -91,6 +91,9 @@ public:
iter = parsed_options.find("option_type");
use_option_type_ = (iter != parsed_options.end());
+ iter = parsed_options.find("undated_generated_annotations");
+ undated_generated_annotations_ = (iter != parsed_options.end());
+
out_dir_base_ = (bean_style_ ? "gen-javabean" : "gen-java");
}
@@ -343,6 +346,7 @@ private:
bool sorted_containers_;
bool reuse_objects_;
bool use_option_type_;
+ bool undated_generated_annotations_;
};
/**
@@ -5092,9 +5096,14 @@ void t_java_generator::generate_java_struct_tuple_scheme(ofstream& out, t_struct
void t_java_generator::generate_javax_generated_annotation(ofstream& out) {
time_t seconds = time(NULL);
struct tm* now = localtime(&seconds);
- indent(out) << "@Generated(value = \"" << autogen_summary() << "\", date = \""
- << (now->tm_year + 1900) << "-" << setfill('0') << setw(2) << (now->tm_mon + 1) << "-"
- << setfill('0') << setw(2) << now->tm_mday << "\")" << endl;
+ indent(out) << "@Generated(value = \"" << autogen_summary() << "\"";
+ if (undated_generated_annotations_) {
+ out << ")" << endl;
+ } else {
+ indent(out) << ", date = \"" << (now->tm_year + 1900) << "-" << setfill('0') << setw(2)
+ << (now->tm_mon + 1) << "-" << setfill('0') << setw(2) << now->tm_mday
+ << "\")" << endl;
+ }
}
THRIFT_REGISTER_GENERATOR(
@@ -5114,4 +5123,6 @@ THRIFT_REGISTER_GENERATOR(
"(read and write).\n"
" sorted_containers:\n"
" Use TreeSet/TreeMap instead of HashSet/HashMap as a implementation of "
- "set/map.\n")
+ "set/map.\n"
+ " undated_generated_annotations:\n"
+ " Do not generate the date for the @Generated annotation")
[2/2] thrift git commit: THRIFT-2921 Make Erlang impl ready for OTP
18 release (dict/0 and set/0 are deprecated) Client: Erlang Patch: Michael
Oliver
Posted by je...@apache.org.
THRIFT-2921 Make Erlang impl ready for OTP 18 release (dict/0 and set/0 are deprecated)
Client: Erlang
Patch: Michael Oliver <mi...@gmail.com>
This closes #533
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/77025362
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/77025362
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/77025362
Branch: refs/heads/master
Commit: 77025362496805944f2fc6d8d7a44d29de2bad22
Parents: 24ef0d6
Author: Jens Geyer <je...@apache.org>
Authored: Tue Jun 30 21:29:03 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Tue Jun 30 21:31:50 2015 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_erl_generator.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/77025362/compiler/cpp/src/generate/t_erl_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_erl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc
index 8c8a2c7..342c581 100644
--- a/compiler/cpp/src/generate/t_erl_generator.cc
+++ b/compiler/cpp/src/generate/t_erl_generator.cc
@@ -513,9 +513,9 @@ string t_erl_generator::render_member_type(t_field* field) {
} else if (type->is_struct() || type->is_xception()) {
return atomify(type->get_name()) + "()";
} else if (type->is_map()) {
- return "dict()";
+ return "dict:dict()";
} else if (type->is_set()) {
- return "set()";
+ return "sets:set()";
} else if (type->is_list()) {
return "list()";
} else {