*
*/
class t_java_generator : public t_oop_generator {
- public:
+public:
t_java_generator(
- t_program* program,
- const std::map<std::string, std::string>& parsed_options,
- const std::string& option_string)
- : t_oop_generator(program)
+ t_program* program,
+ const std::map<std::string, std::string>& parsed_options,
+ const std::string& option_string)
+ : t_oop_generator(program)
{
(void) option_string;
std::map<std::string, std::string>::const_iterator iter;
iter = parsed_options.find("java5");
java5_ = (iter != parsed_options.end());
if (java5_) {
- android_legacy_ = true;
+ android_legacy_ = true;
}
out_dir_base_ = (bean_style_ ? "gen-javabean" : "gen-java");
std::string get_cap_name(std::string name);
std::string generate_isset_check(t_field* field);
std::string generate_isset_check(std::string field);
- void generate_isset_set(ofstream& out, t_field* field);
+ void generate_isset_set(ofstream& out, t_field* field, std::string prefix);
std::string isset_field_id(t_field* field);
void generate_service_interface (t_service* tservice);
void generate_union_comparisons(ofstream& out, t_struct* tstruct);
void generate_union_hashcode(ofstream& out, t_struct* tstruct);
+ void generate_scheme_map(ofstream& out, t_struct* tstruct);
+ void generate_standard_writer(ofstream& out, t_struct* tstruct);
+ void generate_standard_reader(ofstream& out, t_struct* tstruct);
+ void generate_java_struct_standard_scheme(ofstream& out, t_struct* tstruct);
+
+ void generate_java_struct_tuple_scheme(ofstream& out, t_struct* tstruct);
+ void generate_java_struct_tuple_reader(ofstream& out, t_struct* tstruct);
+ void generate_java_struct_tuple_writer(ofstream& out, t_struct* tstruct);
+
/**
* Serialization constructs
*/
void generate_deserialize_field (std::ofstream& out,
t_field* tfield,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_deserialize_struct (std::ofstream& out,
t_struct* tstruct,
void generate_deserialize_container (std::ofstream& out,
t_type* ttype,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_deserialize_set_element (std::ofstream& out,
t_set* tset,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_deserialize_map_element (std::ofstream& out,
t_map* tmap,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_deserialize_list_element (std::ofstream& out,
t_list* tlist,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_serialize_field (std::ofstream& out,
t_field* tfield,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_serialize_struct (std::ofstream& out,
t_struct* tstruct,
void generate_serialize_container (std::ofstream& out,
t_type* ttype,
- std::string prefix="");
+ std::string prefix="",
+ bool has_metadata = true);
void generate_serialize_map_element (std::ofstream& out,
t_map* tmap,
std::string iter,
- std::string map);
+ std::string map,
+ bool has_metadata = true);
void generate_serialize_set_element (std::ofstream& out,
t_set* tmap,
- std::string iter);
+ std::string iter,
+ bool has_metadata = true);
void generate_serialize_list_element (std::ofstream& out,
t_list* tlist,
- std::string iter);
+ std::string iter,
+ bool has_metadata = true);
void generate_java_doc (std::ofstream& out,
t_field* field);
bool gen_hash_code_;
bool android_legacy_;
bool java5_;
-
};
return
string() +
hash_builder +
+ "import org.apache.thrift.scheme.IScheme;\n" +
+ "import org.apache.thrift.scheme.SchemeFactory;\n" +
+ "import org.apache.thrift.scheme.StandardScheme;\n\n" +
+ "import org.apache.thrift.scheme.TupleScheme;\n" +
+ "import org.apache.thrift.protocol.TTupleProtocol;\n" +
"import java.util.List;\n" +
"import java.util.ArrayList;\n" +
"import java.util.Map;\n" +
indent(f_enum) << "case " << value << ":" << endl;
indent(f_enum) << " return " << (*c_iter)->get_name() << ";" << endl;
}
-
+
indent(f_enum) << "default:" << endl;
indent(f_enum) << " return null;" << endl;
indent_down();
indent(f_enum) << "}" << endl;
-
+
indent_down();
indent(f_enum) << "}" << endl;
false);
}
indent_down();
- indent(f_consts) <<
- "}" << endl;
+ indent(f_consts) << "}" << endl;
f_consts.close();
}
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
- case t_base_type::TYPE_STRING:
- render << '"' << get_escaped_string(value) << '"';
- break;
- case t_base_type::TYPE_BOOL:
- render << ((value->get_integer() > 0) ? "true" : "false");
- break;
- case t_base_type::TYPE_BYTE:
- render << "(byte)" << value->get_integer();
- break;
- case t_base_type::TYPE_I16:
- render << "(short)" << value->get_integer();
- break;
- case t_base_type::TYPE_I32:
- render << value->get_integer();
- break;
- case t_base_type::TYPE_I64:
- render << value->get_integer() << "L";
- break;
- case t_base_type::TYPE_DOUBLE:
- if (value->get_type() == t_const_value::CV_INTEGER) {
- render << "(double)" << value->get_integer();
- } else {
- render << value->get_double();
- }
- break;
- default:
- throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
+ case t_base_type::TYPE_STRING:
+ render << '"' << get_escaped_string(value) << '"';
+ break;
+ case t_base_type::TYPE_BOOL:
+ render << ((value->get_integer() > 0) ? "true" : "false");
+ break;
+ case t_base_type::TYPE_BYTE:
+ render << "(byte)" << value->get_integer();
+ break;
+ case t_base_type::TYPE_I16:
+ render << "(short)" << value->get_integer();
+ break;
+ case t_base_type::TYPE_I32:
+ render << value->get_integer();
+ break;
+ case t_base_type::TYPE_I64:
+ render << value->get_integer() << "L";
+ break;
+ case t_base_type::TYPE_DOUBLE:
+ if (value->get_type() == t_const_value::CV_INTEGER) {
+ render << "(double)" << value->get_integer();
+ } else {
+ render << value->get_double();
+ }
+ break;
+ default:
+ throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
}
} else if (type->is_enum()) {
render << type->get_program()->get_namespace("java") << "." << value->get_identifier_with_parent();
f_struct <<
autogen_comment() <<
java_package() <<
- java_type_imports();
+ java_type_imports();
generate_java_struct_definition(f_struct,
tstruct,
f_struct << endl;
generate_union_is_set_methods(f_struct, tstruct);
-
+
f_struct << endl;
generate_union_comparisons(f_struct, tstruct);
f_struct << endl;
+ // generate_java_struct_standard_scheme(f_struct, tstruct);
+
+ f_struct << endl;
+
scope_down(f_struct);
f_struct.close();
void t_java_generator::generate_union_getters_and_setters(ofstream& out, t_struct* tstruct) {
const vector<t_field*>& members = tstruct->get_members();
vector<t_field*>::const_iterator m_iter;
-
+
bool first = true;
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
if (first) {
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
t_field* field = (*m_iter);
-
+
indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
indent(out) << " if (value instanceof " << type_name(field->get_type(), true, false, true) << ") {" << endl;
indent(out) << " break;" << endl;
<< "', but got \" + value.getClass().getSimpleName());" << endl;
// do the real check here
}
-
+
indent(out) << "default:" << endl;
indent(out) << " throw new IllegalArgumentException(\"Unknown field id \" + setField);" << endl;
indent_down();
indent(out) << "}" << endl;
-
+
indent_down();
indent(out) << "}" << endl;
}
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
t_field* field = (*m_iter);
-
+
indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
indent_up();
indent(out) << "if (field.type == " << constant_name(field->get_name()) << "_FIELD_DESC.type) {" << endl;
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
t_field* field = (*m_iter);
-
+
indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
indent_up();
indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name()
<< " = (" << type_name(field->get_type(), true, false) << ")value_;" << endl;
- generate_serialize_field(out, field, "");
+ generate_serialize_field(out, field, "", false);
indent(out) << "return;" << endl;
indent_down();
}
-
+
indent(out) << "default:" << endl;
indent(out) << " throw new IllegalStateException(\"Cannot write union with unknown field \" + setField_);" << endl;
indent_down();
-
-
indent(out) << "}" << endl;
}
indent(out) << "@Override" << endl;
indent(out) << "protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {" << endl;
indent_up();
-
+
const vector<t_field*>& members = tstruct->get_members();
vector<t_field*>::const_iterator m_iter;
indent(out) <<
"public " << (is_final ? "final " : "") <<
- (in_class ? "static " : "") << "class " << tstruct->get_name() << " ";
+ (in_class ? "static " : "") << "class " << tstruct->get_name() << " ";
if (is_exception) {
out << "extends Exception ";
out << endl;
+ generate_scheme_map(out, tstruct);
+
+ out << endl;
+
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
if (bean_style_ || private_members_) {
indent(out) << "private ";
indent(out) << "// isset id assignments" << endl;
int i = 0;
+ int optionals = 0;
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
+ if ((*m_iter)->get_req() == t_field::T_OPTIONAL) {
+ optionals++;
+ }
if (!type_can_be_null((*m_iter)->get_type())) {
indent(out) << "private static final int " << isset_field_id(*m_iter)
<< " = " << i << ";" << endl;
if (i > 0) {
indent(out) << "private BitSet __isset_bit_vector = new BitSet(" << i << ");" << endl;
}
-
- out << endl;
+ if (optionals > 0) {
+ std::string output_string = "private _Fields optionals[] = {";
+ for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
+ if ((*m_iter)->get_req() == t_field::T_OPTIONAL) {
+ output_string = output_string + "_Fields." + constant_name((*m_iter)->get_name()) + ",";
+ }
+ }
+ indent(out) << output_string.substr(0, output_string.length() - 1) << "};" << endl;
+ }
}
generate_java_meta_data_map(out, tstruct);
if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
indent(out) << "this." << (*m_iter)->get_name() << " = " <<
(*m_iter)->get_name() << ";" << endl;
- generate_isset_set(out, (*m_iter));
+ generate_isset_set(out, (*m_iter), "");
}
}
+
indent_down();
indent(out) << "}" << endl << endl;
}
generate_java_struct_write_object(out, tstruct);
generate_java_struct_read_object(out, tstruct);
+ generate_java_struct_standard_scheme(out, tstruct);
+ generate_java_struct_tuple_scheme(out, tstruct);
+
scope_down(out);
out << endl;
}
out <<
indent() << "boolean this_present_" << name << " = "
- << this_present << ";" << endl <<
+ << this_present << ";" << endl <<
indent() << "boolean that_present_" << name << " = "
- << that_present << ";" << endl <<
+ << that_present << ";" << endl <<
indent() << "if (" << "this_present_" << name
- << " || that_present_" << name << ") {" << endl;
+ << " || that_present_" << name << ") {" << endl;
indent_up();
out <<
indent() << "if (!(" << "this_present_" << name
- << " && that_present_" << name << "))" << endl <<
+ << " && that_present_" << name << "))" << endl <<
indent() << " return false;" << endl;
if (t->is_base_type() && ((t_base_type*)t)->is_binary()) {
*/
void t_java_generator::generate_java_struct_reader(ofstream& out,
t_struct* tstruct) {
- out <<
- indent() << "public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {" << endl;
+ indent(out) << "public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {" << endl;
indent_up();
-
- const vector<t_field*>& fields = tstruct->get_members();
- vector<t_field*>::const_iterator f_iter;
-
- // Declare stack tmp variables and read struct header
- out <<
- indent() << "org.apache.thrift.protocol.TField field;" << endl <<
- indent() << "iprot.readStructBegin();" << endl;
-
- // Loop over reading in fields
- indent(out) <<
- "while (true)" << endl;
- scope_up(out);
-
- // Read beginning field marker
- indent(out) <<
- "field = iprot.readFieldBegin();" << endl;
-
- // Check for field STOP marker and break
- indent(out) <<
- "if (field.type == org.apache.thrift.protocol.TType.STOP) { " << endl;
- indent_up();
- indent(out) <<
- "break;" << endl;
- indent_down();
- indent(out) <<
- "}" << endl;
-
- // Switch statement on the field we are reading
- indent(out) << "switch (field.id) {" << endl;
-
- indent_up();
-
- // Generate deserialization code for known cases
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- indent(out) <<
- "case " << (*f_iter)->get_key() << ": // " << constant_name((*f_iter)->get_name()) << endl;
- indent_up();
- indent(out) <<
- "if (field.type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
- indent_up();
-
- generate_deserialize_field(out, *f_iter, "this.");
- generate_isset_set(out, *f_iter);
- indent_down();
- out <<
- indent() << "} else { " << endl <<
- indent() << " org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);" << endl <<
- indent() << "}" << endl <<
- indent() << "break;" << endl;
- indent_down();
- }
-
- indent(out) << "default:" << endl;
- indent(out) << " org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);" << endl;
-
- indent_down();
- indent(out) << "}" << endl;
-
- // Read field end marker
- indent(out) <<
- "iprot.readFieldEnd();" << endl;
-
- indent_down();
- indent(out) << "}" << endl;
-
- out <<
- indent() << "iprot.readStructEnd();" << endl;
-
- // in non-beans style, check for required fields of primitive type
- // (which can be checked here but not in the general validate method)
- if (!bean_style_){
- out << endl << indent() << "// check for required fields of primitive type, which can't be checked in the validate method" << endl;
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
- out <<
- indent() << "if (!" << generate_isset_check(*f_iter) << ") {" << endl <<
- indent() << " throw new org.apache.thrift.protocol.TProtocolException(\"Required field '" << (*f_iter)->get_name() << "' was not found in serialized data! Struct: \" + toString());" << endl <<
- indent() << "}" << endl;
- }
- }
- }
-
- // performs various checks (e.g. check that all required fields are set)
- indent(out) << "validate();" << endl;
-
+ indent(out) << "schemes.get(iprot.getScheme()).getScheme().read(iprot, this);" << endl;
indent_down();
- out <<
- indent() << "}" << endl <<
- endl;
+ indent(out) << "}" << endl <<
+ endl;
}
// generates java method to perform various checks
// (e.g. check that all required fields are set)
void t_java_generator::generate_java_validator(ofstream& out,
- t_struct* tstruct){
+ t_struct* tstruct){
indent(out) << "public void validate() throws org.apache.thrift.TException {" << endl;
indent_up();
*/
void t_java_generator::generate_java_struct_writer(ofstream& out,
t_struct* tstruct) {
- out <<
- indent() << "public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {" << endl;
+ indent(out) << "public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {" << endl;
indent_up();
-
- string name = tstruct->get_name();
- const vector<t_field*>& fields = tstruct->get_sorted_members();
- vector<t_field*>::const_iterator f_iter;
-
- // performs various checks (e.g. check that all required fields are set)
- indent(out) << "validate();" << endl << endl;
-
- indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- bool null_allowed = type_can_be_null((*f_iter)->get_type());
- if (null_allowed) {
- out <<
- indent() << "if (this." << (*f_iter)->get_name() << " != null) {" << endl;
- indent_up();
- }
- bool optional = (*f_iter)->get_req() == t_field::T_OPTIONAL;
- if (optional) {
- indent(out) << "if (" << generate_isset_check((*f_iter)) << ") {" << endl;
- indent_up();
- }
-
- indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name()) << "_FIELD_DESC);" << endl;
-
- // Write field contents
- generate_serialize_field(out, *f_iter, "this.");
-
- // Write field closer
- indent(out) <<
- "oprot.writeFieldEnd();" << endl;
-
- if (optional) {
- indent_down();
- indent(out) << "}" << endl;
- }
- if (null_allowed) {
- indent_down();
- indent(out) << "}" << endl;
- }
- }
- // Write the struct map
- out <<
- indent() << "oprot.writeFieldStop();" << endl <<
- indent() << "oprot.writeStructEnd();" << endl;
+ indent(out) << "schemes.get(oprot.getScheme()).getScheme().write(oprot, this);" << endl;
indent_down();
- out <<
- indent() << "}" << endl <<
- endl;
+ indent(out) << " }" << endl << endl;
}
/**
*/
void t_java_generator::generate_java_struct_result_writer(ofstream& out,
t_struct* tstruct) {
- out <<
- indent() << "public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {" << endl;
+ indent(out) << "public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {" << endl;
indent_up();
-
- string name = tstruct->get_name();
- const vector<t_field*>& fields = tstruct->get_sorted_members();
- vector<t_field*>::const_iterator f_iter;
-
- indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
- bool first = true;
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if (first) {
- first = false;
- out <<
- endl <<
- indent() << "if ";
- } else {
- out << " else if ";
- }
-
- out << "(this." << generate_isset_check(*f_iter) << ") {" << endl;
-
- indent_up();
-
- indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name()) << "_FIELD_DESC);" << endl;
-
- // Write field contents
- generate_serialize_field(out, *f_iter, "this.");
-
- // Write field closer
- indent(out) <<
- "oprot.writeFieldEnd();" << endl;
-
- indent_down();
- indent(out) << "}";
- }
- // Write the struct map
- out <<
- endl <<
- indent() << "oprot.writeFieldStop();" << endl <<
- indent() << "oprot.writeStructEnd();" << endl;
-
+ indent(out) << "schemes.get(oprot.getScheme()).getScheme().write(oprot, this);" << endl;
+
indent_down();
- out <<
- indent() << "}" << endl <<
- endl;
+ indent(out) << " }" << endl << endl;
}
void t_java_generator::generate_java_struct_field_by_id(ofstream& out, t_struct* tstruct) {
}
void t_java_generator::generate_generic_field_getters_setters(std::ofstream& out, t_struct* tstruct) {
-
std::ostringstream getter_stream;
std::ostringstream setter_stream;
}
if (type->is_set() || type->is_list()) {
-
t_type* element_type;
if (type->is_set()) {
element_type = ((t_set*)type)->get_elem_type();
indent(out) << "this." << field_name << ".add(elem);" << endl;
indent_down();
indent(out) << "}" << endl << endl;
-
} else if (type->is_map()) {
// Put to map
t_type* key_type = ((t_map*)type)->get_key_type();
}
out << " set" << cap_name << "(" << type_name(type) << " " << field_name << ") {" << endl;
indent_up();
- indent(out) << "this." << field_name << " = " << field_name << ";" <<
- endl;
- generate_isset_set(out, field);
+ indent(out) << "this." << field_name << " = " << field_name << ";" << endl;
+ generate_isset_set(out, field, "");
if (!bean_style_) {
indent(out) << "return this;" << endl;
}
indent(out) << "} else {" << endl;
indent_up();
}
-
+
if (field->get_type()->is_base_type() && ((t_base_type*)(field->get_type()))->is_binary()) {
indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);" << endl;
} else {
indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << endl;
}
-
+
if (can_be_null) {
indent_down();
indent(out) << "}" << endl;
indent() << "return sb.toString();" << endl;
indent_down();
- indent(out) << "}" << endl <<
- endl;
+ indent(out) << "}" << endl << endl;
}
/**
java_package() <<
java_type_imports();
- f_service_ <<
- "public class " << service_name_ << " {" << endl <<
- endl;
+ f_service_ << "public class " << service_name_ << " {" << endl << endl;
indent_up();
// Generate the three main parts of the service
indent_down();
indent(f_service_) << "}" << endl << endl;
- indent(f_service_) <<
- "public Client(org.apache.thrift.protocol.TProtocol prot)" << endl;
+ indent(f_service_) << "public Client(org.apache.thrift.protocol.TProtocol prot)" << endl;
scope_up(f_service_);
- indent(f_service_) <<
- "super(prot, prot);" << endl;
+ indent(f_service_) << "super(prot, prot);" << endl;
scope_down(f_service_);
f_service_ << endl;
string funname = (*f_iter)->get_name();
// Open function
- indent(f_service_) <<
- "public " << function_signature(*f_iter) << endl;
+ indent(f_service_) << "public " << function_signature(*f_iter) << endl;
scope_up(f_service_);
- indent(f_service_) <<
- "send_" << funname << "(";
+ indent(f_service_) << "send_" << funname << "(";
// Get the struct of function call params
t_struct* arg_struct = (*f_iter)->get_arglist();
indent(f_service_) << argsname << " args = new " << argsname << "();" << endl;
for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
- f_service_ <<
- indent() << "args.set" << get_cap_name((*fld_iter)->get_name()) << "(" << (*fld_iter)->get_name() << ");" << endl;
+ indent(f_service_) << "args.set" << get_cap_name((*fld_iter)->get_name()) << "(" << (*fld_iter)->get_name() << ");" << endl;
}
indent(f_service_) << "sendBase(\"" << funname << "\", args);" << endl;
// If you get here it's an exception, unless a void function
if ((*f_iter)->get_returntype()->is_void()) {
- indent(f_service_) <<
- "return;" << endl;
+ indent(f_service_) << "return;" << endl;
} else {
f_service_ <<
indent() << "throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, \"" << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
}
indent_down();
- indent(f_service_) <<
- "}" << endl;
+ indent(f_service_) << "}" << endl;
}
void t_java_generator::generate_service_async_client(t_service* tservice) {
// Try block for a function with exceptions
if (xceptions.size() > 0) {
- f_service_ <<
- indent() << "try {" << endl;
+ f_service_ << indent() << "try {" << endl;
indent_up();
}
if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
f_service_ << "result.success = ";
}
- f_service_ <<
- "iface." << tfunction->get_name() << "(";
+ f_service_ << "iface." << tfunction->get_name() << "(";
bool first = true;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
if (first) {
// Set isset on success field
if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void() && !type_can_be_null(tfunction->get_returntype())) {
- f_service_ <<
- indent() << "result.set" << get_cap_name("success") << get_cap_name("isSet") << "(true);" << endl;
+ indent(f_service_) << "result.set" << get_cap_name("success") << get_cap_name("isSet") << "(true);" << endl;
}
if (!tfunction->is_oneway() && xceptions.size() > 0) {
// Close class
indent_down();
- f_service_ <<
- indent() << "}" << endl <<
- endl;
+ f_service_ << indent() << "}" << endl << endl;
}
/**
*/
void t_java_generator::generate_deserialize_field(ofstream& out,
t_field* tfield,
- string prefix) {
+ string prefix, bool has_metadata) {
t_type* type = get_true_type(tfield->get_type());
if (type->is_void()) {
- throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " +
- prefix + tfield->get_name();
+ throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
}
string name = prefix + tfield->get_name();
(t_struct*)type,
name);
} else if (type->is_container()) {
- generate_deserialize_container(out, type, name);
+ generate_deserialize_container(out, type, name, has_metadata);
} else if (type->is_base_type()) {
indent(out) << name << " = iprot.";
+
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
case t_base_type::TYPE_VOID:
- throw "compiler error: cannot serialize void field in a struct: " +
- name;
+ throw "compiler error: cannot serialize void field in a struct: " + name;
break;
case t_base_type::TYPE_STRING:
if (((t_base_type*)type)->is_binary()) {
*/
void t_java_generator::generate_deserialize_container(ofstream& out,
t_type* ttype,
- string prefix) {
+ string prefix, bool has_metadata) {
+
scope_up(out);
string obj;
obj = tmp("_list");
}
- // Declare variables, read header
- if (ttype->is_map()) {
- indent(out) << "org.apache.thrift.protocol.TMap " << obj << " = iprot.readMapBegin();" << endl;
- } else if (ttype->is_set()) {
- indent(out) << "org.apache.thrift.protocol.TSet " << obj << " = iprot.readSetBegin();" << endl;
- } else if (ttype->is_list()) {
- indent(out) << "org.apache.thrift.protocol.TList " << obj << " = iprot.readListBegin();" << endl;
+ if (has_metadata) {
+ // Declare variables, read header
+ if (ttype->is_map()) {
+ indent(out) << "org.apache.thrift.protocol.TMap " << obj << " = iprot.readMapBegin();" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "org.apache.thrift.protocol.TSet " << obj << " = iprot.readSetBegin();" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "org.apache.thrift.protocol.TList " << obj << " = iprot.readListBegin();" << endl;
+ }
+ } else {
+ // Declare variables, read header
+ if (ttype->is_map()) {
+ indent(out) << "org.apache.thrift.protocol.TMap " << obj << " = new org.apache.thrift.protocol.TMap(" <<
+ type_to_enum(((t_map*)ttype)->get_key_type()) << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << "iprot.readI32());" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "org.apache.thrift.protocol.TSet " << obj << " = new org.apache.thrift.protocol.TSet(" <<
+ type_to_enum(((t_set*)ttype)->get_elem_type()) << ", iprot.readI32());" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "org.apache.thrift.protocol.TList " << obj << " = new org.apache.thrift.protocol.TList(" <<
+ type_to_enum(((t_set*)ttype)->get_elem_type()) << ", iprot.readI32());" << endl;
+ }
}
- indent(out)
- << prefix << " = new " << type_name(ttype, false, true)
- // size the collection correctly
- << "("
+ indent(out) << prefix << " = new " << type_name(ttype, false, true);
+ // size the collection correctly
+ out << "("
<< (ttype->is_list() ? "" : "2*" )
<< obj << ".size"
<< ");" << endl;
i << " < " << obj << ".size" << "; " <<
"++" << i << ")" << endl;
- scope_up(out);
-
- if (ttype->is_map()) {
- generate_deserialize_map_element(out, (t_map*)ttype, prefix);
- } else if (ttype->is_set()) {
- generate_deserialize_set_element(out, (t_set*)ttype, prefix);
- } else if (ttype->is_list()) {
- generate_deserialize_list_element(out, (t_list*)ttype, prefix);
- }
-
- scope_down(out);
+ scope_up(out);
- // Read container end
if (ttype->is_map()) {
- indent(out) << "iprot.readMapEnd();" << endl;
+ generate_deserialize_map_element(out, (t_map*)ttype, prefix, has_metadata);
} else if (ttype->is_set()) {
- indent(out) << "iprot.readSetEnd();" << endl;
+ generate_deserialize_set_element(out, (t_set*)ttype, prefix, has_metadata);
} else if (ttype->is_list()) {
- indent(out) << "iprot.readListEnd();" << endl;
+ generate_deserialize_list_element(out, (t_list*)ttype, prefix, has_metadata);
}
scope_down(out);
-}
-
+
+ if (has_metadata) {
+ // Read container end
+ if (ttype->is_map()) {
+ indent(out) << "iprot.readMapEnd();" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "iprot.readSetEnd();" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "iprot.readListEnd();" << endl;
+ }
+ }
+ scope_down(out);
+}
+
/**
* Generates code to deserialize a map
*/
void t_java_generator::generate_deserialize_map_element(ofstream& out,
t_map* tmap,
- string prefix) {
+ string prefix, bool has_metadata) {
string key = tmp("_key");
string val = tmp("_val");
t_field fkey(tmap->get_key_type(), key);
t_field fval(tmap->get_val_type(), val);
- indent(out) <<
- declare_field(&fkey) << endl;
- indent(out) <<
- declare_field(&fval) << endl;
+ indent(out) << declare_field(&fkey) << endl;
+ indent(out) << declare_field(&fval) << endl;
- generate_deserialize_field(out, &fkey);
- generate_deserialize_field(out, &fval);
+ generate_deserialize_field(out, &fkey, "", has_metadata);
+ generate_deserialize_field(out, &fval, "", has_metadata);
- indent(out) <<
- prefix << ".put(" << key << ", " << val << ");" << endl;
+ indent(out) << prefix << ".put(" << key << ", " << val << ");" << endl;
}
/**
*/
void t_java_generator::generate_deserialize_set_element(ofstream& out,
t_set* tset,
- string prefix) {
+ string prefix, bool has_metadata) {
string elem = tmp("_elem");
t_field felem(tset->get_elem_type(), elem);
- indent(out) <<
- declare_field(&felem) << endl;
+ indent(out) << declare_field(&felem) << endl;
- generate_deserialize_field(out, &felem);
+ generate_deserialize_field(out, &felem, "", has_metadata);
- indent(out) <<
- prefix << ".add(" << elem << ");" << endl;
+ indent(out) << prefix << ".add(" << elem << ");" << endl;
}
/**
*/
void t_java_generator::generate_deserialize_list_element(ofstream& out,
t_list* tlist,
- string prefix) {
+ string prefix, bool has_metadata) {
string elem = tmp("_elem");
t_field felem(tlist->get_elem_type(), elem);
- indent(out) <<
- declare_field(&felem) << endl;
+ indent(out) << declare_field(&felem) << endl;
- generate_deserialize_field(out, &felem);
+ generate_deserialize_field(out, &felem, "", has_metadata);
- indent(out) <<
- prefix << ".add(" << elem << ");" << endl;
+ indent(out) << prefix << ".add(" << elem << ");" << endl;
}
-
/**
* Serializes a field of any type.
*
*/
void t_java_generator::generate_serialize_field(ofstream& out,
t_field* tfield,
- string prefix) {
+ string prefix, bool has_metadata) {
t_type* type = get_true_type(tfield->get_type());
// Do nothing for void types
if (type->is_void()) {
- throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " +
- prefix + tfield->get_name();
+ throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
}
if (type->is_struct() || type->is_xception()) {
} else if (type->is_container()) {
generate_serialize_container(out,
type,
- prefix + tfield->get_name());
+ prefix + tfield->get_name(), has_metadata);
} else if (type->is_enum()){
indent(out) << "oprot.writeI32(" << prefix + tfield->get_name() << ".getValue());" << endl;
} else if (type->is_base_type()) {
string name = prefix + tfield->get_name();
- indent(out) <<
- "oprot.";
+ indent(out) << "oprot.";
if (type->is_base_type()) {
- t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
+ t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
- case t_base_type::TYPE_VOID:
- throw
- "compiler error: cannot serialize void field in a struct: " + name;
- break;
- case t_base_type::TYPE_STRING:
- if (((t_base_type*)type)->is_binary()) {
- out << "writeBinary(" << name << ");";
- } else {
- out << "writeString(" << name << ");";
- }
- break;
- case t_base_type::TYPE_BOOL:
- out << "writeBool(" << name << ");";
- break;
- case t_base_type::TYPE_BYTE:
- out << "writeByte(" << name << ");";
- break;
- case t_base_type::TYPE_I16:
- out << "writeI16(" << name << ");";
- break;
- case t_base_type::TYPE_I32:
- out << "writeI32(" << name << ");";
- break;
- case t_base_type::TYPE_I64:
- out << "writeI64(" << name << ");";
- break;
- case t_base_type::TYPE_DOUBLE:
- out << "writeDouble(" << name << ");";
- break;
- default:
- throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
+ case t_base_type::TYPE_VOID:
+ throw "compiler error: cannot serialize void field in a struct: " + name;
+ break;
+ case t_base_type::TYPE_STRING:
+ if (((t_base_type*)type)->is_binary()) {
+ out << "writeBinary(" << name << ");";
+ } else {
+ out << "writeString(" << name << ");";
+ }
+ break;
+ case t_base_type::TYPE_BOOL:
+ out << "writeBool(" << name << ");";
+ break;
+ case t_base_type::TYPE_BYTE:
+ out << "writeByte(" << name << ");";
+ break;
+ case t_base_type::TYPE_I16:
+ out << "writeI16(" << name << ");";
+ break;
+ case t_base_type::TYPE_I32:
+ out << "writeI32(" << name << ");";
+ break;
+ case t_base_type::TYPE_I64:
+ out << "writeI64(" << name << ");";
+ break;
+ case t_base_type::TYPE_DOUBLE:
+ out << "writeDouble(" << name << ");";
+ break;
+ default:
+ throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
}
} else if (type->is_enum()) {
- out << "writeI32(" << name << ");";
+ out << "writeI32(struct." << name << ");";
}
out << endl;
} else {
t_struct* tstruct,
string prefix) {
(void) tstruct;
- out <<
- indent() << prefix << ".write(oprot);" << endl;
+ out << indent() << prefix << ".write(oprot);" << endl;
}
/**
*/
void t_java_generator::generate_serialize_container(ofstream& out,
t_type* ttype,
- string prefix) {
+ string prefix, bool has_metadata) {
scope_up(out);
- if (ttype->is_map()) {
- indent(out) <<
- "oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(" <<
- type_to_enum(((t_map*)ttype)->get_key_type()) << ", " <<
- type_to_enum(((t_map*)ttype)->get_val_type()) << ", " <<
- prefix << ".size()));" << endl;
- } else if (ttype->is_set()) {
- indent(out) <<
- "oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(" <<
- type_to_enum(((t_set*)ttype)->get_elem_type()) << ", " <<
- prefix << ".size()));" << endl;
- } else if (ttype->is_list()) {
- indent(out) <<
- "oprot.writeListBegin(new org.apache.thrift.protocol.TList(" <<
- type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " <<
- prefix << ".size()));" << endl;
+ if (has_metadata) {
+ if (ttype->is_map()) {
+ indent(out) <<
+ "oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(" <<
+ type_to_enum(((t_map*)ttype)->get_key_type()) << ", " <<
+ type_to_enum(((t_map*)ttype)->get_val_type()) << ", " <<
+ prefix << ".size()));" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) <<
+ "oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(" <<
+ type_to_enum(((t_set*)ttype)->get_elem_type()) << ", " <<
+ prefix << ".size()));" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) <<
+ "oprot.writeListBegin(new org.apache.thrift.protocol.TList(" <<
+ type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " <<
+ prefix << ".size()));" << endl;
+ }
+ } else {
+ indent(out) << "oprot.writeI32(" << prefix << ".size());" << endl;
}
string iter = tmp("_iter");
out << endl;
scope_up(out);
if (ttype->is_map()) {
- generate_serialize_map_element(out, (t_map*)ttype, iter, prefix);
+ generate_serialize_map_element(out, (t_map*)ttype, iter, prefix, has_metadata);
} else if (ttype->is_set()) {
- generate_serialize_set_element(out, (t_set*)ttype, iter);
+ generate_serialize_set_element(out, (t_set*)ttype, iter, has_metadata);
} else if (ttype->is_list()) {
- generate_serialize_list_element(out, (t_list*)ttype, iter);
+ generate_serialize_list_element(out, (t_list*)ttype, iter, has_metadata);
}
scope_down(out);
- if (ttype->is_map()) {
- indent(out) <<
- "oprot.writeMapEnd();" << endl;
- } else if (ttype->is_set()) {
- indent(out) <<
- "oprot.writeSetEnd();" << endl;
- } else if (ttype->is_list()) {
- indent(out) <<
- "oprot.writeListEnd();" << endl;
+ if (has_metadata) {
+ if (ttype->is_map()) {
+ indent(out) << "oprot.writeMapEnd();" << endl;
+ } else if (ttype->is_set()) {
+ indent(out) << "oprot.writeSetEnd();" << endl;
+ } else if (ttype->is_list()) {
+ indent(out) << "oprot.writeListEnd();" << endl;
+ }
}
scope_down(out);
void t_java_generator::generate_serialize_map_element(ofstream& out,
t_map* tmap,
string iter,
- string map) {
+ string map, bool has_metadata) {
(void) map;
t_field kfield(tmap->get_key_type(), iter + ".getKey()");
- generate_serialize_field(out, &kfield, "");
+ generate_serialize_field(out, &kfield, "", has_metadata);
t_field vfield(tmap->get_val_type(), iter + ".getValue()");
- generate_serialize_field(out, &vfield, "");
+ generate_serialize_field(out, &vfield, "", has_metadata);
}
/**
*/
void t_java_generator::generate_serialize_set_element(ofstream& out,
t_set* tset,
- string iter) {
+ string iter,
+ bool has_metadata) {
t_field efield(tset->get_elem_type(), iter);
- generate_serialize_field(out, &efield, "");
+ generate_serialize_field(out, &efield, "", has_metadata);
}
/**
*/
void t_java_generator::generate_serialize_list_element(ofstream& out,
t_list* tlist,
- string iter) {
+ string iter,
+ bool has_metadata) {
t_field efield(tlist->get_elem_type(), iter);
- generate_serialize_field(out, &efield, "");
+ generate_serialize_field(out, &efield, "", has_metadata);
}
/**
prefix = "Map";
}
return prefix + (skip_generic ? "" : "<" +
- type_name(tmap->get_key_type(), true) + "," +
- type_name(tmap->get_val_type(), true) + ">");
+ type_name(tmap->get_key_type(), true) + "," +
+ type_name(tmap->get_val_type(), true) + ">");
} else if (ttype->is_set()) {
t_set* tset = (t_set*) ttype;
if (in_init) {
t_base_type::t_base tbase = type->get_base();
switch (tbase) {
- case t_base_type::TYPE_VOID:
- return "void";
- case t_base_type::TYPE_STRING:
- if (type->is_binary()) {
- return "ByteBuffer";
- } else {
- return "String";
- }
- case t_base_type::TYPE_BOOL:
- return (in_container ? "Boolean" : "boolean");
- case t_base_type::TYPE_BYTE:
- return (in_container ? "Byte" : "byte");
- case t_base_type::TYPE_I16:
- return (in_container ? "Short" : "short");
- case t_base_type::TYPE_I32:
- return (in_container ? "Integer" : "int");
- case t_base_type::TYPE_I64:
- return (in_container ? "Long" : "long");
- case t_base_type::TYPE_DOUBLE:
- return (in_container ? "Double" : "double");
- default:
- throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
+ case t_base_type::TYPE_VOID:
+ return "void";
+ case t_base_type::TYPE_STRING:
+ if (type->is_binary()) {
+ return "ByteBuffer";
+ } else {
+ return "String";
+ }
+ case t_base_type::TYPE_BOOL:
+ return (in_container ? "Boolean" : "boolean");
+ case t_base_type::TYPE_BYTE:
+ return (in_container ? "Byte" : "byte");
+ case t_base_type::TYPE_I16:
+ return (in_container ? "Short" : "short");
+ case t_base_type::TYPE_I32:
+ return (in_container ? "Integer" : "int");
+ case t_base_type::TYPE_I64:
+ return (in_container ? "Long" : "long");
+ case t_base_type::TYPE_DOUBLE:
+ return (in_container ? "Double" : "double");
+ default:
+ throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
}
}
} else if (ttype->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
switch (tbase) {
- case t_base_type::TYPE_VOID:
- throw "NO T_VOID CONSTRUCT";
- case t_base_type::TYPE_STRING:
- result += " = null";
- break;
- case t_base_type::TYPE_BOOL:
- result += " = false";
- break;
- case t_base_type::TYPE_BYTE:
- case t_base_type::TYPE_I16:
- case t_base_type::TYPE_I32:
- case t_base_type::TYPE_I64:
- result += " = 0";
- break;
- case t_base_type::TYPE_DOUBLE:
- result += " = (double)0";
- break;
- }
-
+ case t_base_type::TYPE_VOID:
+ throw "NO T_VOID CONSTRUCT";
+ case t_base_type::TYPE_STRING:
+ result += " = null";
+ break;
+ case t_base_type::TYPE_BOOL:
+ result += " = false";
+ break;
+ case t_base_type::TYPE_BYTE:
+ case t_base_type::TYPE_I16:
+ case t_base_type::TYPE_I32:
+ case t_base_type::TYPE_I64:
+ result += " = 0";
+ break;
+ case t_base_type::TYPE_DOUBLE:
+ result += " = (double)0";
+ break;
+ }
} else if (ttype->is_enum()) {
result += " = 0";
} else if (ttype->is_container()) {
}
/**
- * Renders a function signature of the form 'void name(args, resultHandler)'
- *
- * @params tfunction Function definition
- * @return String of rendered function definition
- */
+ * Renders a function signature of the form 'void name(args, resultHandler)'
+ *
+ * @params tfunction Function definition
+ * @return String of rendered function definition
+ */
string t_java_generator::function_signature_async(t_function* tfunction, bool use_base_method, string prefix) {
std::string arglist = async_function_call_arglist(tfunction, use_base_method, true);
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
- case t_base_type::TYPE_VOID:
- throw "NO T_VOID CONSTRUCT";
- case t_base_type::TYPE_STRING:
- return "org.apache.thrift.protocol.TType.STRING";
- case t_base_type::TYPE_BOOL:
- return "org.apache.thrift.protocol.TType.BOOL";
- case t_base_type::TYPE_BYTE:
- return "org.apache.thrift.protocol.TType.BYTE";
- case t_base_type::TYPE_I16:
- return "org.apache.thrift.protocol.TType.I16";
- case t_base_type::TYPE_I32:
- return "org.apache.thrift.protocol.TType.I32";
- case t_base_type::TYPE_I64:
- return "org.apache.thrift.protocol.TType.I64";
- case t_base_type::TYPE_DOUBLE:
- return "org.apache.thrift.protocol.TType.DOUBLE";
+ case t_base_type::TYPE_VOID:
+ throw "NO T_VOID CONSTRUCT";
+ case t_base_type::TYPE_STRING:
+ return "org.apache.thrift.protocol.TType.STRING";
+ case t_base_type::TYPE_BOOL:
+ return "org.apache.thrift.protocol.TType.BOOL";
+ case t_base_type::TYPE_BYTE:
+ return "org.apache.thrift.protocol.TType.BYTE";
+ case t_base_type::TYPE_I16:
+ return "org.apache.thrift.protocol.TType.I16";
+ case t_base_type::TYPE_I32:
+ return "org.apache.thrift.protocol.TType.I32";
+ case t_base_type::TYPE_I64:
+ return "org.apache.thrift.protocol.TType.I64";
+ case t_base_type::TYPE_DOUBLE:
+ return "org.apache.thrift.protocol.TType.DOUBLE";
}
} else if (type->is_enum()) {
return "org.apache.thrift.protocol.TType.I32";
void t_java_generator::generate_java_docstring_comment(ofstream &out, string contents) {
generate_docstring_comment(out,
- "/**\n",
- " * ", contents,
- " */\n");
+ "/**\n",
+ " * ", contents,
+ " */\n");
}
void t_java_generator::generate_java_doc(ofstream &out,
}
}
generate_docstring_comment(out,
- "/**\n",
- " * ", ss.str(),
- " */\n");
+ "/**\n",
+ " * ", ss.str(),
+ " */\n");
}
}
t_container* container = (t_container*)type;
std::string source_name;
if (source_name_p2 == "")
- source_name = source_name_p1;
+ source_name = source_name_p1;
else
- source_name = source_name_p1 + "." + source_name_p2;
+ source_name = source_name_p1 + "." + source_name_p2;
indent(out) << type_name(type, true, false) << " " << result_name << " = new " << type_name(container, false, true) << "();" << endl;
generate_deep_copy_non_container(out, iterator_element_name, "temp_binary_element", elem_type);
out << ";" << endl;
indent(out) << result_name << ".add(temp_binary_element);" << endl;
- }
- else{
+ } else{
indent(out) << result_name << ".add(";
generate_deep_copy_non_container(out, iterator_element_name, result_name, elem_type);
out << ");" << endl;
return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
}
-void t_java_generator::generate_isset_set(ofstream& out, t_field* field) {
+void t_java_generator::generate_isset_set(ofstream& out, t_field* field, string prefix) {
if (!type_can_be_null(field->get_type())) {
- indent(out) << "set" << get_cap_name(field->get_name()) << get_cap_name("isSet") << "(true);" << endl;
+ indent(out) << prefix << "set" << get_cap_name(field->get_name()) << get_cap_name("isSet") << "(true);" << endl;
}
}
void t_java_generator::generate_struct_desc(ofstream& out, t_struct* tstruct) {
indent(out) <<
- "private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct(\"" << tstruct->get_name() << "\");" << endl;
+ "private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct(\"" << tstruct->get_name() << "\");" << endl;
}
void t_java_generator::generate_field_descs(ofstream& out, t_struct* tstruct) {
}
}
+void t_java_generator::generate_scheme_map(ofstream& out, t_struct* tstruct) {
+ indent(out) << "private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();" << endl;
+ indent(out) << "static {" << endl;
+ indent(out) << " schemes.put(StandardScheme.class, new " << tstruct->get_name() << "StandardSchemeFactory());" << endl;
+ indent(out) << " schemes.put(TupleScheme.class, new " << tstruct->get_name() << "TupleSchemeFactory());" << endl;
+ indent(out) << "}" << endl;
+}
+
void t_java_generator::generate_field_name_constants(ofstream& out, t_struct* tstruct) {
indent(out) << "/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */" << endl;
indent(out) << "public enum _Fields implements org.apache.thrift.TFieldIdEnum {" << endl;
void t_java_generator::generate_java_struct_clear(std::ofstream& out, t_struct* tstruct) {
if (!java5_) {
- indent(out) << "@Override" << endl;
+ indent(out) << "@Override" << endl;
}
indent(out) << "public void clear() {" << endl;
indent(out) << "}" << endl << endl;
}
+void t_java_generator::generate_standard_reader(ofstream& out, t_struct* tstruct) {
+ out <<
+ indent() << "public void read(org.apache.thrift.protocol.TProtocol iprot, " << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
+ indent_up();
+
+ const vector<t_field*>& fields = tstruct->get_members();
+ vector<t_field*>::const_iterator f_iter;
+
+ // Declare stack tmp variables and read struct header
+ out <<
+ indent() << "org.apache.thrift.protocol.TField schemeField;" << endl <<
+ indent() << "iprot.readStructBegin();" << endl;
+
+ // Loop over reading in fields
+ indent(out) << "while (true)" << endl;
+ scope_up(out);
+
+ // Read beginning field marker
+ indent(out) << "schemeField = iprot.readFieldBegin();" << endl;
+
+ // Check for field STOP marker and break
+ indent(out) << "if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { " << endl;
+ indent_up();
+ indent(out) << "break;" << endl;
+ indent_down();
+ indent(out) << "}" << endl;
+
+ // Switch statement on the field we are reading
+ indent(out) << "switch (schemeField.id) {" << endl;
+
+ indent_up();
+
+ // Generate deserialization code for known cases
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ indent(out) <<
+ "case " << (*f_iter)->get_key() << ": // " << constant_name((*f_iter)->get_name()) << endl;
+ indent_up();
+ indent(out) <<
+ "if (schemeField.type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
+ indent_up();
+
+ generate_deserialize_field(out, *f_iter, "struct.", false);
+ indent(out) << "struct." << "set" << get_cap_name((*f_iter)->get_name()) << get_cap_name("isSet") << "(true);" << endl;
+ indent_down();
+ out <<
+ indent() << "} else { " << endl <<
+ indent() << " org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);" << endl <<
+ indent() << "}" << endl <<
+ indent() << "break;" << endl;
+ indent_down();
+ }
+
+ indent(out) << "default:" << endl;
+ indent(out) << " org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);" << endl;
+
+ indent_down();
+ indent(out) << "}" << endl;
+
+ // Read field end marker
+ indent(out) << "iprot.readFieldEnd();" << endl;
+
+ indent_down();
+ indent(out) << "}" << endl;
+
+ out <<
+ indent() << "iprot.readStructEnd();" << endl;
+
+ // in non-beans style, check for required fields of primitive type
+ // (which can be checked here but not in the general validate method)
+ if (!bean_style_){
+ out << endl << indent() << "// check for required fields of primitive type, which can't be checked in the validate method" << endl;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
+ out <<
+ indent() << "if (!struct." << generate_isset_check(*f_iter) << ") {" << endl <<
+ indent() << " throw new org.apache.thrift.protocol.TProtocolException(\"Required field '" << (*f_iter)->get_name() << "' was not found in serialized data! Struct: \" + toString());" << endl <<
+ indent() << "}" << endl;
+ }
+ }
+ }
+
+ // performs various checks (e.g. check that all required fields are set)
+ indent(out) << "struct.validate();" << endl;
+
+ indent_down();
+ out << indent() << "}" << endl;
+}
+
+void t_java_generator::generate_standard_writer(ofstream& out, t_struct* tstruct) {
+ indent_up();
+ out <<
+ indent() << "public void write(org.apache.thrift.protocol.TProtocol oprot, " <<
+ tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
+ indent_up();
+ const vector<t_field*>& fields = tstruct->get_sorted_members();
+ vector<t_field*>::const_iterator f_iter;
+
+ // performs various checks (e.g. check that all required fields are set)
+ indent(out) << "struct.validate();" << endl << endl;
+
+ indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
+
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ bool null_allowed = type_can_be_null((*f_iter)->get_type());
+ if (null_allowed) {
+ out <<
+ indent() << "if (struct." << (*f_iter)->get_name() << " != null) {" << endl;
+ indent_up();
+ }
+ bool optional = (*f_iter)->get_req() == t_field::T_OPTIONAL;
+ if (optional) {
+ indent(out) << "if (" << "struct." << generate_isset_check((*f_iter)) << ") {" << endl;
+ indent_up();
+ }
+
+ indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name()) << "_FIELD_DESC);" << endl;
+
+ // Write field contents
+ generate_serialize_field(out, *f_iter, "struct.", false);
+
+ // Write field closer
+ indent(out) << "oprot.writeFieldEnd();" << endl;
+
+ if (optional) {
+ indent_down();
+ indent(out) << "}" << endl;
+ }
+ if (null_allowed) {
+ indent_down();
+ indent(out) << "}" << endl;
+ }
+ }
+ // Write the struct map
+ out <<
+ indent() << "oprot.writeFieldStop();" << endl <<
+ indent() << "oprot.writeStructEnd();" << endl;
+
+ indent_down();
+ out << indent() << "}" << endl << endl;
+ indent_down();
+}
+
+void t_java_generator::generate_java_struct_standard_scheme(ofstream& out, t_struct* tstruct){
+ indent(out) << "private static class " << tstruct->get_name() << "StandardSchemeFactory implements SchemeFactory {" << endl;
+ indent_up();
+ indent(out) << "public " << tstruct->get_name() << "StandardScheme getScheme() {" << endl;
+ indent_up();
+ indent(out) << "return new " << tstruct->get_name() << "StandardScheme();" << endl;
+ indent_down();
+ indent(out) << "}" << endl;
+ indent_down();
+ indent(out) << "}" << endl << endl;
+
+ out << indent() << "private static class " << tstruct->get_name() << "StandardScheme extends StandardScheme<" << tstruct->get_name() << "> {" << endl << endl;
+ indent_up();
+ generate_standard_reader(out, tstruct);
+ indent_down();
+ out << endl;
+ generate_standard_writer(out, tstruct);
+
+ out <<
+ indent() << "}" << endl <<
+ endl;
+}
+
+void t_java_generator::generate_java_struct_tuple_reader(ofstream& out, t_struct* tstruct) {
+ indent(out) << "@Override" << endl;
+ indent(out) << "public void read(org.apache.thrift.protocol.TProtocol prot, " << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
+ indent_up();
+ indent(out) << "TTupleProtocol iprot = (TTupleProtocol) prot;" << endl;
+ int optional_count = 0;
+ const vector<t_field*>& fields = tstruct->get_members();
+ vector<t_field*>::const_iterator f_iter;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_req() == t_field::T_OPTIONAL || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
+ optional_count++;
+ }
+ if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
+ generate_deserialize_field(out, (*f_iter), "struct.", false);
+ indent(out) << "struct.set" << get_cap_name((*f_iter)->get_name()) << get_cap_name("isSet") << "(true);" << endl;
+ }
+ }
+ if (optional_count > 0) {
+ indent(out) << "BitSet incoming = iprot.readBitSet(" << optional_count << ");" << endl;
+ int i = 0;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_req() == t_field::T_OPTIONAL || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
+ indent(out) << "if (incoming.get(" << i << ")) {" << endl;
+ indent_up();
+ generate_deserialize_field(out, (*f_iter), "struct.", false);
+ indent(out) << "struct.set" << get_cap_name((*f_iter)->get_name()) << get_cap_name("isSet") << "(true);" << endl;
+ indent_down();
+ indent(out) << "}" << endl;
+ i++;
+ }
+ }
+ }
+ indent_down();
+ indent(out) << "}" << endl;
+}
+
+void t_java_generator::generate_java_struct_tuple_writer(ofstream& out, t_struct* tstruct) {
+ indent(out) << "@Override" << endl;
+ indent(out) << "public void write(org.apache.thrift.protocol.TProtocol prot, " << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
+ indent_up();
+ indent(out) << "TTupleProtocol oprot = (TTupleProtocol) prot;" << endl;
+
+ const vector<t_field*>& fields = tstruct->get_members();
+ vector<t_field*>::const_iterator f_iter;
+ bool has_optional = false;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_req() == t_field::T_OPTIONAL || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
+ has_optional = true;
+ }
+ if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
+ generate_serialize_field(out, (*f_iter), "struct.", false);
+ }
+ }
+ if (has_optional) {
+ indent(out) << "BitSet optionals = new BitSet();" << endl;
+ int i = 0;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_req() == t_field::T_OPTIONAL || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
+ indent(out) << "if (struct." << generate_isset_check((*f_iter)) << ") {" << endl;
+ indent_up();
+ indent(out) << "optionals.set(" << i << ");" << endl;
+ indent_down();
+ indent(out) << "}" << endl;
+ i++;
+ }
+ }
+
+ indent(out) << "oprot.writeBitSet(optionals);" << endl;
+ int j = 0;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if ((*f_iter)->get_req() == t_field::T_OPTIONAL || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
+ indent(out) << "if (struct." << generate_isset_check(*f_iter) << ") {" << endl;
+ indent_up();
+ generate_serialize_field(out, (*f_iter), "struct.", false);
+ indent_down();
+ indent(out) << "}" << endl;
+ j++;
+ }
+ }
+ }
+ indent_down();
+ indent(out) << "}" << endl;
+}
+
+void t_java_generator::generate_java_struct_tuple_scheme(ofstream& out, t_struct* tstruct){
+ indent(out) << "private static class " << tstruct->get_name() << "TupleSchemeFactory implements SchemeFactory {" << endl;
+ indent_up();
+ indent(out) << "public " << tstruct->get_name() << "TupleScheme getScheme() {" << endl;
+ indent_up();
+ indent(out) << "return new " << tstruct->get_name() << "TupleScheme();" << endl;
+ indent_down();
+ indent(out) << "}" << endl;
+ indent_down();
+ indent(out) << "}" << endl << endl;
+ out << indent() << "private static class " << tstruct->get_name() << "TupleScheme extends TupleScheme<" << tstruct->get_name() << "> {" << endl << endl;
+ indent_up();
+ generate_java_struct_tuple_writer(out, tstruct);
+ out << endl;
+ generate_java_struct_tuple_reader(out, tstruct);
+ indent_down();
+ out << indent() << "}" << endl << endl;
+}
+
THRIFT_REGISTER_GENERATOR(java, "Java",
" beans: Members will be private, and setter methods will return void.\n"
" private-members: Members will be private, but setter methods will return 'this' like usual.\n"
Code Review / common / thrift.git / commitdiff
