This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.0.X by this push:
new 4978219fc Use the diamond notation
4978219fc is described below
commit 4978219fc08f3cf5efd3a0aad6c77ea81dd50378
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jul 16 10:08:40 2023 -0400
Use the diamond notation
---
.../core/polling/AbstractPollingIoConnector.java | 4 ++--
.../mina/filter/buffer/BufferedWriteFilter.java | 2 +-
.../mina/filter/firewall/BlacklistFilter.java | 2 +-
.../filter/firewall/ConnectionThrottleFilter.java | 2 +-
.../mina/filter/statistic/ProfilerTimerFilter.java | 2 +-
.../apache/mina/handler/chain/IoHandlerChain.java | 2 +-
.../mina/proxy/AbstractProxyLogicHandler.java | 2 +-
.../mina/transport/vmpipe/VmPipeAcceptor.java | 4 ++--
.../mina/transport/vmpipe/VmPipeConnector.java | 2 +-
.../mina/transport/vmpipe/VmPipeFilterChain.java | 6 +++---
.../mina/transport/vmpipe/VmPipeSession.java | 4 ++--
.../org/apache/mina/core/buffer/IoBufferTest.java | 2 +-
.../mina/core/service/AbstractIoServiceTest.java | 2 +-
.../org/apache/mina/filter/ssl/SslFilterTest.java | 4 ++--
.../stream/AbstractStreamWriteFilterTest.java | 4 ++--
.../mina/filter/util/WrappingFilterTest.java | 4 ++--
.../java/org/apache/mina/proxy/HttpAuthTest.java | 2 +-
.../VmPipeSessionCrossCommunicationTest.java | 2 +-
.../org/apache/mina/util/CircularQueueTest.java | 12 ++++++------
.../java/org/apache/mina/util/ExpiringMapTest.java | 2 +-
.../mina/util/byteaccess/ByteAccessTest.java | 2 +-
.../apache/mina/example/haiku/ToHaikuIoFilter.java | 2 +-
.../mina/example/tapedeck/CommandDecoder.java | 2 +-
.../org/apache/mina/example/udp/MemoryMonitor.java | 2 +-
.../mina/example/echoserver/ssl/SslFilterTest.java | 2 +-
.../apache/mina/example/proxy/ProxyTestClient.java | 4 ++--
.../proxy/telnet/ProxyTelnetTestClient.java | 2 +-
.../apache/mina/integration/beans/ArrayEditor.java | 2 +-
.../mina/integration/jmx/IoServiceMBean.java | 2 +-
.../mina/integration/jmx/IoSessionMBean.java | 2 +-
.../apache/mina/integration/jmx/ObjectMBean.java | 22 +++++++++++-----------
.../statemachine/StateMachineProxyBuilderTest.java | 2 +-
.../context/AbstractStateContextLookupTest.java | 2 +-
.../mina/transport/socket/apr/AprIoProcessor.java | 4 ++--
.../transport/socket/apr/AprSocketAcceptor.java | 2 +-
.../transport/socket/apr/AprSocketConnector.java | 6 +++---
36 files changed, 63 insertions(+), 63 deletions(-)
diff --git
a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
index c19c5dd76..ecf7639de 100644
---
a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
+++
b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
@@ -96,7 +96,7 @@ public abstract class AbstractPollingIoConnector<S extends
AbstractIoSession, H>
* {@link IoSession} type.
*/
protected AbstractPollingIoConnector(IoSessionConfig sessionConfig,
Class<? extends IoProcessor<S>> processorClass) {
- this(sessionConfig, null, new
SimpleIoProcessorPool<S>(processorClass), true);
+ this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass),
true);
}
/**
@@ -117,7 +117,7 @@ public abstract class AbstractPollingIoConnector<S extends
AbstractIoSession, H>
*/
protected AbstractPollingIoConnector(IoSessionConfig sessionConfig,
Class<? extends IoProcessor<S>> processorClass,
int processorCount) {
- this(sessionConfig, null, new SimpleIoProcessorPool<S>(processorClass,
processorCount), true);
+ this(sessionConfig, null, new SimpleIoProcessorPool<>(processorClass,
processorCount), true);
}
/**
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/buffer/BufferedWriteFilter.java
b/mina-core/src/main/java/org/apache/mina/filter/buffer/BufferedWriteFilter.java
index 4f9a48f77..d763a22bd 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/buffer/BufferedWriteFilter.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/buffer/BufferedWriteFilter.java
@@ -95,7 +95,7 @@ public final class BufferedWriteFilter extends
IoFilterAdapter {
super();
this.bufferSize = bufferSize;
if (buffersMap == null) {
- this.buffersMap = new LazyInitializedCacheMap<IoSession,
IoBuffer>();
+ this.buffersMap = new LazyInitializedCacheMap<>();
} else {
this.buffersMap = buffersMap;
}
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
b/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
index a43a5c493..abdf5f8e6 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*/
public class BlacklistFilter extends IoFilterAdapter {
/** The list of blocked addresses */
- private final List<Subnet> blacklist = new CopyOnWriteArrayList<Subnet>();
+ private final List<Subnet> blacklist = new CopyOnWriteArrayList<>();
/** A logger for this class */
private final static Logger LOGGER =
LoggerFactory.getLogger(BlacklistFilter.class);
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
b/mina-core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
index e38753344..a3c3b6fbd 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
@@ -112,7 +112,7 @@ public class ConnectionThrottleFilter extends
IoFilterAdapter {
*/
public ConnectionThrottleFilter(long allowedInterval) {
this.allowedInterval = allowedInterval;
- clients = new ConcurrentHashMap<String, Long>();
+ clients = new ConcurrentHashMap<>();
// Create the cleanup thread
ExpiredSessionThread cleanupThread = new ExpiredSessionThread();
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
b/mina-core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
index 39c089ae5..9ce4b9311 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
@@ -297,7 +297,7 @@ public class ProfilerTimerFilter extends IoFilterAdapter {
* @return a Set containing all the profiled {@link IoEventType}
*/
public Set<IoEventType> getEventsToProfile() {
- Set<IoEventType> set = new HashSet<IoEventType>();
+ Set<IoEventType> set = new HashSet<>();
if (profileMessageReceived) {
set.add(IoEventType.MESSAGE_RECEIVED);
diff --git
a/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
b/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
index 1c6021200..2ba48de2d 100644
--- a/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
+++ b/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
@@ -198,7 +198,7 @@ public class IoHandlerChain implements IoHandlerCommand {
* @throws Exception If we faced some exception during the cleanup
*/
public synchronized void clear() throws Exception {
- Iterator<String> it = new
ArrayList<String>(name2entry.keySet()).iterator();
+ Iterator<String> it = new ArrayList<>(name2entry.keySet()).iterator();
while (it.hasNext()) {
remove(it.next());
diff --git
a/mina-core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java
b/mina-core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java
index 6a8074e4f..b638db468 100644
---
a/mina-core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java
+++
b/mina-core/src/main/java/org/apache/mina/proxy/AbstractProxyLogicHandler.java
@@ -180,7 +180,7 @@ public abstract class AbstractProxyLogicHandler implements
ProxyLogicHandler {
*/
public synchronized void enqueueWriteRequest(final NextFilter nextFilter,
final WriteRequest writeRequest) {
if (writeRequestQueue == null) {
- writeRequestQueue = new LinkedList<Event>();
+ writeRequestQueue = new LinkedList<>();
}
writeRequestQueue.offer(new Event(nextFilter, writeRequest));
diff --git
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
index 3d6f72715..1ac704b15 100644
---
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
+++
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
@@ -46,7 +46,7 @@ public final class VmPipeAcceptor extends AbstractIoAcceptor {
// object used for checking session idle
private IdleStatusChecker idleChecker;
- static final Map<VmPipeAddress, VmPipe> boundHandlers = new
HashMap<VmPipeAddress, VmPipe>();
+ static final Map<VmPipeAddress, VmPipe> boundHandlers = new HashMap<>();
/**
* Creates a new instance.
@@ -124,7 +124,7 @@ public final class VmPipeAcceptor extends
AbstractIoAcceptor {
*/
@Override
protected Set<SocketAddress> bindInternal(List<? extends SocketAddress>
localAddresses) throws IOException {
- Set<SocketAddress> newLocalAddresses = new HashSet<SocketAddress>();
+ Set<SocketAddress> newLocalAddresses = new HashSet<>();
synchronized (boundHandlers) {
for (SocketAddress a : localAddresses) {
diff --git
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
index 25791da9b..fe14152e6 100644
---
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
+++
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
@@ -155,7 +155,7 @@ public final class VmPipeConnector extends
AbstractIoConnector {
idleChecker.getNotifyingTask().cancel();
}
- private static final Set<VmPipeAddress> TAKEN_LOCAL_ADDRESSES = new
HashSet<VmPipeAddress>();
+ private static final Set<VmPipeAddress> TAKEN_LOCAL_ADDRESSES = new
HashSet<>();
private static int nextLocalPort = -1;
diff --git
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
index 3872e0457..a522b9bc7 100644
---
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
+++
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
@@ -42,7 +42,7 @@ import
org.apache.mina.core.write.WriteToClosedSessionException;
*/
class VmPipeFilterChain extends DefaultIoFilterChain {
- private final Queue<IoEvent> eventQueue = new
ConcurrentLinkedQueue<IoEvent>();
+ private final Queue<IoEvent> eventQueue = new ConcurrentLinkedQueue<>();
private final IoProcessor<VmPipeSession> processor = new
VmPipeIoProcessor();
@@ -205,7 +205,7 @@ class VmPipeFilterChain extends DefaultIoFilterChain {
flushPendingDataQueues(session);
} else {
- List<WriteRequest> failedRequests = new
ArrayList<WriteRequest>();
+ List<WriteRequest> failedRequests = new ArrayList<>();
WriteRequest req;
while ((req = queue.poll(session)) != null) {
failedRequests.add(req);
@@ -266,7 +266,7 @@ class VmPipeFilterChain extends DefaultIoFilterChain {
public void updateTrafficControl(VmPipeSession session) {
if (!session.isReadSuspended()) {
- List<Object> data = new ArrayList<Object>();
+ List<Object> data = new ArrayList<>();
session.receivedMessageQueue.drainTo(data);
for (Object aData : data) {
VmPipeFilterChain.this.fireMessageReceived(aData);
diff --git
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
index 0fd10ba0f..b6ba4da07 100644
---
a/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
+++
b/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
@@ -73,7 +73,7 @@ class VmPipeSession extends AbstractIoSession {
this.localAddress = localAddress;
remoteAddress = serviceAddress = remoteEntry.getAddress();
filterChain = new VmPipeFilterChain(this);
- receivedMessageQueue = new LinkedBlockingQueue<Object>();
+ receivedMessageQueue = new LinkedBlockingQueue<>();
remoteSession = new VmPipeSession(this, remoteEntry);
}
@@ -90,7 +90,7 @@ class VmPipeSession extends AbstractIoSession {
remoteAddress = remoteSession.localAddress;
filterChain = new VmPipeFilterChain(this);
this.remoteSession = remoteSession;
- receivedMessageQueue = new LinkedBlockingQueue<Object>();
+ receivedMessageQueue = new LinkedBlockingQueue<>();
}
@Override
diff --git
a/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java
b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java
index 6b182406a..444584d24 100644
--- a/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java
+++ b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java
@@ -368,7 +368,7 @@ public class IoBufferTest {
public void testObjectSerialization() throws Exception {
IoBuffer buf = IoBuffer.allocate(16);
buf.setAutoExpand(true);
- List<Object> o = new ArrayList<Object>();
+ List<Object> o = new ArrayList<>();
o.add(new Date());
o.add(long.class);
diff --git
a/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java
b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java
index 018183739..6c458ac2d 100644
---
a/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java
+++
b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java
@@ -165,7 +165,7 @@ public class AbstractIoServiceTest {
}
private List<String> getThreadNames() {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
int active = Thread.activeCount();
Thread[] threads = new Thread[active];
Thread.enumerate(threads);
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterTest.java
b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterTest.java
index ee0d6932f..32b4d92d1 100644
--- a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterTest.java
+++ b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterTest.java
@@ -85,8 +85,8 @@ public class SslFilterTest {
@Test
public void testFlushRaceCondition() {
final ExecutorService executor = Executors.newFixedThreadPool(1);
- final List<Object> message_received_messages = new ArrayList<Object>();
- final List<WriteRequest> filter_write_requests = new
ArrayList<WriteRequest>();
+ final List<Object> message_received_messages = new ArrayList<>();
+ final List<WriteRequest> filter_write_requests = new ArrayList<>();
final AbstractNextFilter write_filter = new AbstractNextFilter()
{
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
b/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
index 74cb37bad..798891f54 100644
---
a/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
+++
b/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
@@ -220,7 +220,7 @@ public abstract class AbstractStreamWriteFilterTest<M, U
extends AbstractStreamW
AbstractStreamWriteFilter<M> filter = createFilter();
M message = createMessage(new byte[5]);
- Queue<WriteRequest> queue = new LinkedList<WriteRequest>();
+ Queue<WriteRequest> queue = new LinkedList<>();
/*
* Make up the situation.
@@ -256,7 +256,7 @@ public abstract class AbstractStreamWriteFilterTest<M, U
extends AbstractStreamW
WriteRequest wrs[] = new WriteRequest[] { new DefaultWriteRequest(new
Object(), new DummyWriteFuture()),
new DefaultWriteRequest(new Object(), new DummyWriteFuture()),
new DefaultWriteRequest(new Object(), new DummyWriteFuture())
};
- Queue<WriteRequest> queue = new LinkedList<WriteRequest>();
+ Queue<WriteRequest> queue = new LinkedList<>();
queue.add(wrs[0]);
queue.add(wrs[1]);
queue.add(wrs[2]);
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java
b/mina-core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java
index 9e396b738..6bad7234e 100644
---
a/mina-core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java
+++
b/mina-core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java
@@ -114,9 +114,9 @@ public class WrappingFilterTest {
}
private static class MyWrappingFilter extends CommonEventFilter {
- List<IoEventType> eventsBefore = new ArrayList<IoEventType>();
+ List<IoEventType> eventsBefore = new ArrayList<>();
- List<IoEventType> eventsAfter = new ArrayList<IoEventType>();
+ List<IoEventType> eventsAfter = new ArrayList<>();
/**
* Default constructor
diff --git a/mina-core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
b/mina-core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
index 537a5ac12..9e686cc6f 100644
--- a/mina-core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
+++ b/mina-core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
@@ -62,7 +62,7 @@ public class HttpAuthTest {
String PWD = "Circle Of Life";
String METHOD = "GET";
- HashMap<String, String> map = new HashMap<String, String>();
+ HashMap<String, String> map = new HashMap<>();
map.put("realm", "testre...@host.com");
map.put("qop", "auth");
diff --git
a/mina-core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
b/mina-core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
index c954d3718..42745c57a 100644
---
a/mina-core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
+++
b/mina-core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
@@ -44,7 +44,7 @@ public class VmPipeSessionCrossCommunicationTest {
public void testOneSessionTalkingBackAndForthDoesNotDeadlock() throws
Exception {
final VmPipeAddress address = new VmPipeAddress(1);
final IoConnector connector = new VmPipeConnector();
- final AtomicReference<IoSession> c1 = new AtomicReference<IoSession>();
+ final AtomicReference<IoSession> c1 = new AtomicReference<>();
final CountDownLatch latch = new CountDownLatch(1);
final CountDownLatch messageCount = new CountDownLatch(2);
IoAcceptor acceptor = new VmPipeAcceptor();
diff --git
a/mina-core/src/test/java/org/apache/mina/util/CircularQueueTest.java
b/mina-core/src/test/java/org/apache/mina/util/CircularQueueTest.java
index 6dc8a9b4f..814ef542a 100644
--- a/mina-core/src/test/java/org/apache/mina/util/CircularQueueTest.java
+++ b/mina-core/src/test/java/org/apache/mina/util/CircularQueueTest.java
@@ -46,13 +46,13 @@ public class CircularQueueTest {
@Test
public void testRotation() {
- CircularQueue<Integer> q = new CircularQueue<Integer>(); //
DEFAULT_CAPACITY = 4
+ CircularQueue<Integer> q = new CircularQueue<>(); // DEFAULT_CAPACITY
= 4
testRotation0(q);
}
@Test
public void testExpandingRotation() {
- CircularQueue<Integer> q = new CircularQueue<Integer>(); //
DEFAULT_CAPACITY = 4
+ CircularQueue<Integer> q = new CircularQueue<>(); // DEFAULT_CAPACITY
= 4
for (int i = 0; i < 10; i++) {
testRotation0(q);
@@ -76,7 +76,7 @@ public class CircularQueueTest {
@Test
public void testRandomAddOnQueue() {
- CircularQueue<Integer> q = new CircularQueue<Integer>();
+ CircularQueue<Integer> q = new CircularQueue<>();
// Create a queue with 5 elements and capacity 8;
for (int i = 0; i < 5; i++) {
q.offer(new Integer(i));
@@ -143,7 +143,7 @@ public class CircularQueueTest {
@Test
public void testRandomRemoveOnQueue() {
- CircularQueue<Integer> q = new CircularQueue<Integer>();
+ CircularQueue<Integer> q = new CircularQueue<>();
// Create a queue with 5 elements and capacity 8;
for (int i = 0; i < 5; i++) {
@@ -195,7 +195,7 @@ public class CircularQueueTest {
@Test
public void testExpandAndShrink() throws Exception {
- CircularQueue<Integer> q = new CircularQueue<Integer>();
+ CircularQueue<Integer> q = new CircularQueue<>();
for (int i = 0; i < 1024; i++) {
q.offer(i);
}
@@ -217,7 +217,7 @@ public class CircularQueueTest {
}
private CircularQueue<Integer> getRotatedQueue() {
- CircularQueue<Integer> q = new CircularQueue<Integer>();
+ CircularQueue<Integer> q = new CircularQueue<>();
// Ensure capacity: 16
for (int i = 0; i < 16; i++) {
diff --git a/mina-core/src/test/java/org/apache/mina/util/ExpiringMapTest.java
b/mina-core/src/test/java/org/apache/mina/util/ExpiringMapTest.java
index 33f16bcfa..8471a86ec 100644
--- a/mina-core/src/test/java/org/apache/mina/util/ExpiringMapTest.java
+++ b/mina-core/src/test/java/org/apache/mina/util/ExpiringMapTest.java
@@ -43,7 +43,7 @@ public class ExpiringMapTest {
*/
@Before
public void setUp() throws Exception {
- theMap = new ExpiringMap<String, String>(1, 2);
+ theMap = new ExpiringMap<>(1, 2);
theMap.put("Apache", "MINA");
theMap.getExpirer().startExpiringIfNotStarted();
Thread.sleep(3000);
diff --git
a/mina-core/src/test/java/org/apache/mina/util/byteaccess/ByteAccessTest.java
b/mina-core/src/test/java/org/apache/mina/util/byteaccess/ByteAccessTest.java
index 0431c4755..7242c167c 100644
---
a/mina-core/src/test/java/org/apache/mina/util/byteaccess/ByteAccessTest.java
+++
b/mina-core/src/test/java/org/apache/mina/util/byteaccess/ByteAccessTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
*/
public class ByteAccessTest {
- private List<String> operations = new ArrayList<String>();
+ private List<String> operations = new ArrayList<>();
private void resetOperations() {
operations.clear();
diff --git
a/mina-example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java
b/mina-example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java
index 8dd315f00..ff9321d23 100644
---
a/mina-example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java
+++
b/mina-example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java
@@ -36,7 +36,7 @@ public class ToHaikuIoFilter extends IoFilterAdapter {
List<String> phrases = (List<String>) session.getAttribute("phrases");
if (null == phrases) {
- phrases = new ArrayList<String>();
+ phrases = new ArrayList<>();
session.setAttribute("phrases", phrases);
}
diff --git
a/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java
b/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java
index 6ea3846d0..92fed0645 100644
---
a/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java
+++
b/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java
@@ -89,7 +89,7 @@ public class CommandDecoder extends TextLineDecoder {
public void decode(IoSession session, IoBuffer in, final
ProtocolDecoderOutput out)
throws Exception {
- final LinkedList<String> lines = new LinkedList<String>();
+ final LinkedList<String> lines = new LinkedList<>();
super.decode(session, in, new ProtocolDecoderOutput() {
public void write(Object message) {
lines.add((String) message);
diff --git
a/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
b/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
index ca1c395a7..e76938a12 100644
--- a/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
+++ b/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
@@ -68,7 +68,7 @@ public class MemoryMonitor {
tabbedPane = new JTabbedPane();
tabbedPane.add("Welcome", createWelcomePanel());
frame.add(tabbedPane, BorderLayout.CENTER);
- clients = new ConcurrentHashMap<SocketAddress, ClientPanel>();
+ clients = new ConcurrentHashMap<>();
frame.pack();
frame.setLocation(300, 300);
frame.setVisible(true);
diff --git
a/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
b/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
index c5ac40e11..4ab098c28 100644
---
a/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
+++
b/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
@@ -149,7 +149,7 @@ public class SslFilterTest {
private static class EchoHandler extends IoHandlerAdapter {
- List<String> sentMessages = new ArrayList<String>();
+ List<String> sentMessages = new ArrayList<>();
@Override
public void exceptionCaught(IoSession session, Throwable cause)
diff --git
a/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
b/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
index 0bbd85e84..1dcf7e387 100644
---
a/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
+++
b/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
@@ -147,7 +147,7 @@ public class ProxyTestClient {
// Tests modifying authentication order preferences. First algorithm
in list available on server
// will be used for authentication.
- List<HttpAuthenticationMethods> l = new
ArrayList<HttpAuthenticationMethods>();
+ List<HttpAuthenticationMethods> l = new ArrayList<>();
l.add(HttpAuthenticationMethods.DIGEST);
l.add(HttpAuthenticationMethods.BASIC);
proxyIoSession.setPreferedOrder(l);
@@ -196,7 +196,7 @@ public class ProxyTestClient {
*/
private HttpProxyRequest createHttpProxyRequest(String uri) {
HttpProxyRequest req = new HttpProxyRequest(uri);
- HashMap<String, String> props = new HashMap<String, String>();
+ HashMap<String, String> props = new HashMap<>();
props.put(HttpProxyConstants.USER_PROPERTY, USER);
props.put(HttpProxyConstants.PWD_PROPERTY, PWD);
props.put(HttpProxyConstants.DOMAIN_PROPERTY, DOMAIN);
diff --git
a/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java
b/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java
index e803958be..cb26d9280 100644
---
a/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java
+++
b/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java
@@ -90,7 +90,7 @@ public class ProxyTelnetTestClient {
*/
HttpProxyRequest req = new HttpProxyRequest(serverAddress);
- HashMap<String, String> props = new HashMap<String, String>();
+ HashMap<String, String> props = new HashMap<>();
props.put(HttpProxyConstants.USER_PROPERTY, USER);
props.put(HttpProxyConstants.PWD_PROPERTY, PWD);
req.setProperties(props);
diff --git
a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java
b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java
index a7353af5b..72b754ef3 100644
---
a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java
+++
b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/ArrayEditor.java
@@ -102,7 +102,7 @@ public class ArrayEditor extends AbstractPropertyEditor {
@Override
protected Object toValue(String text) throws IllegalArgumentException {
PropertyEditor e = getComponentEditor();
- List<Object> values = new ArrayList<Object>();
+ List<Object> values = new ArrayList<>();
Matcher m = CollectionEditor.ELEMENT.matcher(text);
boolean matchedDelimiter = true;
diff --git
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java
index 3a7069076..43f66151e 100644
---
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java
+++
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java
@@ -70,7 +70,7 @@ public class IoServiceMBean extends ObjectMBean<IoService> {
if (name.equals("findAndRegisterSessions")) {
IoSessionFinder finder = new IoSessionFinder((String) params[0]);
- Set<IoSession> registeredSessions = new LinkedHashSet<IoSession>();
+ Set<IoSession> registeredSessions = new LinkedHashSet<>();
for (IoSession s :
finder.find(getSource().getManagedSessions().values())) {
try {
diff --git
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java
index 1bd623fe9..76f57354a 100644
---
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java
+++
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java
@@ -47,7 +47,7 @@ public class IoSessionMBean extends ObjectMBean<IoSession> {
@Override
protected Object getAttribute0(String fqan) throws Exception {
if (fqan.equals("attributes")) {
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
for (Object key : getSource().getAttributeKeys()) {
answer.put(String.valueOf(key),
String.valueOf(getSource().getAttribute(key)));
diff --git
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
index 25bd03d04..c1b77a207 100644
---
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
+++
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
@@ -104,7 +104,7 @@ import org.slf4j.LoggerFactory;
*/
public class ObjectMBean<T> implements ModelMBean, MBeanRegistration {
- private static final Map<ObjectName, Object> sources = new
ConcurrentHashMap<ObjectName, Object>();
+ private static final Map<ObjectName, Object> sources = new
ConcurrentHashMap<>();
/**
* Get the monitored object
@@ -130,7 +130,7 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
private final MBeanInfo info;
- private final Map<String, PropertyDescriptor> propertyDescriptors = new
HashMap<String, PropertyDescriptor>();
+ private final Map<String, PropertyDescriptor> propertyDescriptors = new
HashMap<>();
private final TypeConverter typeConverter = new OgnlTypeConverter();
@@ -448,8 +448,8 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
ModelMBeanConstructorInfo[] constructors = new
ModelMBeanConstructorInfo[0];
ModelMBeanNotificationInfo[] notifications = new
ModelMBeanNotificationInfo[0];
- List<ModelMBeanAttributeInfo> attributes = new
ArrayList<ModelMBeanAttributeInfo>();
- List<ModelMBeanOperationInfo> operations = new
ArrayList<ModelMBeanOperationInfo>();
+ List<ModelMBeanAttributeInfo> attributes = new ArrayList<>();
+ List<ModelMBeanOperationInfo> operations = new ArrayList<>();
addAttributes(attributes, source);
addExtraAttributes(attributes);
@@ -566,7 +566,7 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
continue;
}
- List<MBeanParameterInfo> signature = new
ArrayList<MBeanParameterInfo>();
+ List<MBeanParameterInfo> signature = new ArrayList<>();
int i = 1;
for (Class<?> paramType : m.getParameterTypes()) {
String paramName = "p" + (i++);
@@ -720,7 +720,7 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
}
if (v instanceof IoFilterChainBuilder) {
- Map<String, String> filterMapping = new LinkedHashMap<String,
String>();
+ Map<String, String> filterMapping = new LinkedHashMap<>();
if (v instanceof DefaultIoFilterChainBuilder) {
for (IoFilterChain.Entry e : ((DefaultIoFilterChainBuilder)
v).getAll()) {
filterMapping.put(e.getName(),
e.getFilter().getClass().getName());
@@ -732,7 +732,7 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
}
if (v instanceof IoFilterChain) {
- Map<String, String> filterMapping = new LinkedHashMap<String,
String>();
+ Map<String, String> filterMapping = new LinkedHashMap<>();
for (IoFilterChain.Entry e : ((IoFilterChain) v).getAll()) {
filterMapping.put(e.getName(),
e.getFilter().getClass().getName());
}
@@ -742,15 +742,15 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
if (!writable) {
if ((v instanceof Collection) || (v instanceof Map)) {
if (v instanceof List) {
- return convertCollection(v, new ArrayList<Object>());
+ return convertCollection(v, new ArrayList<>());
}
if (v instanceof Set) {
- return convertCollection(v, new LinkedHashSet<Object>());
+ return convertCollection(v, new LinkedHashSet<>());
}
if (v instanceof Map) {
- return convertCollection(v, new LinkedHashMap<Object,
Object>());
+ return convertCollection(v, new LinkedHashMap<>());
}
- return convertCollection(v, new ArrayList<Object>());
+ return convertCollection(v, new ArrayList<>());
}
if ((v instanceof Date) || (v instanceof Boolean) || (v instanceof
Character) || (v instanceof Number)) {
diff --git
a/mina-statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
b/mina-statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
index 84f5641b7..750c6178a 100644
---
a/mina-statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
+++
b/mina-statemachine/src/test/java/org/apache/mina/statemachine/StateMachineProxyBuilderTest.java
@@ -207,7 +207,7 @@ public class StateMachineProxyBuilderTest {
@org.apache.mina.statemachine.annotation.State(PARENT)
public static final String S5 = "s5";
- private LinkedList<String> messages = new LinkedList<String>();
+ private LinkedList<String> messages = new LinkedList<>();
@OnEntry(S2)
public void onEntryS2() {
diff --git
a/mina-statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java
b/mina-statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java
index ad5950bf2..7d428db78 100644
---
a/mina-statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java
+++
b/mina-statemachine/src/test/java/org/apache/mina/statemachine/context/AbstractStateContextLookupTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class AbstractStateContextLookupTest {
@Test
public void testLookup() throws Exception {
- Map<String, StateContext> map = new HashMap<String, StateContext>();
+ Map<String, StateContext> map = new HashMap<>();
AbstractStateContextLookup lookup = new AbstractStateContextLookup(new
DefaultStateContextFactory()) {
protected boolean supports(Class<?> c) {
return Map.class.isAssignableFrom(c);
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
index 3d0e4abbe..65d9cb1f9 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
@@ -48,7 +48,7 @@ import org.apache.tomcat.jni.Status;
public final class AprIoProcessor extends
AbstractPollingIoProcessor<AprSession> {
private static final int POLLSET_SIZE = 1024;
- private final Map<Long, AprSession> allSessions = new HashMap<Long,
AprSession>(POLLSET_SIZE);
+ private final Map<Long, AprSession> allSessions = new
HashMap<>(POLLSET_SIZE);
private final Object wakeupLock = new Object();
@@ -64,7 +64,7 @@ public final class AprIoProcessor extends
AbstractPollingIoProcessor<AprSession>
private final long[] polledSockets = new long[POLLSET_SIZE << 1];
- private final Queue<AprSession> polledSessions = new
ConcurrentLinkedQueue<AprSession>();
+ private final Queue<AprSession> polledSessions = new
ConcurrentLinkedQueue<>();
/**
* Create a new instance of {@link AprIoProcessor} with a given Exector for
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
index eb3d8d172..890d05a2f 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
@@ -68,7 +68,7 @@ public final class AprSocketAcceptor extends
AbstractPollingIoAcceptor<AprSessio
private final long[] polledSockets = new long[POLLSET_SIZE << 1];
- private final Queue<Long> polledHandles = new
ConcurrentLinkedQueue<Long>();
+ private final Queue<Long> polledHandles = new ConcurrentLinkedQueue<>();
/**
* Constructor for {@link AprSocketAcceptor} using default parameters
(multiple thread model).
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
index 8c943b834..f8e5c29bc 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
@@ -63,7 +63,7 @@ public final class AprSocketConnector extends
AbstractPollingIoConnector<AprSess
private static final int POLLSET_SIZE = 1024;
- private final Map<Long, ConnectionRequest> requests = new HashMap<Long,
ConnectionRequest>(POLLSET_SIZE);
+ private final Map<Long, ConnectionRequest> requests = new
HashMap<>(POLLSET_SIZE);
private final Object wakeupLock = new Object();
@@ -77,9 +77,9 @@ public final class AprSocketConnector extends
AbstractPollingIoConnector<AprSess
private final long[] polledSockets = new long[POLLSET_SIZE << 1];
- private final Queue<Long> polledHandles = new
ConcurrentLinkedQueue<Long>();
+ private final Queue<Long> polledHandles = new ConcurrentLinkedQueue<>();
- private final Set<Long> failedHandles = new HashSet<Long>(POLLSET_SIZE);
+ private final Set<Long> failedHandles = new HashSet<>(POLLSET_SIZE);
private volatile ByteBuffer dummyBuffer;
