big code cleanup to reduce number of compiler warnings

router/java/src/net/i2p/data/i2np/DataMessage.java

@@ -8,12 +8,8 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java

@@ -8,15 +8,12 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;

router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java

@@ -8,14 +8,11 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.Log;

router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java

@@ -9,10 +9,7 @@ package net.i2p.data.i2np;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;

router/java/src/net/i2p/data/i2np/DateMessage.java

@@ -8,13 +8,8 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java

@@ -8,13 +8,8 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/data/i2np/GarlicMessage.java

@@ -8,12 +8,8 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java

@@ -8,7 +8,6 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java

@@ -8,9 +8,7 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Properties;
 
 import net.i2p.I2PAppContext;

router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java

@@ -8,14 +8,9 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/data/i2np/TunnelDataMessage.java

@@ -8,18 +8,10 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
 import net.i2p.data.ByteArray;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
-import net.i2p.data.Signature;
 import net.i2p.data.TunnelId;
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;

router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java

@@ -8,18 +8,9 @@ package net.i2p.data.i2np;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Date;
-
 import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
-import net.i2p.data.Signature;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/InNetMessagePool.java

@@ -10,11 +10,7 @@ package net.i2p.router;
 
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DeliveryStatusMessage;

router/java/src/net/i2p/router/MessageValidator.java

@@ -1,10 +1,5 @@
 package net.i2p.router;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeMap;
-
 import net.i2p.util.DecayingBloomFilter;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/OutNetMessage.java

@@ -8,8 +8,6 @@ package net.i2p.router;
  *
  */
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -20,7 +18,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;

router/java/src/net/i2p/router/RouterDoSThrottle.java

@@ -1,10 +1,6 @@
 package net.i2p.router;
 
 import net.i2p.data.Hash;
-import net.i2p.data.i2np.TunnelCreateMessage;
-import net.i2p.stat.Rate;
-import net.i2p.stat.RateStat;
-import net.i2p.util.Log;
 
 /**
  * Minor extention of the router throttle to handle some DoS events and 

router/java/src/net/i2p/router/TunnelInfo.java

@@ -8,7 +8,6 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 

router/java/src/net/i2p/router/TunnelManagerFacade.java

@@ -8,8 +8,6 @@ package net.i2p.router;
  *
  */
 
-import java.util.List;
-
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;

router/java/src/net/i2p/router/admin/StatsGenerator.java

@@ -1,7 +1,6 @@
 package net.i2p.router.admin;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.Writer;
 import java.text.DecimalFormat;
 import java.util.Arrays;

router/java/src/net/i2p/router/message/BuildTestMessageJob.java

@@ -8,7 +8,6 @@ package net.i2p.router.message;
  *
  */
 
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 

router/java/src/net/i2p/router/message/GarlicMessageParser.java

@@ -8,8 +8,6 @@ package net.i2p.router.message;
  *
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;

router/java/src/net/i2p/router/message/GarlicMessageReceiver.java

@@ -11,14 +11,11 @@ package net.i2p.router.message;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
-import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.router.JobImpl;
 import net.i2p.router.LeaseSetKeys;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java

@@ -8,24 +8,15 @@ package net.i2p.router.message;
  *
  */
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
 import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DeliveryInstructions;
-import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelGatewayMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.LeaseSetKeys;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java

@@ -8,8 +8,6 @@ package net.i2p.router.message;
  *
  */
 
-import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 import net.i2p.data.Certificate;
@@ -29,7 +27,6 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelSelectionCriteria;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java

@@ -15,10 +15,7 @@ import net.i2p.data.Hash;
 import net.i2p.data.Lease;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.PublicKey;
-import net.i2p.data.SessionTag;
 import net.i2p.data.SessionKey;
-import net.i2p.data.TunnelId;
-
 import net.i2p.data.i2cp.MessageId;
 
 import net.i2p.data.i2np.DataMessage;

router/java/src/net/i2p/router/message/SendMessageDirectJob.java

@@ -18,7 +18,6 @@ import net.i2p.router.JobImpl;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java

@@ -8,13 +8,9 @@ package net.i2p.router.networkdb;
  *
  */
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
 
-import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;

router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java

@@ -9,11 +9,8 @@ package net.i2p.router.networkdb;
  */
 
 import java.util.Date;
-import java.util.List;
-
 import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
-import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.router.JobImpl;

router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java

@@ -8,11 +8,7 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;

router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java

@@ -1,7 +1,6 @@
 package net.i2p.router.networkdb.kademlia;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

@@ -12,13 +12,11 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -34,7 +32,6 @@ import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.DatabaseLookupMessage;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.router.Job;
-import net.i2p.router.JobImpl;
 import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;

router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java

@@ -21,7 +21,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java

@@ -9,7 +9,6 @@ package net.i2p.router.networkdb.kademlia;
  */
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -25,9 +24,7 @@ import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelSelectionCriteria;
 import net.i2p.router.message.SendMessageDirectJob;
-import net.i2p.router.peermanager.PeerProfile;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java

@@ -8,7 +8,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.router.RouterContext;
 

router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java

@@ -8,7 +8,6 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;

router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java

@@ -1,7 +1,6 @@
 package net.i2p.router.peermanager;
 
 import net.i2p.router.RouterContext;
-import net.i2p.stat.Rate;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/peermanager/PeerManager.java

@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.TreeMap;
 import java.util.Set;
 
 import net.i2p.data.Hash;

router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java

@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.List;
 
 import net.i2p.router.PeerManagerFacade;

router/java/src/net/i2p/router/peermanager/PeerTestJob.java

@@ -1,6 +1,5 @@
 package net.i2p.router.peermanager;
 
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;

router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java

@@ -7,7 +7,6 @@ import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -16,10 +15,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.TreeSet;
 
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.router.RouterContext;
 import net.i2p.router.NetworkDatabaseFacade;

router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java

@@ -8,7 +8,6 @@ import java.text.DecimalFormatSymbols;
 
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 

router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java

@@ -1,13 +1,11 @@
 package net.i2p.router.peermanager;
 
 import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.HashSet;
 import java.util.Iterator;

router/java/src/net/i2p/router/startup/ReadConfigJob.java

@@ -9,15 +9,8 @@ package net.i2p.router.startup;
  */
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Properties;
-
 import net.i2p.router.JobImpl;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
-import net.i2p.util.Log;
 
 /**
  * Simply read the router config

router/java/src/net/i2p/router/transport/GetBidsJob.java

@@ -8,8 +8,6 @@ package net.i2p.router.transport;
  *
  */
 
-import java.util.List;
-
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
 import net.i2p.router.MessageSelector;

router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java

@@ -20,7 +20,6 @@ import java.util.TreeMap;
 import net.i2p.data.Hash;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
-import net.i2p.router.JobImpl;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.ReplyJob;

router/java/src/net/i2p/router/transport/Transport.java

@@ -9,7 +9,6 @@ package net.i2p.router.transport;
  */
 
 import java.util.List;
-import java.util.Properties;
 import java.util.Set;
 
 import net.i2p.data.RouterAddress;

router/java/src/net/i2p/router/transport/TransportImpl.java

@@ -19,7 +19,6 @@ import java.util.Set;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterAddress;
 import net.i2p.data.RouterIdentity;
-import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.MessageSelector;

router/java/src/net/i2p/router/transport/TransportManager.java

@@ -11,21 +11,12 @@ package net.i2p.router.transport;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
-
 import net.i2p.data.Hash;
 import net.i2p.data.RouterAddress;
 import net.i2p.data.RouterIdentity;
-import net.i2p.data.RouterInfo;
-import net.i2p.data.i2np.DatabaseLookupMessage;
-import net.i2p.data.i2np.DatabaseSearchReplyMessage;
-import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;

router/java/src/net/i2p/router/transport/tcp/ConnectionBuilder.java

@@ -6,12 +6,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.math.BigInteger;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Properties;
 
 import net.i2p.crypto.AESInputStream;
@@ -31,7 +28,6 @@ import net.i2p.router.transport.BandwidthLimitedInputStream;
 import net.i2p.router.transport.BandwidthLimitedOutputStream;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.NativeBigInteger;
 import net.i2p.util.SimpleTimer;
 
 /**

router/java/src/net/i2p/router/transport/tcp/ConnectionHandler.java

@@ -31,7 +31,6 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.transport.BandwidthLimitedInputStream;
 import net.i2p.router.transport.BandwidthLimitedOutputStream;
 import net.i2p.util.Log;
-import net.i2p.util.NativeBigInteger;
 
 /**
  * Class responsible for all of the handshaking necessary to turn a socket into

router/java/src/net/i2p/router/transport/tcp/ConnectionRunner.java

@@ -2,15 +2,11 @@ package net.i2p.router.transport.tcp;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Date;
-
 import net.i2p.data.DataHelper;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.DateMessage;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;

router/java/src/net/i2p/router/transport/tcp/ConnectionTagManager.java

@@ -1,7 +1,6 @@
 package net.i2p.router.transport.tcp;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import net.i2p.data.ByteArray;

router/java/src/net/i2p/router/transport/tcp/TCPConnection.java

@@ -12,7 +12,6 @@ import java.util.List;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
-import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessageReader;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;

router/java/src/net/i2p/router/transport/tcp/TCPListener.java

@@ -9,7 +9,6 @@ package net.i2p.router.transport.tcp;
  */
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;

router/java/src/net/i2p/router/tunnel/FragmentTest.java

@@ -1,16 +1,12 @@
 package net.i2p.router.tunnel;
 
 import java.util.ArrayList;
-import java.util.Date;
-
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DataMessage;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.I2NPMessageHandler;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/tunnel/FragmentedMessage.java

@@ -3,10 +3,6 @@ package net.i2p.router.tunnel;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Date;
-
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.ByteArray;

router/java/src/net/i2p/router/tunnel/HopProcessor.java

@@ -1,7 +1,6 @@
 package net.i2p.router.tunnel;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
 import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;

router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java

@@ -1,9 +1,7 @@
 package net.i2p.router.tunnel;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
 import net.i2p.data.ByteArray;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;

router/java/src/net/i2p/router/tunnel/InboundGatewayProcessor.java

@@ -1,8 +1,6 @@
 package net.i2p.router.tunnel;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.Hash;
-import net.i2p.util.Log;
 
 /**
  * Override the hop processor to seed the message with a random

router/java/src/net/i2p/router/tunnel/InboundGatewayTest.java

@@ -1,13 +1,10 @@
 package net.i2p.router.tunnel;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
-import net.i2p.data.ByteArray;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DataMessage;

router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java

@@ -1,19 +1,14 @@
 package net.i2p.router.tunnel;
 
-import java.util.Date;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
-import net.i2p.data.RouterInfo;
 import net.i2p.data.Payload;
 import net.i2p.data.i2np.DataMessage;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.GarlicMessage;
-import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.TunnelGatewayMessage;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.JobImpl;
-import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.message.GarlicMessageReceiver;

router/java/src/net/i2p/router/tunnel/InboundSender.java

@@ -1,7 +1,6 @@
 package net.i2p.router.tunnel;
 
 import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/tunnel/InboundTest.java

@@ -4,7 +4,6 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.data.SessionKey;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/tunnel/OutboundGatewayProcessor.java

@@ -4,7 +4,6 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/tunnel/OutboundGatewayTest.java

@@ -1,13 +1,10 @@
 package net.i2p.router.tunnel;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
-import net.i2p.data.ByteArray;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DataMessage;

router/java/src/net/i2p/router/tunnel/OutboundReceiver.java

@@ -1,6 +1,5 @@
 package net.i2p.router.tunnel;
 
-import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.TunnelDataMessage;
 import net.i2p.router.JobImpl;

router/java/src/net/i2p/router/tunnel/OutboundTest.java

@@ -4,7 +4,6 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.data.SessionKey;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/tunnel/OutboundTunnelEndpoint.java

@@ -1,13 +1,9 @@
 package net.i2p.router.tunnel;
 
 import net.i2p.data.Hash;
-import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelDataMessage;
-import net.i2p.data.i2np.TunnelGatewayMessage;
-import net.i2p.router.JobImpl;
-import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java

@@ -9,7 +9,6 @@ import net.i2p.data.Base64;
 import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java

@@ -5,7 +5,6 @@ import java.util.Locale;
 import java.text.SimpleDateFormat;
 
 import net.i2p.data.Base64;
-import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.router.TunnelInfo;

router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

@@ -11,13 +11,11 @@ import net.i2p.router.RouterContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
-import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelDataMessage;
 import net.i2p.data.i2np.TunnelGatewayMessage;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.router.RouterContext;
 import net.i2p.router.Service;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/tunnel/TunnelGatewayZeroHop.java

@@ -1,15 +1,11 @@
 package net.i2p.router.tunnel;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelGatewayMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
-import net.i2p.util.SimpleTimer;
 
 /**
  * Serve as the gatekeeper for a tunnel with no hops.

router/java/src/net/i2p/router/tunnel/TunnelParticipant.java

@@ -1,7 +1,5 @@
 package net.i2p.router.tunnel;
 
-import java.util.Date;
-
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;

router/java/src/net/i2p/router/tunnel/pool/OnCreatedJob.java

@@ -2,7 +2,6 @@ package net.i2p.router.tunnel.pool;
 
 import net.i2p.router.JobImpl;
 import net.i2p.router.RouterContext;
-import net.i2p.router.tunnel.TunnelCreatorConfig;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/tunnel/pool/SendGarlicMessageJob.java

@@ -1,13 +1,10 @@
 package net.i2p.router.tunnel.pool;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import net.i2p.data.Certificate;
-import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SessionKey;
-import net.i2p.data.SessionTag;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.GarlicMessage;

router/java/src/net/i2p/router/tunnel/pool/TestJob.java

@@ -1,6 +1,5 @@
 package net.i2p.router.tunnel.pool;
 
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -18,7 +17,6 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.message.PayloadGarlicConfig;
 import net.i2p.router.message.GarlicMessageBuilder;
-import net.i2p.router.tunnel.TunnelCreatorConfig;
 import net.i2p.util.Log;
 
 class TestJob extends JobImpl {

router/java/src/net/i2p/router/tunnel/pool/TunnelBuilder.java

@@ -4,15 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.i2p.data.Hash;
-import net.i2p.data.SessionKey;
-import net.i2p.data.SessionTag;
-import net.i2p.stat.Rate;
-import net.i2p.stat.RateStat;
 import net.i2p.router.RouterContext;
 import net.i2p.router.JobImpl;
 import net.i2p.router.tunnel.HopConfig;
-import net.i2p.router.tunnel.TunnelCreatorConfig;
-import net.i2p.router.tunnel.TunnelGateway;
 import net.i2p.router.TunnelPoolSettings;
 import net.i2p.util.Log;
 

router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java

@@ -13,15 +13,11 @@ import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.TunnelCreateMessage;
-import net.i2p.data.i2np.TunnelDataMessage;
-import net.i2p.data.i2np.TunnelGatewayMessage;
 import net.i2p.stat.RateStat;
 import net.i2p.router.ClientTunnelSettings;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.JobImpl;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
-import net.i2p.router.TunnelSelectionCriteria;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelPoolSettings;