diff --git a/router/java/test/junit/net/i2p/data/i2np/DateMessage.java b/router/java/test/junit/net/i2p/data/i2np/DateMessage.java index f78b98998..7d19a1691 100644 --- a/router/java/test/junit/net/i2p/data/i2np/DateMessage.java +++ b/router/java/test/junit/net/i2p/data/i2np/DateMessage.java @@ -8,8 +8,6 @@ package net.i2p.data.i2np; * */ -import java.io.IOException; - import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; diff --git a/router/java/test/junit/net/i2p/data/i2np/DeliveryInstructionsTest.java b/router/java/test/junit/net/i2p/data/i2np/DeliveryInstructionsTest.java index a979ce061..fefc30880 100644 --- a/router/java/test/junit/net/i2p/data/i2np/DeliveryInstructionsTest.java +++ b/router/java/test/junit/net/i2p/data/i2np/DeliveryInstructionsTest.java @@ -11,7 +11,6 @@ package net.i2p.data.i2np; import net.i2p.data.DataFormatException; import net.i2p.data.DataStructure; import net.i2p.data.Hash; -import net.i2p.data.SessionKey; import net.i2p.data.StructureTest; import net.i2p.data.TunnelId; diff --git a/router/java/test/junit/net/i2p/data/i2np/TunnelCreateMessage.java b/router/java/test/junit/net/i2p/data/i2np/TunnelCreateMessage.java index 8d63a037f..a0e4330a0 100644 --- a/router/java/test/junit/net/i2p/data/i2np/TunnelCreateMessage.java +++ b/router/java/test/junit/net/i2p/data/i2np/TunnelCreateMessage.java @@ -8,7 +8,6 @@ package net.i2p.data.i2np; * */ -import java.io.IOException; import java.util.Properties; import net.i2p.I2PAppContext; diff --git a/router/java/test/junit/net/i2p/data/i2np/TunnelCreateStatusMessage.java b/router/java/test/junit/net/i2p/data/i2np/TunnelCreateStatusMessage.java index a60bc4a72..f361a1ee0 100644 --- a/router/java/test/junit/net/i2p/data/i2np/TunnelCreateStatusMessage.java +++ b/router/java/test/junit/net/i2p/data/i2np/TunnelCreateStatusMessage.java @@ -8,8 +8,6 @@ package net.i2p.data.i2np; * */ -import java.io.IOException; - import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.TunnelId; diff --git a/router/java/test/junit/net/i2p/router/message/BuildTestMessageJob.java b/router/java/test/junit/net/i2p/router/message/BuildTestMessageJob.java index 3d5ad6e7f..85b172cce 100644 --- a/router/java/test/junit/net/i2p/router/message/BuildTestMessageJob.java +++ b/router/java/test/junit/net/i2p/router/message/BuildTestMessageJob.java @@ -16,6 +16,7 @@ import net.i2p.data.Hash; import net.i2p.data.PublicKey; import net.i2p.data.RouterInfo; import net.i2p.data.SessionKey; +import net.i2p.data.SessionTag; import net.i2p.data.i2np.DeliveryInstructions; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.I2NPMessage; @@ -80,7 +81,7 @@ public class BuildTestMessageJob extends JobImpl { _log.debug("Building garlic message to test " + _target.getIdentity().getHash().toBase64()); GarlicConfig config = buildGarlicCloveConfig(); // TODO: make the last params on this specify the correct sessionKey and tags used - ReplyJob replyJob = new JobReplyJob(getContext(), _onSend, config.getRecipient().getIdentity().getPublicKey(), config.getId(), null, new HashSet()); + ReplyJob replyJob = new JobReplyJob(getContext(), _onSend, config.getRecipient().getIdentity().getPublicKey(), config.getId(), null, new HashSet()); MessageSelector sel = buildMessageSelector(); SendGarlicJob job = new SendGarlicJob(getContext(), config, null, _onSendFailed, replyJob, _onSendFailed, _timeoutMs, _priority, sel); getContext().jobQueue().addJob(job); @@ -183,9 +184,9 @@ public class BuildTestMessageJob extends JobImpl { private Job _job; private PublicKey _target; private long _msgId; - private Set _sessionTagsDelivered; + private Set _sessionTagsDelivered; private SessionKey _keyDelivered; - public JobReplyJob(RouterContext ctx, Job job, PublicKey target, long msgId, SessionKey keyUsed, Set tagsDelivered) { + public JobReplyJob(RouterContext ctx, Job job, PublicKey target, long msgId, SessionKey keyUsed, Set tagsDelivered) { super(ctx); _job = job; _target = target; diff --git a/router/java/test/junit/net/i2p/router/message/OutboundClientMessageStatus.java b/router/java/test/junit/net/i2p/router/message/OutboundClientMessageStatus.java index 3d15ce07c..7a1716300 100644 --- a/router/java/test/junit/net/i2p/router/message/OutboundClientMessageStatus.java +++ b/router/java/test/junit/net/i2p/router/message/OutboundClientMessageStatus.java @@ -20,7 +20,7 @@ class OutboundClientMessageStatus { private ClientMessage _msg; private PayloadGarlicConfig _clove; private LeaseSet _leaseSet; - private final Set _sent; + private final Set _sent; private int _numLookups; private boolean _success; private boolean _failure; @@ -32,7 +32,7 @@ class OutboundClientMessageStatus { _msg = msg; _clove = null; _leaseSet = null; - _sent = new HashSet(4); + _sent = new HashSet(4); _success = false; _failure = false; _numLookups = 0; diff --git a/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java b/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java index 360a4fc55..73eca5377 100644 --- a/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java +++ b/router/java/test/junit/net/i2p/router/message/SendGarlicJob.java @@ -53,9 +53,9 @@ public class SendGarlicJob extends JobImpl { * @param replySelector ??? */ public SendGarlicJob(RouterContext ctx, GarlicConfig config, Job onSend, Job onSendFailed, ReplyJob onReply, Job onReplyFailed, long timeoutMs, int priority, MessageSelector replySelector) { - this(ctx, config, onSend, onSendFailed, onReply, onReplyFailed, timeoutMs, priority, replySelector, new SessionKey(), new HashSet()); + this(ctx, config, onSend, onSendFailed, onReply, onReplyFailed, timeoutMs, priority, replySelector, new SessionKey(), new HashSet()); } - public SendGarlicJob(RouterContext ctx, GarlicConfig config, Job onSend, Job onSendFailed, ReplyJob onReply, Job onReplyFailed, long timeoutMs, int priority, MessageSelector replySelector, SessionKey wrappedKey, Set wrappedTags) { + public SendGarlicJob(RouterContext ctx, GarlicConfig config, Job onSend, Job onSendFailed, ReplyJob onReply, Job onReplyFailed, long timeoutMs, int priority, MessageSelector replySelector, SessionKey wrappedKey, Set wrappedTags) { super(ctx); _log = ctx.logManager().getLog(SendGarlicJob.class); if (config == null) throw new IllegalArgumentException("No config specified"); diff --git a/router/java/test/junit/net/i2p/router/networkdb/kademlia/RouterGenerator.java b/router/java/test/junit/net/i2p/router/networkdb/kademlia/RouterGenerator.java index 468ec4e05..b8ae16225 100644 --- a/router/java/test/junit/net/i2p/router/networkdb/kademlia/RouterGenerator.java +++ b/router/java/test/junit/net/i2p/router/networkdb/kademlia/RouterGenerator.java @@ -112,8 +112,8 @@ public class RouterGenerator { return info; } - static Set createAddresses(int num) { - Set addresses = new HashSet(); + static Set createAddresses(int num) { + Set addresses = new HashSet(); RouterAddress addr = createTCPAddress(num); if (addr != null) addresses.add(addr); diff --git a/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTestStandalone.java b/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTestStandalone.java index 5e304f560..e9816f6e5 100644 --- a/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTestStandalone.java +++ b/router/java/test/junit/net/i2p/router/transport/udp/UDPEndpointTestStandalone.java @@ -24,12 +24,12 @@ public class UDPEndpointTestStandalone { private final Log _log; private UDPEndpoint _endpoints[]; private volatile boolean _beginTest; - private final List _sentNotReceived; + private final List _sentNotReceived; public UDPEndpointTestStandalone(RouterContext ctx) { _context = ctx; _log = ctx.logManager().getLog(UDPEndpointTestStandalone.class); - _sentNotReceived = Collections.synchronizedList(new ArrayList(1000)); + _sentNotReceived = Collections.synchronizedList(new ArrayList(1000)); } public void runTest(int numPeers) { diff --git a/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java index 39c3b24b1..a5bdf5c62 100644 --- a/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java +++ b/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java @@ -19,7 +19,7 @@ class UDPFlooder implements Runnable { private RouterContext _context; // private Log _log; private UDPTransport _transport; - private final List _peers; + private final List _peers; private boolean _alive; private static final byte _floodData[] = new byte[4096]; @@ -27,7 +27,7 @@ class UDPFlooder implements Runnable { _context = ctx; // _log = ctx.logManager().getLog(UDPFlooder.class); _transport = transport; - _peers = new ArrayList(4); + _peers = new ArrayList(4); ctx.random().nextBytes(_floodData); } diff --git a/router/java/test/junit/net/i2p/router/tunnel/BatchedFragmentTest.java b/router/java/test/junit/net/i2p/router/tunnel/BatchedFragmentTest.java index 7289105ad..f3ac2747b 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/BatchedFragmentTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/BatchedFragmentTest.java @@ -41,7 +41,7 @@ public class BatchedFragmentTest extends FragmentTest { @Test public void testBatched() { PendingGatewayMessage pending1 = createPending(10, false, false); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending1); PendingGatewayMessage pending2 = createPending(1024, false, false); @@ -77,7 +77,7 @@ public class BatchedFragmentTest extends FragmentTest { @Test public void testSingle() { PendingGatewayMessage pending = createPending(949, false, false); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending); TunnelGateway.QueuePreprocessor pre = createPreprocessor(_context); @@ -103,7 +103,7 @@ public class BatchedFragmentTest extends FragmentTest { @Test public void testMultiple() throws Exception { PendingGatewayMessage pending = createPending(2048, false, false); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending); TunnelGateway.QueuePreprocessor pre = createPreprocessor(_context); @@ -176,7 +176,7 @@ public class BatchedFragmentTest extends FragmentTest { } private void runBatch(PendingGatewayMessage pending1, PendingGatewayMessage pending2, PendingGatewayMessage pending3) { - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending1); TunnelGateway.QueuePreprocessor pre = createPreprocessor(_context); diff --git a/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java b/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java index f2261517b..2c0f5e1b4 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/FragmentTest.java @@ -54,7 +54,7 @@ public class FragmentTest { @Test public void testSingle() { PendingGatewayMessage pending = createPending(949, false, false); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending); TunnelGateway.QueuePreprocessor pre = createPreprocessor(_context); @@ -77,7 +77,7 @@ public class FragmentTest { @Test public void testMultiple() throws Exception { PendingGatewayMessage pending = createPending(2048, false, false); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending); TunnelGateway.QueuePreprocessor pre = createPreprocessor(_context); @@ -100,7 +100,7 @@ public class FragmentTest { */ public void runDelayed() { PendingGatewayMessage pending = createPending(2048, false, false); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending); TunnelGateway.QueuePreprocessor pre = createPreprocessor(_context); SenderImpl sender = new SenderImpl(); @@ -126,7 +126,7 @@ public class FragmentTest { protected boolean runVaried(int size, boolean includeRouter, boolean includeTunnel) { PendingGatewayMessage pending = createPending(size, includeRouter, includeTunnel); - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList(); messages.add(pending); DefragmentedReceiverImpl handleReceiver = new DefragmentedReceiverImpl(pending.getData()); diff --git a/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java b/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java index 980e77353..153515e96 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java +++ b/router/java/test/junit/net/i2p/router/tunnel/GatewayTestBase.java @@ -48,7 +48,7 @@ public abstract class GatewayTestBase extends RouterTestBase { public void testSmall() throws Exception { int runCount = 1; - List messages = new ArrayList(runCount); + List messages = new ArrayList(runCount); long start = _context.clock().now(); for (int i = 0; i < runCount; i++) { @@ -59,7 +59,7 @@ public abstract class GatewayTestBase extends RouterTestBase { Thread.sleep(1000); - List received = _receiver.clearReceived(); + List received = _receiver.clearReceived(); for (int i = 0; i < messages.size(); i++) { assertTrue(received.contains(((I2NPMessage)messages.get(i)))); } @@ -69,7 +69,7 @@ public abstract class GatewayTestBase extends RouterTestBase { public void testRouter() throws Exception { int runCount = 1; - List messages = new ArrayList(runCount); + List messages = new ArrayList(runCount); long start = _context.clock().now(); for (int i = 0; i < runCount; i++) { @@ -82,7 +82,7 @@ public abstract class GatewayTestBase extends RouterTestBase { Thread.sleep(1000); - List received = _receiver.clearReceived(); + List received = _receiver.clearReceived(); for (int i = 0; i < messages.size(); i++) { assertTrue(received.contains(((I2NPMessage)messages.get(i)))); } @@ -92,7 +92,7 @@ public abstract class GatewayTestBase extends RouterTestBase { public void testTunnel() throws Exception { int runCount = 1; - List messages = new ArrayList(runCount); + List messages = new ArrayList(runCount); long start = _context.clock().now(); for (int i = 0; i < runCount; i++) { @@ -107,7 +107,7 @@ public abstract class GatewayTestBase extends RouterTestBase { Thread.sleep(1000); - List received = _receiver.clearReceived(); + List received = _receiver.clearReceived(); for (int i = 0; i < messages.size(); i++) { assertTrue(received.contains(((I2NPMessage)messages.get(i)))); } @@ -117,7 +117,7 @@ public abstract class GatewayTestBase extends RouterTestBase { public void testLarge() throws Exception { int runCount = 1; - List messages = new ArrayList(runCount); + List messages = new ArrayList(runCount); long start = _context.clock().now(); for (int i = 0; i < runCount; i++) { @@ -128,7 +128,7 @@ public abstract class GatewayTestBase extends RouterTestBase { Thread.sleep(1000); - List received = _receiver.clearReceived(); + List received = _receiver.clearReceived(); for (int i = 0; i < messages.size(); i++) { assertTrue(received.contains(((I2NPMessage)messages.get(i)))); } @@ -148,11 +148,11 @@ public abstract class GatewayTestBase extends RouterTestBase { protected class TestReceiver implements TunnelGateway.Receiver, FragmentHandler.DefragmentedReceiver { private TunnelCreatorConfig _config; private FragmentHandler _handler; - private volatile List _received; + private volatile List _received; public TestReceiver(TunnelCreatorConfig config) { _config = config; _handler = new FragmentHandler(_context, TestReceiver.this); - _received = new ArrayList(1000); + _received = new ArrayList(1000); } public long receiveEncrypted(byte[] encrypted) { // fake all the hops... @@ -174,9 +174,9 @@ public abstract class GatewayTestBase extends RouterTestBase { public void receiveComplete(I2NPMessage msg, Hash toRouter, TunnelId toTunnel) { _received.add(msg); } - public List clearReceived() { - List rv = _received; - _received = new ArrayList(); + public List clearReceived() { + List rv = _received; + _received = new ArrayList(); return rv; } @Override diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java index 619bab3d8..870baeaaf 100644 --- a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java +++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java @@ -9,7 +9,6 @@ package net.i2p.router.tunnel; */ import junit.framework.TestCase; -import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.router.RouterContext;