THRIFT-303. java: Changes to __isset interface
This patch makes __isset always private and adds a method per field to set the __isset state when not using the bean-style generator.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@741805 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index 347a014..cee43ad 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -628,8 +628,8 @@
if (members.size() > 0) {
out <<
endl <<
- indent() << "public final Isset __isset = new Isset();" << endl <<
- indent() << "public static final class Isset implements java.io.Serializable {" << endl;
+ indent() << "private final Isset __isset = new Isset();" << endl <<
+ indent() << "private static final class Isset implements java.io.Serializable {" << endl;
indent_up();
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
indent(out) <<
@@ -1441,6 +1441,14 @@
indent(out) << "return this.__isset." << field_name << ";" << endl;
indent_down();
indent(out) << "}" << endl << endl;
+
+ if(!bean_style_) {
+ indent(out) << "public void set" << cap_name << get_cap_name("isSet") << "(boolean value) {" << endl;
+ indent_up();
+ indent(out) << "this.__isset." << field_name << " = value;" << endl;
+ indent_down();
+ indent(out) << "}";
+ }
}
}
diff --git a/lib/java/src/org/apache/thrift/TBase.java b/lib/java/src/org/apache/thrift/TBase.java
index ef4e323..bf1dc38 100644
--- a/lib/java/src/org/apache/thrift/TBase.java
+++ b/lib/java/src/org/apache/thrift/TBase.java
@@ -28,14 +28,14 @@
* @param oprot Output protocol
*/
public void write(TProtocol oprot) throws TException;
-
+
/**
* Check if a field is currently set or unset.
*
* @param fieldId The field's id tag as found in the IDL.
*/
public boolean isSet(int fieldId);
-
+
/**
* Get a field's value by id. Primitive types will be wrapped in the
* appropriate "boxed" types.
@@ -43,7 +43,7 @@
* @param fieldId The field's id tag as found in the IDL.
*/
public Object getFieldValue(int fieldId);
-
+
/**
* Set a field's value by id. Primitive types must be "boxed" in the
* appropriate object wrapper type.