ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports, unused variables, missing generics (Thomas Koch via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1170870 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -10,6 +10,10 @@ BUGFIXES:
 
 IMPROVEMENTS:
 
+  ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
+  unused variables, missing generics (Thomas Koch via phunt)
+
+
 Release 3.4.0 - 
 
 Non-backward compatible changes:

src/java/main/org/apache/jute/BinaryOutputArchive.java

@@ -127,7 +127,7 @@ public class BinaryOutputArchive implements OutputArchive {
     
     public void endRecord(Record r, String tag) throws IOException {}
     
-    public void startVector(List v, String tag) throws IOException {
+    public void startVector(List<?> v, String tag) throws IOException {
     	if (v == null) {
     		writeInt(-1, tag);
     		return;
@@ -135,12 +135,12 @@ public class BinaryOutputArchive implements OutputArchive {
         writeInt(v.size(), tag);
     }
     
-    public void endVector(List v, String tag) throws IOException {}
-    
-    public void startMap(TreeMap v, String tag) throws IOException {
+    public void endVector(List<?> v, String tag) throws IOException {}
+
+    public void startMap(TreeMap<?,?> v, String tag) throws IOException {
         writeInt(v.size(), tag);
     }
     
-    public void endMap(TreeMap v, String tag) throws IOException {}
+    public void endMap(TreeMap<?,?> v, String tag) throws IOException {}
     
 }

src/java/main/org/apache/jute/CsvInputArchive.java

@@ -44,10 +44,6 @@ class CsvInputArchive implements InputArchive {
         public void incr() {}
     }
     
-    private void throwExceptionOnError(String tag) throws IOException {
-        throw new IOException("Error deserializing "+tag);
-    }
-    
     private String readField(String tag) throws IOException {
         try {
             StringBuilder buf = new StringBuilder();

src/java/main/org/apache/jute/CsvOutputArchive.java

@@ -126,24 +126,24 @@ public class CsvOutputArchive implements OutputArchive {
         }
     }
     
-    public void startVector(List v, String tag) throws IOException {
+    public void startVector(List<?> v, String tag) throws IOException {
         printCommaUnlessFirst();
         stream.print("v{");
         isFirst = true;
     }
     
-    public void endVector(List v, String tag) throws IOException {
+    public void endVector(List<?> v, String tag) throws IOException {
         stream.print("}");
         isFirst = false;
     }
     
-    public void startMap(TreeMap v, String tag) throws IOException {
+    public void startMap(TreeMap<?,?> v, String tag) throws IOException {
         printCommaUnlessFirst();
         stream.print("m{");
         isFirst = true;
     }
     
-    public void endMap(TreeMap v, String tag) throws IOException {
+    public void endMap(TreeMap<?,?> v, String tag) throws IOException {
         stream.print("}");
         isFirst = false;
     }

src/java/main/org/apache/jute/OutputArchive.java

@@ -39,9 +39,9 @@ public interface OutputArchive {
     public void writeRecord(Record r, String tag) throws IOException;
     public void startRecord(Record r, String tag) throws IOException;
     public void endRecord(Record r, String tag) throws IOException;
-    public void startVector(List v, String tag) throws IOException;
-    public void endVector(List v, String tag) throws IOException;
-    public void startMap(TreeMap v, String tag) throws IOException;
-    public void endMap(TreeMap v, String tag) throws IOException;
+    public void startVector(List<?> v, String tag) throws IOException;
+    public void endVector(List<?> v, String tag) throws IOException;
+    public void startMap(TreeMap<?,?> v, String tag) throws IOException;
+    public void endMap(TreeMap<?,?> v, String tag) throws IOException;
 
 }

src/java/main/org/apache/jute/RecordReader.java

@@ -33,21 +33,21 @@ public class RecordReader {
     
     private InputArchive archive;
 
-    static private HashMap archiveFactory;
+    static private HashMap<String, Method> archiveFactory;
     
     static {
-        archiveFactory = new HashMap();
-        Class[] params = { InputStream.class };
+        archiveFactory = new HashMap<String, Method>();
+
         try {
             archiveFactory.put("binary",
                     BinaryInputArchive.class.getDeclaredMethod(
-                        "getArchive", params));
+                        "getArchive", new Class[]{ InputStream.class } ));
             archiveFactory.put("csv",
                     CsvInputArchive.class.getDeclaredMethod(
-                        "getArchive", params));
+                        "getArchive", new Class[]{ InputStream.class }));
             archiveFactory.put("xml",
                     XmlInputArchive.class.getDeclaredMethod(
-                        "getArchive", params));
+                        "getArchive", new Class[]{ InputStream.class }));
         } catch (SecurityException ex) {
             ex.printStackTrace();
         } catch (NoSuchMethodException ex) {

src/java/main/org/apache/jute/RecordWriter.java

@@ -18,10 +18,8 @@
 
 package org.apache.jute;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -34,37 +32,19 @@ public class RecordWriter {
     
     private OutputArchive archive;
     
-    static private OutputArchive getBinaryArchive(OutputStream out) {
-        return new BinaryOutputArchive(new DataOutputStream(out));
-    }
-    
-    static private OutputArchive getCsvArchive(OutputStream out)
-    throws IOException {
-        try {
-            return new CsvOutputArchive(out);
-        } catch (UnsupportedEncodingException ex) {
-            throw new IOException("Unsupported encoding UTF-8");
-        }
-    }
-    
-    static private OutputArchive getXmlArchive(OutputStream out)
-    throws IOException {
-        return new XmlOutputArchive(out);
-    }
+    static HashMap<String, Method> constructFactory() {
+        HashMap<String, Method> factory = new HashMap<String, Method>();
 
-    static HashMap constructFactory() {
-        HashMap factory = new HashMap();
-        Class[] params = { OutputStream.class };
         try {
             factory.put("binary",
                     BinaryOutputArchive.class.getDeclaredMethod(
-                        "getArchive", params));
+                        "getArchive", new Class[]{ OutputStream.class }));
             factory.put("csv",
                     CsvOutputArchive.class.getDeclaredMethod(
-                        "getArchive", params));
+                        "getArchive", new Class[]{ OutputStream.class }));
             factory.put("xml",
                     XmlOutputArchive.class.getDeclaredMethod(
-                        "getArchive", params));
+                        "getArchive", new Class[]{ OutputStream.class }));
         } catch (SecurityException ex) {
             ex.printStackTrace();
         } catch (NoSuchMethodException ex) {
@@ -73,7 +53,7 @@ public class RecordWriter {
         return factory;
     }
     
-    static private HashMap archiveFactory = constructFactory();
+    static private HashMap<String, Method> archiveFactory = constructFactory();
     
     static private OutputArchive createArchive(OutputStream out,
             String format)

src/java/main/org/apache/jute/XmlOutputArchive.java

@@ -222,26 +222,26 @@ class XmlOutputArchive implements OutputArchive {
         outsideRecord(tag);
     }
     
-    public void startVector(List v, String tag) throws IOException {
+    public void startVector(List<?> v, String tag) throws IOException {
         insideVector(tag);
         stream.print("<array>\n");
         addIndent();
     }
     
-    public void endVector(List v, String tag) throws IOException {
+    public void endVector(List<?> v, String tag) throws IOException {
         closeIndent();
         putIndent();
         stream.print("</array>");
         outsideVector(tag);
     }
     
-    public void startMap(TreeMap v, String tag) throws IOException {
+    public void startMap(TreeMap<?,?> v, String tag) throws IOException {
         insideMap(tag);
         stream.print("<array>\n");
         addIndent();
     }
     
-    public void endMap(TreeMap v, String tag) throws IOException {
+    public void endMap(TreeMap<?,?> v, String tag) throws IOException {
         closeIndent();
         putIndent();
         stream.print("</array>");

src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java

@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.ClientCnxn.EndOfStreamException;
 import org.apache.zookeeper.ClientCnxn.Packet;
 import org.apache.zookeeper.ZooDefs.OpCode;
-import org.apache.zookeeper.ZooKeeper.States;
 
 public class ClientCnxnSocketNIO extends ClientCnxnSocket {
     private static final Logger LOG = LoggerFactory

src/java/main/org/apache/zookeeper/Environment.java

@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Provide insight into the runtime environment.

src/java/main/org/apache/zookeeper/MultiResponse.java

@@ -57,7 +57,6 @@ public class MultiResponse implements Record, Iterable<OpResult> {
     public void serialize(OutputArchive archive, String tag) throws IOException {
         archive.startRecord(this, tag);
 
-        int index = 0;
         for (OpResult result : results) {
             int err = result.getType() == ZooDefs.OpCode.error ? ((OpResult.ErrorResult)result).getErr() : 0;
 

src/java/main/org/apache/zookeeper/MultiTransactionRecord.java

@@ -62,7 +62,6 @@ public class MultiTransactionRecord implements Record, Iterable<Op> {
     @Override
     public void serialize(OutputArchive archive, String tag) throws IOException {
         archive.startRecord(this, tag);
-        int index = 0 ;
         for (Op op : ops) {
             MultiHeader h = new MultiHeader(op.getType(), false, -1);
             h.serialize(archive, tag);

src/java/main/org/apache/zookeeper/ServerAdminClient.java

@@ -24,48 +24,12 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import java.util.StringTokenizer;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.zookeeper.server.ZooTrace;
-
 public class ServerAdminClient {
     private static final Logger LOG = LoggerFactory.getLogger(ServerAdminClient.class);
 
-    private static long getMask(String mask) {
-        long retv = 0;
-        if (mask.equalsIgnoreCase("CLIENT_REQUEST_TRACE_MASK")) {
-            retv = ZooTrace.CLIENT_REQUEST_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("CLIENT_DATA_PACKET_TRACE_MASK")) {
-            retv = ZooTrace.CLIENT_DATA_PACKET_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("CLIENT_PING_TRACE_MASK")) {
-            retv = ZooTrace.CLIENT_PING_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("SERVER_PACKET_TRACE_MASK")) {
-            retv = ZooTrace.SERVER_PACKET_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("SESSION_TRACE_MASK")) {
-            retv = ZooTrace.SESSION_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("EVENT_DELIVERY_TRACE_MASK")) {
-            retv = ZooTrace.EVENT_DELIVERY_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("SERVER_PING_TRACE_MASK")) {
-            retv = ZooTrace.SERVER_PING_TRACE_MASK;
-        } else if (mask.equalsIgnoreCase("WARNING_TRACE_MASK")) {
-            retv = ZooTrace.WARNING_TRACE_MASK;
-        }
-        return retv;
-    }
-
-    private static long getMasks(String masks) {
-        long retv = 0;
-        StringTokenizer st = new StringTokenizer(masks, "|");
-        while (st.hasMoreTokens()) {
-            String mask = st.nextToken().trim();
-            retv = retv | getMask(mask);
-        }
-        return retv;
-    }
-
     public static void ruok(String host, int port) {
         Socket s = null;
         try {

src/java/main/org/apache/zookeeper/Shell.java

@@ -273,6 +273,7 @@ abstract public class Shell {
   /**
    * This is an IOException with exit code added.
    */
+  @SuppressWarnings("serial")
   public static class ExitCodeException extends IOException {
     int exitCode;
     

src/java/main/org/apache/zookeeper/server/DataTree.java

@@ -64,11 +64,6 @@ import org.apache.zookeeper.txn.Txn;
 import org.apache.zookeeper.txn.MultiTxn;
 import org.apache.zookeeper.txn.TxnHeader;
 
-import org.apache.zookeeper.proto.CreateRequest;
-import org.apache.zookeeper.proto.DeleteRequest;
-import org.apache.zookeeper.proto.SetACLRequest;
-import org.apache.zookeeper.proto.SetDataRequest;
-
 /**
  * This class maintains the tree data structure. It doesn't have any networking
  * or client connection code in it so that it can be tested in a stand alone
@@ -161,31 +156,6 @@ public class DataTree {
         return ++aclIndex;
     }
 
-    /**
-     * compare two list of acls. if there elements are in the same order and the
-     * same size then return true else return false
-     *
-     * @param lista
-     *            the list to be compared
-     * @param listb
-     *            the list to be compared
-     * @return true if and only if the lists are of the same size and the
-     *         elements are in the same order in lista and listb
-     */
-    private boolean listACLEquals(List<ACL> lista, List<ACL> listb) {
-        if (lista.size() != listb.size()) {
-            return false;
-        }
-        for (int i = 0; i < lista.size(); i++) {
-            ACL a = lista.get(i);
-            ACL b = listb.get(i);
-            if (!a.equals(b)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     /**
      * converts the list of acls to a list of longs.
      *
@@ -719,7 +689,6 @@ public class DataTree {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public List<ACL> getACL(String path, Stat stat)
             throws KeeperException.NoNodeException {
         DataNode n = nodes.get(path);

src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java

@@ -55,8 +55,6 @@ import org.apache.zookeeper.server.ZooKeeperServer.ChangeRecord;
 import org.apache.zookeeper.txn.CreateSessionTxn;
 import org.apache.zookeeper.txn.ErrorTxn;
 
-import org.apache.zookeeper.MultiTransactionRecord;
-import org.apache.zookeeper.Op;
 import org.apache.zookeeper.OpResult;
 import org.apache.zookeeper.OpResult.CheckResult;
 import org.apache.zookeeper.OpResult.CreateResult;

src/java/main/org/apache/zookeeper/server/LogFormatter.java

@@ -18,7 +18,6 @@
 
 package org.apache.zookeeper.server;
 
-import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -28,7 +27,6 @@ import java.util.zip.Adler32;
 import java.util.zip.Checksum;
 
 import org.apache.jute.BinaryInputArchive;
-import org.apache.jute.InputArchive;
 import org.apache.jute.Record;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java

@@ -289,7 +289,6 @@ public class PrepRequestProcessor extends Thread implements RequestProcessor {
      * @param request
      * @param record
      */
-    @SuppressWarnings("unchecked")
     protected void pRequest2Txn(int type, long zxid, Request request, Record record) throws KeeperException {
         request.hdr = new TxnHeader(request.sessionId, request.cxid, zxid,
                                     zks.getTime(), type);
@@ -477,7 +476,6 @@ public class PrepRequestProcessor extends Thread implements RequestProcessor {
      *
      * @param request
      */
-    @SuppressWarnings("unchecked")
     protected void pRequest(Request request) {
         // LOG.info("Prep>>> cxid = " + request.cxid + " type = " +
         // request.type + " id = 0x" + Long.toHexString(request.sessionId));
@@ -523,7 +521,6 @@ public class PrepRequestProcessor extends Thread implements RequestProcessor {
                 //Store off current pending change records in case we need to rollback
                 HashMap<String, ChangeRecord> pendingChanges = getPendingChanges(multiRequest);
 
-                int index = 0;
                 for(Op op: multiRequest) {
                     Record subrequest = op.toRequestRecord() ;
 
@@ -567,7 +564,6 @@ public class PrepRequestProcessor extends Thread implements RequestProcessor {
                     ByteBuffer bb = ByteBuffer.wrap(baos.toByteArray());
 
                     txns.add(new Txn(request.hdr.getType(), bb.array()));
-                    index++;
                 }
 
                 request.hdr = new TxnHeader(request.sessionId, request.cxid, zxid, zks.getTime(), request.type);

src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java

@@ -42,8 +42,6 @@ import org.apache.zookeeper.server.persistence.Util;
  * and the corresponding logs.
  */
 public class PurgeTxnLog {
-    private static final Logger LOG = LoggerFactory.getLogger(PurgeTxnLog.class);
-
     static void printUsage(){
         System.out.println("PurgeTxnLog dataLogDir [snapDir] -n count");
         System.out.println("\tdataLogDir -- path to the txn log directory");

src/java/main/org/apache/zookeeper/server/Request.java

@@ -35,8 +35,6 @@ import org.apache.zookeeper.txn.TxnHeader;
  * onto the request as it is processed.
  */
 public class Request {
-    private static final Logger LOG = LoggerFactory.getLogger(Request.class);
-
     public final static Request requestOfDeath = new Request(null, 0, 0, 0,
             null, null);
 

src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java

@@ -18,19 +18,10 @@
 
 package org.apache.zookeeper.server;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -69,7 +60,6 @@ import org.apache.zookeeper.server.auth.AuthenticationProvider;
 import org.apache.zookeeper.server.auth.ProviderRegistry;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
 import org.apache.zookeeper.server.quorum.ReadOnlyZooKeeperServer;
-import org.apache.zookeeper.server.util.ZxidUtils;
 import javax.security.sasl.SaslException;
 
 /**
@@ -493,14 +483,13 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
 
         List<ACL> acl; /* Make sure to create a new object when changing */
 
-        @SuppressWarnings("unchecked")
         ChangeRecord duplicate(long zxid) {
             StatPersisted stat = new StatPersisted();
             if (this.stat != null) {
                 DataTree.copyStatPersisted(this.stat, stat);
             }
             return new ChangeRecord(zxid, path, stat, childCount,
-                    acl == null ? new ArrayList<ACL>() : new ArrayList(acl));
+                    acl == null ? new ArrayList<ACL>() : new ArrayList<ACL>(acl));
         }
     }
 

src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java

@@ -19,7 +19,6 @@ package org.apache.zookeeper.server.persistence;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;

src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java

@@ -27,7 +27,6 @@ import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -699,11 +698,6 @@ public class AuthFastLeaderElection implements Election {
             }
         }
 
-        public boolean queueEmpty() {
-            return (sendqueue.isEmpty() || ackset.isEmpty() || recvqueue
-                    .isEmpty());
-        }
-
         Messenger(int threads, DatagramSocket s) {
             mySocket = s;
             ackset =  Collections.<Long>newSetFromMap(new ConcurrentHashMap<Long, Boolean>());

src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java

@@ -395,14 +395,6 @@ public class FastLeaderElection implements Election {
             }
         }
 
-        /**
-         * Test if both send and receive queues are empty.
-         */
-        public boolean queueEmpty() {
-            return (sendqueue.isEmpty() || recvqueue.isEmpty());
-        }
-
-
         WorkerSender ws;
         WorkerReceiver wr;
 

src/java/main/org/apache/zookeeper/server/quorum/Follower.java

@@ -18,11 +18,9 @@
 
 package org.apache.zookeeper.server.quorum;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import org.apache.jute.BinaryInputArchive;
 import org.apache.jute.Record;
 import org.apache.zookeeper.server.util.SerializeUtils;
 import org.apache.zookeeper.server.util.ZxidUtils;

src/java/main/org/apache/zookeeper/server/quorum/Leader.java

@@ -31,7 +31,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -465,8 +464,6 @@ public class Leader {
      * @param followerAddr
      */
     synchronized public void processAck(long sid, long zxid, SocketAddress followerAddr) {
-        boolean first = true;
-        
         if (LOG.isTraceEnabled()) {
             LOG.trace("Ack zxid: 0x" + Long.toHexString(zxid));
             for (Proposal p : outstandingProposals.values()) {

src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java

@@ -24,10 +24,8 @@ import java.net.DatagramSocket;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
 import java.nio.ByteBuffer;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Random;
 import java.util.Map.Entry;

src/java/main/org/apache/zookeeper/server/quorum/Observer.java

@@ -18,11 +18,9 @@
 
 package org.apache.zookeeper.server.quorum;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import org.apache.jute.BinaryInputArchive;
 import org.apache.jute.Record;
 import org.apache.zookeeper.server.ObserverBean;
 import org.apache.zookeeper.server.Request;

src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java

@@ -23,7 +23,6 @@ import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.server.Request;
 import org.apache.zookeeper.server.RequestProcessor;
 import org.apache.zookeeper.server.SyncRequestProcessor;
-import org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
  * This RequestProcessor simply forwards requests to an AckRequestProcessor and

src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java

@@ -34,8 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.Date;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

@@ -31,7 +31,6 @@ import java.net.InetSocketAddress;
 import java.net.SocketException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java

@@ -18,10 +18,8 @@
 
 package org.apache.zookeeper.server.quorum.flexible;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.HashMap;

src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java

@@ -328,7 +328,6 @@ public class DataTreeV1 {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public List<ACL> getACL(String path, Stat stat) throws KeeperException.NoNodeException {
         DataNodeV1 n = nodes.get(path);
         if (n == null) {
@@ -385,7 +384,6 @@ public class DataTreeV1 {
 
     public volatile long lastProcessedZxid = 0;
 
-    @SuppressWarnings("unchecked")
     public ProcessTxnResult processTxn(TxnHeader header, Record txn) {
         ProcessTxnResult rc = new ProcessTxnResult();
 

src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java

@@ -19,7 +19,6 @@
 package org.apache.zookeeper.server.upgrade;
 
 import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;