THRIFT-3157 Make TBase signature more explicit Client: Java Patch: Roshan George
This closes #498 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/c2d4c77c Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/c2d4c77c Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/c2d4c77c Branch: refs/heads/master Commit: c2d4c77c5aec372bd4f265d6bff6a55c05c6e7c1 Parents: 369d62e Author: Roshan George <[email protected]> Authored: Fri May 15 21:52:06 2015 -0700 Committer: Nobuaki Sukegawa <[email protected]> Committed: Sat Nov 14 17:06:30 2015 +0900 ---------------------------------------------------------------------- lib/java/src/org/apache/thrift/TBase.java | 2 +- lib/java/src/org/apache/thrift/TUnion.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/c2d4c77c/lib/java/src/org/apache/thrift/TBase.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/TBase.java b/lib/java/src/org/apache/thrift/TBase.java index b3ed1bc..8aba8a2 100644 --- a/lib/java/src/org/apache/thrift/TBase.java +++ b/lib/java/src/org/apache/thrift/TBase.java @@ -27,7 +27,7 @@ import org.apache.thrift.protocol.TProtocol; * Generic base interface for generated Thrift objects. * */ -public interface TBase<T extends TBase<?,?>, F extends TFieldIdEnum> extends Comparable<T>, Serializable { +public interface TBase<T extends TBase<T,F>, F extends TFieldIdEnum> extends Comparable<T>, Serializable { /** * Reads the TObject from the given input protocol. http://git-wip-us.apache.org/repos/asf/thrift/blob/c2d4c77c/lib/java/src/org/apache/thrift/TUnion.java ---------------------------------------------------------------------- diff --git a/lib/java/src/org/apache/thrift/TUnion.java b/lib/java/src/org/apache/thrift/TUnion.java index 3052ee1..13f9c67 100644 --- a/lib/java/src/org/apache/thrift/TUnion.java +++ b/lib/java/src/org/apache/thrift/TUnion.java @@ -34,7 +34,7 @@ import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.TupleScheme; -public abstract class TUnion<T extends TUnion<?,?>, F extends TFieldIdEnum> implements TBase<T, F> { +public abstract class TUnion<T extends TUnion<T,F>, F extends TFieldIdEnum> implements TBase<T, F> { protected Object value_; protected F setField_;
