From 552dd189a588645a67c545165c99cd9c22ee276d Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 22 Nov 2013 04:18:26 +0000
Subject: [PATCH] streaming: type arguments, unused imports
---
.../java/src/net/i2p/client/streaming/Connection.java | 5 ++---
.../src/net/i2p/client/streaming/ConnectionHandler.java | 1 -
.../src/net/i2p/client/streaming/ConnectionOptions.java | 8 ++++----
.../net/i2p/client/streaming/ConnectionPacketHandler.java | 1 -
.../java/src/net/i2p/client/streaming/MessageHandler.java | 3 ++-
.../src/net/i2p/client/streaming/MessageInputStream.java | 7 +++----
.../java/src/net/i2p/client/streaming/PacketHandler.java | 2 --
.../java/src/net/i2p/client/streaming/PcapWriter.java | 1 -
.../src/net/i2p/client/streaming/SchedulerChooser.java | 4 ++--
.../java/src/net/i2p/client/streaming/SchedulerImpl.java | 1 -
.../net/i2p/client/streaming/ConnectInactivityTest.java | 1 -
.../test/junit/net/i2p/client/streaming/ConnectTest.java | 1 -
.../net/i2p/client/streaming/ConnectTimeoutTest.java | 1 -
.../junit/net/i2p/client/streaming/EchoLargeTest.java | 1 -
.../net/i2p/client/streaming/MessageInputStreamTest.java | 6 +++---
15 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
index fbc99d4399..c206ba48d4 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
@@ -15,7 +15,6 @@ import net.i2p.client.I2PSession;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
import net.i2p.util.SimpleTimer;
import net.i2p.util.SimpleTimer2;
@@ -125,7 +124,7 @@ class Connection {
// FIXME pass through a passive flush delay setting as the 4th arg
_outputStream = new MessageOutputStream(_context, timer, _receiver, (opts == null ? Packet.MAX_PAYLOAD_SIZE : opts.getMaxMessageSize()));
_timer = timer;
- _outboundPackets = new TreeMap();
+ _outboundPackets = new TreeMap<Long, PacketLocal>();
if (opts != null) {
_localPort = opts.getLocalPort();
_remotePort = opts.getPort();
@@ -469,7 +468,7 @@ class Connection {
}
if (!nacked) { // aka ACKed
if (acked == null)
- acked = new ArrayList(8);
+ acked = new ArrayList<PacketLocal>(8);
PacketLocal ackedPacket = e.getValue();
ackedPacket.ackReceived();
acked.add(ackedPacket);
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java
index 2c22b63714..2758735b99 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java
@@ -6,7 +6,6 @@ import java.util.concurrent.TimeUnit;
import net.i2p.I2PAppContext;
import net.i2p.data.Destination;
import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
import net.i2p.util.SimpleTimer;
/**
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
index 9f2c5d5df1..0e5b0dccbd 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
@@ -767,13 +767,13 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
// but avoid concurrent modification just in case
Set<Hash> accessList, blackList;
if (accessListEnabled)
- accessList = new HashSet();
+ accessList = new HashSet<Hash>();
else
- accessList = Collections.EMPTY_SET;
+ accessList = Collections.emptySet();
if (blackListEnabled)
- blackList = new HashSet();
+ blackList = new HashSet<Hash>();
else
- blackList = Collections.EMPTY_SET;
+ blackList = Collections.emptySet();
if (accessListEnabled || blackListEnabled) {
String hashes = opts.getProperty(PROP_ACCESS_LIST);
if (hashes == null)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java
index ef7c6cd0b6..c55adceb76 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java
@@ -7,7 +7,6 @@ import net.i2p.I2PException;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
import net.i2p.util.SimpleTimer;
/**
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
index 4aba07d314..b0201a89c5 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
@@ -8,6 +8,7 @@ import net.i2p.I2PAppContext;
import net.i2p.client.I2PSession;
import net.i2p.client.I2PSessionException;
import net.i2p.client.I2PSessionMuxedListener;
+import net.i2p.client.streaming.I2PSocketManager.DisconnectListener;
import net.i2p.util.Log;
/**
@@ -25,7 +26,7 @@ class MessageHandler implements I2PSessionMuxedListener {
public MessageHandler(I2PAppContext ctx, ConnectionManager mgr) {
_manager = mgr;
_context = ctx;
- _listeners = new CopyOnWriteArraySet();
+ _listeners = new CopyOnWriteArraySet<DisconnectListener>();
_log = ctx.logManager().getLog(MessageHandler.class);
_context.statManager().createRateStat("stream.packetReceiveFailure", "When do we fail to decrypt or otherwise receive a packet sent to us?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
}
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
index bcfb643956..d062737308 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
@@ -4,7 +4,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,11 +62,11 @@ class MessageInputStream extends InputStream {
public MessageInputStream(I2PAppContext ctx) {
_log = ctx.logManager().getLog(MessageInputStream.class);
- _readyDataBlocks = new ArrayList(4);
+ _readyDataBlocks = new ArrayList<ByteArray>(4);
_highestReadyBlockId = -1;
_highestBlockId = -1;
_readTimeout = -1;
- _notYetReadyBlocks = new HashMap(4);
+ _notYetReadyBlocks = new HashMap<Long, ByteArray>(4);
_dataLock = new Object();
//_cache = ByteCache.getInstance(128, Packet.MAX_PAYLOAD_SIZE);
}
@@ -110,7 +109,7 @@ class MessageInputStream extends InputStream {
// ACK
} else {
if (ids == null)
- ids = new ArrayList(4);
+ ids = new ArrayList<Long>(4);
ids.add(l);
}
}
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java
index e528abe2c7..7dd10c331d 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java
@@ -2,8 +2,6 @@ package net.i2p.client.streaming;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Set;
-
import net.i2p.I2PAppContext;
import net.i2p.I2PException;
import net.i2p.data.Destination;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java b/apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java
index 00448f45d9..716f41ff84 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java
@@ -9,7 +9,6 @@ import java.io.OutputStream;
import net.i2p.I2PAppContext;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
-import net.i2p.data.Hash;
/**
* Write a standard pcap file with a "TCP" packet that can be analyzed with
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java
index 1dd473907a..34195cc284 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java
@@ -36,8 +36,8 @@ class SchedulerChooser {
return _nullScheduler;
}
- private List createSchedulers() {
- List rv = new ArrayList(8);
+ private List<TaskScheduler> createSchedulers() {
+ List<TaskScheduler> rv = new ArrayList<TaskScheduler>(8);
rv.add(new SchedulerHardDisconnected(_context));
rv.add(new SchedulerPreconnect(_context));
rv.add(new SchedulerConnecting(_context));
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java
index 5d042c9ff0..0b8c7fa8a4 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java
@@ -2,7 +2,6 @@ package net.i2p.client.streaming;
import net.i2p.I2PAppContext;
import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
/**
* Base scheduler
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java
index 0b945037cc..2ef2338eaa 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java
@@ -6,7 +6,6 @@ import org.junit.Test;
import net.i2p.I2PAppContext;
-import net.i2p.client.I2PClient;
import net.i2p.client.I2PSession;
import net.i2p.util.Log;
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java
index c2c880c38a..4a9d32b130 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java
@@ -6,7 +6,6 @@ import org.junit.Before;
import org.junit.Test;
import net.i2p.I2PAppContext;
-import net.i2p.client.I2PClient;
import net.i2p.client.I2PSession;
import net.i2p.util.Log;
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java
index c2d530a679..8bfffc5f5d 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java
@@ -6,7 +6,6 @@ import java.util.Properties;
import org.junit.Test;
import net.i2p.I2PAppContext;
-import net.i2p.client.I2PClient;
import net.i2p.client.I2PClientFactory;
import net.i2p.client.I2PSession;
import net.i2p.data.Destination;
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java
index 72d136b9ef..52a643a8f6 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java
@@ -9,7 +9,6 @@ import org.junit.Test;
import net.i2p.I2PAppContext;
import net.i2p.client.I2PSession;
-import net.i2p.data.Base64;
import net.i2p.util.Log;
/**
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java
index f42727248b..da9d08d8dc 100644
--- a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java
+++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java
@@ -59,7 +59,7 @@ public class MessageInputStreamTest extends TestCase {
_context.random().nextBytes(orig);
MessageInputStream in = new MessageInputStream(_context);
- ArrayList order = new ArrayList(32);
+ ArrayList<Integer> order = new ArrayList<Integer>(32);
for (int i = 0; i < orig.length / 1024; i++)
order.add(new Integer(i));
Collections.shuffle(order);
@@ -92,7 +92,7 @@ public class MessageInputStreamTest extends TestCase {
MessageInputStream in = new MessageInputStream(_context);
for (int n = 0; n < 3; n++) {
- ArrayList order = new ArrayList(32);
+ ArrayList<Integer> order = new ArrayList<Integer>(32);
for (int i = 0; i < orig.length / 1024; i++)
order.add(new Integer(i));
Collections.shuffle(order);
@@ -126,7 +126,7 @@ public class MessageInputStreamTest extends TestCase {
_context.random().nextBytes(orig);
MessageInputStream in = new MessageInputStream(_context);
- ArrayList order = new ArrayList(32);
+ ArrayList<Integer> order = new ArrayList<Integer>(32);
for (int i = 0; i < orig.length / 1024; i++)
order.add(new Integer(i));
Collections.shuffle(order);
--
GitLab