From 04c6267aba644441330376e0d8d51a7338476c7c Mon Sep 17 00:00:00 2001 From: David Reiss Date: Thu, 3 Apr 2008 20:16:28 +0000 Subject: [PATCH] Squelch most Java 1.6 warnings. I actualy wasn't able to test this with Java 1.5. Hopefully it doesn't break anything. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665636 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/com/facebook/thrift/TApplicationException.java | 4 +++- lib/java/src/com/facebook/thrift/TDeserializer.java | 2 -- lib/java/src/com/facebook/thrift/TException.java | 3 +++ lib/java/src/com/facebook/thrift/TSerializer.java | 1 - .../src/com/facebook/thrift/protocol/TBinaryProtocol.java | 5 ++--- lib/java/src/com/facebook/thrift/protocol/TProtocol.java | 1 + .../com/facebook/thrift/protocol/TProtocolException.java | 2 ++ .../com/facebook/thrift/protocol/TSimpleJSONProtocol.java | 7 +++---- .../com/facebook/thrift/transport/TFramedTransport.java | 1 - .../com/facebook/thrift/transport/TTransportException.java | 2 ++ 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/java/src/com/facebook/thrift/TApplicationException.java b/lib/java/src/com/facebook/thrift/TApplicationException.java index 893a3896..fed9a634 100644 --- a/lib/java/src/com/facebook/thrift/TApplicationException.java +++ b/lib/java/src/com/facebook/thrift/TApplicationException.java @@ -19,6 +19,8 @@ import com.facebook.thrift.protocol.TType; */ public class TApplicationException extends TException { + private static final long serialVersionUID = 1L; + public static final int UNKNOWN = 0; public static final int UNKNOWN_METHOD = 1; public static final int INVALID_MESSAGE_TYPE = 2; @@ -52,7 +54,7 @@ public class TApplicationException extends TException { public static TApplicationException read(TProtocol iprot) throws TException { TField field; - TStruct struct = iprot.readStructBegin(); + iprot.readStructBegin(); String message = null; int type = UNKNOWN; diff --git a/lib/java/src/com/facebook/thrift/TDeserializer.java b/lib/java/src/com/facebook/thrift/TDeserializer.java index f2a1ac28..99fd056d 100644 --- a/lib/java/src/com/facebook/thrift/TDeserializer.java +++ b/lib/java/src/com/facebook/thrift/TDeserializer.java @@ -10,10 +10,8 @@ import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; import com.facebook.thrift.protocol.TBinaryProtocol; -import com.facebook.thrift.protocol.TProtocol; import com.facebook.thrift.protocol.TProtocolFactory; import com.facebook.thrift.transport.TIOStreamTransport; -import com.facebook.thrift.transport.TTransport; /** * Generic utility for easily deserializing objects from a byte array or Java diff --git a/lib/java/src/com/facebook/thrift/TException.java b/lib/java/src/com/facebook/thrift/TException.java index a328bfd9..4a7b1a51 100644 --- a/lib/java/src/com/facebook/thrift/TException.java +++ b/lib/java/src/com/facebook/thrift/TException.java @@ -12,6 +12,9 @@ package com.facebook.thrift; * @author Mark Slee */ public class TException extends Exception { + + private static final long serialVersionUID = 1L; + public TException() { super(); } diff --git a/lib/java/src/com/facebook/thrift/TSerializer.java b/lib/java/src/com/facebook/thrift/TSerializer.java index e9dd8824..1df068df 100644 --- a/lib/java/src/com/facebook/thrift/TSerializer.java +++ b/lib/java/src/com/facebook/thrift/TSerializer.java @@ -13,7 +13,6 @@ import com.facebook.thrift.protocol.TBinaryProtocol; import com.facebook.thrift.protocol.TProtocol; import com.facebook.thrift.protocol.TProtocolFactory; import com.facebook.thrift.transport.TIOStreamTransport; -import com.facebook.thrift.transport.TTransport; /** * Generic utility for easily serializing objects into a byte array or Java diff --git a/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java index 750dce11..d8c9473d 100644 --- a/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java +++ b/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java @@ -6,11 +6,10 @@ package com.facebook.thrift.protocol; +import java.io.UnsupportedEncodingException; + import com.facebook.thrift.TException; import com.facebook.thrift.transport.TTransport; -import com.facebook.thrift.transport.TTransportException; - -import java.io.UnsupportedEncodingException; /** * Binary protocol implementation for thrift. diff --git a/lib/java/src/com/facebook/thrift/protocol/TProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TProtocol.java index 3e7e7f05..551ef507 100644 --- a/lib/java/src/com/facebook/thrift/protocol/TProtocol.java +++ b/lib/java/src/com/facebook/thrift/protocol/TProtocol.java @@ -19,6 +19,7 @@ public abstract class TProtocol { /** * Prevent direct instantiation */ + @SuppressWarnings("unused") private TProtocol() {} /** diff --git a/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java b/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java index 9373de3c..cea786a7 100644 --- a/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java +++ b/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java @@ -15,6 +15,8 @@ import com.facebook.thrift.TException; */ public class TProtocolException extends TException { + + private static final long serialVersionUID = 1L; public static final int UNKNOWN = 0; public static final int INVALID_DATA = 1; public static final int NEGATIVE_SIZE = 2; diff --git a/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java index 8cb3b699..b577c0d9 100644 --- a/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java +++ b/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java @@ -6,13 +6,12 @@ package com.facebook.thrift.protocol; -import com.facebook.thrift.TByteArrayOutputStream; -import com.facebook.thrift.TException; -import com.facebook.thrift.transport.TTransport; -import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; import java.util.Stack; +import com.facebook.thrift.TException; +import com.facebook.thrift.transport.TTransport; + /** * JSON protocol implementation for thrift. * diff --git a/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java b/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java index 7121c09c..a9ad4b3b 100644 --- a/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java +++ b/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java @@ -7,7 +7,6 @@ package com.facebook.thrift.transport; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import com.facebook.thrift.TByteArrayOutputStream; diff --git a/lib/java/src/com/facebook/thrift/transport/TTransportException.java b/lib/java/src/com/facebook/thrift/transport/TTransportException.java index 5b035f94..7a04ae12 100644 --- a/lib/java/src/com/facebook/thrift/transport/TTransportException.java +++ b/lib/java/src/com/facebook/thrift/transport/TTransportException.java @@ -15,6 +15,8 @@ import com.facebook.thrift.TException; */ public class TTransportException extends TException { + private static final long serialVersionUID = 1L; + public static final int UNKNOWN = 0; public static final int NOT_OPEN = 1; public static final int ALREADY_OPEN = 2; -- 2.17.1