Author: bryanduxbury
Date: Mon Oct 11 22:01:27 2010
New Revision: 1021531
URL: http://svn.apache.org/viewvc?rev=1021531&view=rev
Log:
clear a bunch of java warnings, unused code and imports, etc
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/Fixtures.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
Mon Oct 11 22:01:27 2010
@@ -29,7 +29,6 @@ import java.util.TreeSet;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeoutException;
-import org.apache.commons.lang.ObjectUtils;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
Mon Oct 11 22:01:27 2010
@@ -30,7 +30,6 @@ import java.nio.channels.Selector;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
-import org.apache.thrift.async.TAsyncClientManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,31 +50,11 @@ public class TNonblockingServerSocket ex
private ServerSocket serverSocket_ = null;
/**
- * Port to listen on
- */
- private int port_ = 0;
-
- /**
* Timeout for client sockets from accept
*/
private int clientTimeout_ = 0;
/**
- * Creates a server socket from underlying socket object
- */
- // public TNonblockingServerSocket(ServerSocket serverSocket) {
- // this(serverSocket, 0);
- // }
-
- /**
- * Creates a server socket from underlying socket object
- */
- // public TNonblockingServerSocket(ServerSocket serverSocket, int
clientTimeout) {
- // serverSocket_ = serverSocket;
- // clientTimeout_ = clientTimeout;
- // }
-
- /**
* Creates just a port listening server socket
*/
public TNonblockingServerSocket(int port) throws TTransportException {
@@ -87,8 +66,7 @@ public class TNonblockingServerSocket ex
*/
public TNonblockingServerSocket(int port, int clientTimeout) throws
TTransportException {
this(new InetSocketAddress(port), clientTimeout);
- port_ = port;
- }
+ }
public TNonblockingServerSocket(InetSocketAddress bindAddr) throws
TTransportException {
this(bindAddr, 0);
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
Mon Oct 11 22:01:27 2010
@@ -20,11 +20,10 @@
package org.apache.thrift.transport;
import java.io.IOException;
-import java.nio.channels.Selector;
-import java.nio.channels.SelectionKey;
+import java.net.SocketAddress;
import java.nio.ByteBuffer;
-
-import org.apache.thrift.async.TAsyncMethodCall;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
public abstract class TNonblockingTransport extends TTransport {
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
Mon Oct 11 22:01:27 2010
@@ -26,7 +26,6 @@ import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
-import org.apache.thrift.EncodingUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslTransport.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
Mon Oct 11 22:01:27 2010
@@ -20,11 +20,8 @@
package org.apache.thrift.transport;
import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.Map;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.Map;
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TServerSocket.java
Mon Oct 11 22:01:27 2010
@@ -42,11 +42,6 @@ public class TServerSocket extends TServ
private ServerSocket serverSocket_ = null;
/**
- * Port to listen on
- */
- private int port_ = 0;
-
- /**
* Timeout for client sockets from accept
*/
private int clientTimeout_ = 0;
@@ -78,7 +73,6 @@ public class TServerSocket extends TServ
*/
public TServerSocket(int port, int clientTimeout) throws TTransportException
{
this(new InetSocketAddress(port), clientTimeout);
- port_ = port;
}
public TServerSocket(InetSocketAddress bindAddr) throws TTransportException {
Modified: incubator/thrift/trunk/lib/java/test/org/apache/thrift/Fixtures.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/Fixtures.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/test/org/apache/thrift/Fixtures.java
(original)
+++ incubator/thrift/trunk/lib/java/test/org/apache/thrift/Fixtures.java Mon
Oct 11 22:01:27 2010
@@ -21,8 +21,16 @@
package org.apache.thrift;
import java.nio.ByteBuffer;
-import java.util.*;
-import thrift.test.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import thrift.test.Bonk;
+import thrift.test.CompactProtoTestStruct;
+import thrift.test.HolyMoley;
+import thrift.test.Nesting;
+import thrift.test.OneOfEach;
public class Fixtures {
public static final OneOfEach oneOfEach;
Modified:
incubator/thrift/trunk/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
(original)
+++
incubator/thrift/trunk/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
Mon Oct 11 22:01:27 2010
@@ -1,8 +1,9 @@
package org.apache.thrift.async;
+import junit.framework.TestCase;
+
import org.apache.thrift.TException;
-import junit.framework.TestCase;
import thrift.test.Srv;
import thrift.test.Srv.AsyncClient;
Modified:
incubator/thrift/trunk/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
(original)
+++
incubator/thrift/trunk/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
Mon Oct 11 22:01:27 2010
@@ -20,8 +20,6 @@
package org.apache.thrift.protocol;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
public class TestTCompactProtocol extends ProtocolTestBase {
@Override
Modified:
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
(original)
+++
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
Mon Oct 11 22:01:27 2010
@@ -18,8 +18,6 @@
*/
package org.apache.thrift.transport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
public class ReadCountingTransport extends TTransport {
public int readCount = 0;
Modified:
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
(original)
+++
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
Mon Oct 11 22:01:27 2010
@@ -33,9 +33,11 @@ import javax.security.sasl.RealmCallback
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslClientFactory;
+import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
import javax.security.sasl.SaslServerFactory;
-import javax.security.sasl.SaslException;
+
+import junit.framework.TestCase;
import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TProtocolFactory;
@@ -45,8 +47,6 @@ import org.apache.thrift.server.TSimpleS
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import junit.framework.TestCase;
-
public class TestTSaslTransports extends TestCase {
private static final Logger LOGGER =
LoggerFactory.getLogger(TestTSaslTransports.class);
Modified:
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java?rev=1021531&r1=1021530&r2=1021531&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
(original)
+++
incubator/thrift/trunk/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
Mon Oct 11 22:01:27 2010
@@ -18,8 +18,6 @@
*/
package org.apache.thrift.transport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
public class WriteCountingTransport extends TTransport {
public int writeCount = 0;
