You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ma...@apache.org on 2015/10/09 22:43:41 UTC
incubator-reef git commit: [REEF-824] Use diamond operator for
generic instance creation
Repository: incubator-reef
Updated Branches:
refs/heads/master 738c51d11 -> 932206944
[REEF-824] Use diamond operator for generic instance creation
This replaces old-style generic instance creation with diamond operator
to improve code readability.
JIRA:
[REEF-824](https://issues.apache.org/jira/browse/REEF-824)
Pull Request:
This closes #555
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/93220694
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/93220694
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/93220694
Branch: refs/heads/master
Commit: 932206944e24b7577d00075ae1985e446a5347f0
Parents: 738c51d
Author: Dongjoon Hyun <do...@apache.org>
Authored: Fri Oct 9 10:45:28 2015 +0900
Committer: Mariia Mykhailova <ma...@apache.org>
Committed: Fri Oct 9 13:42:04 2015 -0700
----------------------------------------------------------------------
.../apache/reef/javabridge/InteropLogger.java | 2 +-
.../reef/javabridge/InteropReturnInfo.java | 2 +-
.../util/logging/CLRBufferedLogHandler.java | 2 +-
.../org/apache/reef/util/logging/LogParser.java | 8 +++---
.../apache/reef/io/network/impl/NSMessage.java | 2 +-
.../reef/io/network/impl/NSMessageCodec.java | 6 ++---
.../reef/io/network/impl/NetworkService.java | 4 +--
.../io/network/naming/NamingCodecFactory.java | 12 ++++-----
.../serialization/NamingLookupRequestCodec.java | 2 +-
.../NamingLookupResponseCodec.java | 2 +-
.../apache/reef/io/storage/MergingIterator.java | 3 +--
.../apache/reef/io/storage/ram/CodecRamMap.java | 2 +-
.../apache/reef/io/storage/ram/RamSpool.java | 2 +-
.../reef/io/network/NetworkServiceTest.java | 18 +++++++-------
.../reef/io/network/naming/NamingTest.java | 21 ++++++++--------
.../reef/io/storage/SortingSpoolTest.java | 4 +--
.../local/driver/ResourceManagerTest.java | 8 +++---
.../reef/tang/implementation/TangImpl.java | 2 +-
.../implementation/java/ClassHierarchyImpl.java | 2 +-
.../tang/implementation/java/InjectorImpl.java | 15 +++++------
.../protobuf/ProtocolBufferInjectionPlan.java | 4 +--
.../reef/wake/impl/PubSubEventHandler.java | 2 +-
.../apache/reef/wake/profiler/WakeProfiler.java | 4 +--
.../reef/wake/remote/impl/MultiCodec.java | 10 +++-----
.../reef/wake/remote/impl/RemoteEventCodec.java | 4 +--
.../remote/impl/RemoteSenderEventHandler.java | 8 +++---
.../reef/wake/test/ForkPoolStageTest.java | 19 +++++++-------
.../wake/test/PubSubThreadPoolStageTest.java | 4 +--
.../apache/reef/wake/test/SyncStageTest.java | 9 +++----
.../reef/wake/test/ThreadPoolStageTest.java | 19 +++++++-------
.../remote/RemoteIdentifierFactoryTest.java | 4 +--
.../wake/test/remote/RemoteManagerTest.java | 12 ++++-----
.../reef/wake/test/remote/RemoteTest.java | 26 ++++++++++----------
.../wake/test/remote/SmallMessagesTest.java | 17 ++++++-------
.../reef/webserver/ParsedHttpRequest.java | 2 +-
.../reef/webserver/ReefEventStateManager.java | 2 +-
.../reef/webserver/TestAvroHttpSerializer.java | 2 +-
37 files changed, 128 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java
index 2fee14d..68be034 100644
--- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java
+++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java
@@ -30,7 +30,7 @@ public class InteropLogger {
private HashMap<Integer, Level> levelHashMap;
{
- levelHashMap = new HashMap<Integer, Level>();
+ levelHashMap = new HashMap<>();
levelHashMap.put(Level.OFF.intValue(), Level.OFF);
levelHashMap.put(Level.SEVERE.intValue(), Level.SEVERE);
levelHashMap.put(Level.WARNING.intValue(), Level.WARNING);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java
index 9fb2791..de69b19 100644
--- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java
+++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
public class InteropReturnInfo {
private int returnCode;
- private ArrayList<String> exceptionList = new ArrayList<String>();
+ private ArrayList<String> exceptionList = new ArrayList<>();
public void addExceptionString(final String exceptionString) {
exceptionList.add(exceptionString);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java
index abbb8ec..1296ac1 100644
--- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java
+++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java
@@ -50,7 +50,7 @@ public class CLRBufferedLogHandler extends Handler {
public CLRBufferedLogHandler() {
super();
this.formatter = new SimpleFormatter();
- this.logs = new ArrayList<LogRecord>();
+ this.logs = new ArrayList<>();
this.driverInitialized = false;
this.logScheduler = new ScheduledThreadPoolExecutor(NUM_THREADS);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java
index ee6a05f..fc43d85 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java
@@ -67,7 +67,7 @@ public final class LogParser {
final String filter,
final String removeBeforeToken,
final String removeAfterToken) throws IOException{
- final ArrayList<String> filteredLines = new ArrayList<String>();
+ final ArrayList<String> filteredLines = new ArrayList<>();
try (final BufferedReader in = new BufferedReader(
new InputStreamReader(new FileInputStream(fileName), StandardCharsets.UTF_8))) {
String line = "";
@@ -119,7 +119,7 @@ public final class LogParser {
* @return
*/
public static ArrayList<String> filter(final ArrayList<String> original, final String filter, final String token) {
- final ArrayList<String> result = new ArrayList<String>();
+ final ArrayList<String> result = new ArrayList<>();
for (final String line : original) {
if (line.contains(filter)) {
final String[] p = line.split(token);
@@ -138,7 +138,7 @@ public final class LogParser {
* @return
*/
public static ArrayList<String> findStages(final ArrayList<String> lines, final String[] stageIndicators) {
- final ArrayList<String> stages = new ArrayList<String>();
+ final ArrayList<String> stages = new ArrayList<>();
int i = 0;
for (final String line: lines) {
@@ -153,7 +153,7 @@ public final class LogParser {
}
public static ArrayList<String> mergeStages(final ArrayList<String> startStages, final ArrayList<String> endStages) {
- final ArrayList<String> mergeStage = new ArrayList<String>();
+ final ArrayList<String> mergeStage = new ArrayList<>();
for (int i = 0; i < startStages.size(); i++) {
final String end = startStages.get(i).replace(LoggingScopeImpl.START_PREFIX, LoggingScopeImpl.EXIT_PREFIX);
if (endStages.contains(end)) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessage.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessage.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessage.java
index 7d925fa..15b3f6b 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessage.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessage.java
@@ -44,7 +44,7 @@ public class NSMessage<T> implements Message<T> {
public NSMessage(final Identifier srcId, final Identifier destId, final T data) {
this.srcId = srcId;
this.destId = destId;
- this.data = new ArrayList<T>(1);
+ this.data = new ArrayList<>(1);
this.data.add(data);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessageCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessageCodec.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessageCodec.java
index fe3aa99..f3a327b 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessageCodec.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NSMessageCodec.java
@@ -105,7 +105,7 @@ public class NSMessageCodec<T> implements Codec<NSMessage<T>> {
final Identifier srcId = factory.getNewInstance(dais.readUTF());
final Identifier destId = factory.getNewInstance(dais.readUTF());
final int size = dais.readInt();
- final List<T> list = new ArrayList<T>(size);
+ final List<T> list = new ArrayList<>(size);
for (int i = 0; i < size; i++) {
list.add(streamingCodec.decodeFromStream(dais));
}
@@ -122,11 +122,11 @@ public class NSMessageCodec<T> implements Codec<NSMessage<T>> {
e.printStackTrace();
throw new NetworkRuntimeException(e);
}
- final List<T> list = new ArrayList<T>();
+ final List<T> list = new ArrayList<>();
for (final NSRecordPBuf rbuf : pbuf.getMsgsList()) {
list.add(codec.decode(rbuf.getData().toByteArray()));
}
- return new NSMessage<T>(factory.getNewInstance(pbuf.getSrcid()), factory.getNewInstance(pbuf.getDestid()), list);
+ return new NSMessage<>(factory.getNewInstance(pbuf.getSrcid()), factory.getNewInstance(pbuf.getDestid()), list);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
index 47efa7f..d19bd67 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
@@ -172,7 +172,7 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> {
return conn;
}
- final Connection<T> newConnection = new NSConnection<T>(
+ final Connection<T> newConnection = new NSConnection<>(
this.myId, destId, new LoggingLinkListener<T>(), this);
final Connection<T> existing = this.idToConnMap.putIfAbsent(destId, newConnection);
@@ -198,7 +198,7 @@ class MessageHandler<T> implements EventHandler<TransportEvent> {
public MessageHandler(final EventHandler<Message<T>> handler,
final Codec<T> codec, final IdentifierFactory factory) {
this.handler = handler;
- this.codec = new NSMessageCodec<T>(codec, factory);
+ this.codec = new NSMessageCodec<>(codec, factory);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NamingCodecFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NamingCodecFactory.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NamingCodecFactory.java
index 631b692..d47f2be 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NamingCodecFactory.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NamingCodecFactory.java
@@ -39,10 +39,10 @@ final class NamingCodecFactory {
*/
static Codec<NamingMessage> createLookupCodec(final IdentifierFactory factory) {
final Map<Class<? extends NamingMessage>, Codec<? extends NamingMessage>> clazzToCodecMap
- = new HashMap<Class<? extends NamingMessage>, Codec<? extends NamingMessage>>();
+ = new HashMap<>();
clazzToCodecMap.put(NamingLookupRequest.class, new NamingLookupRequestCodec(factory));
clazzToCodecMap.put(NamingLookupResponse.class, new NamingLookupResponseCodec(factory));
- final Codec<NamingMessage> codec = new MultiCodec<NamingMessage>(clazzToCodecMap);
+ final Codec<NamingMessage> codec = new MultiCodec<>(clazzToCodecMap);
return codec;
}
@@ -54,12 +54,12 @@ final class NamingCodecFactory {
*/
static Codec<NamingMessage> createRegistryCodec(final IdentifierFactory factory) {
final Map<Class<? extends NamingMessage>, Codec<? extends NamingMessage>> clazzToCodecMap
- = new HashMap<Class<? extends NamingMessage>, Codec<? extends NamingMessage>>();
+ = new HashMap<>();
clazzToCodecMap.put(NamingRegisterRequest.class, new NamingRegisterRequestCodec(factory));
clazzToCodecMap.put(NamingRegisterResponse.class,
new NamingRegisterResponseCodec(new NamingRegisterRequestCodec(factory)));
clazzToCodecMap.put(NamingUnregisterRequest.class, new NamingUnregisterRequestCodec(factory));
- final Codec<NamingMessage> codec = new MultiCodec<NamingMessage>(clazzToCodecMap);
+ final Codec<NamingMessage> codec = new MultiCodec<>(clazzToCodecMap);
return codec;
}
@@ -71,14 +71,14 @@ final class NamingCodecFactory {
*/
static Codec<NamingMessage> createFullCodec(final IdentifierFactory factory) {
final Map<Class<? extends NamingMessage>, Codec<? extends NamingMessage>> clazzToCodecMap
- = new HashMap<Class<? extends NamingMessage>, Codec<? extends NamingMessage>>();
+ = new HashMap<>();
clazzToCodecMap.put(NamingLookupRequest.class, new NamingLookupRequestCodec(factory));
clazzToCodecMap.put(NamingLookupResponse.class, new NamingLookupResponseCodec(factory));
clazzToCodecMap.put(NamingRegisterRequest.class, new NamingRegisterRequestCodec(factory));
clazzToCodecMap.put(NamingRegisterResponse.class,
new NamingRegisterResponseCodec(new NamingRegisterRequestCodec(factory)));
clazzToCodecMap.put(NamingUnregisterRequest.class, new NamingUnregisterRequestCodec(factory));
- final Codec<NamingMessage> codec = new MultiCodec<NamingMessage>(clazzToCodecMap);
+ final Codec<NamingMessage> codec = new MultiCodec<>(clazzToCodecMap);
return codec;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupRequestCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupRequestCodec.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupRequestCodec.java
index da8b47a..bfd0db7 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupRequestCodec.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupRequestCodec.java
@@ -69,7 +69,7 @@ public final class NamingLookupRequestCodec implements Codec<NamingLookupRequest
public NamingLookupRequest decode(final byte[] buf) {
final AvroNamingLookupRequest req = AvroUtils.fromBytes(buf, AvroNamingLookupRequest.class);
- final List<Identifier> ids = new ArrayList<Identifier>(req.getIds().size());
+ final List<Identifier> ids = new ArrayList<>(req.getIds().size());
for (final CharSequence s : req.getIds()) {
ids.add(factory.getNewInstance(s.toString()));
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupResponseCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupResponseCodec.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupResponseCodec.java
index aa40d3a..9e6cca1 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupResponseCodec.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/serialization/NamingLookupResponseCodec.java
@@ -78,7 +78,7 @@ public final class NamingLookupResponseCodec implements Codec<NamingLookupRespon
@Override
public NamingLookupResponse decode(final byte[] buf) {
final AvroNamingLookupResponse avroResponse = AvroUtils.fromBytes(buf, AvroNamingLookupResponse.class);
- final List<NameAssignment> nas = new ArrayList<NameAssignment>(avroResponse.getTuples().size());
+ final List<NameAssignment> nas = new ArrayList<>(avroResponse.getTuples().size());
for (final AvroNamingAssignment tuple : avroResponse.getTuples()) {
nas.add(
new NameAssignmentTuple(
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/MergingIterator.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/MergingIterator.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/MergingIterator.java
index a0a80f2..8a5f6c6 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/MergingIterator.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/MergingIterator.java
@@ -29,8 +29,7 @@ public class MergingIterator<T> implements Iterator<T> {
private final PriorityQueue<Tuple<T, Iterator<T>>> heap;
public MergingIterator(final Comparator<T> c, final Iterator<T>[] its) {
- this.heap = new PriorityQueue<Tuple<T, Iterator<T>>>(11,
- new TupleKeyComparator<T, Iterator<T>>(c));
+ this.heap = new PriorityQueue<>(11, new TupleKeyComparator<T, Iterator<T>>(c));
for (final Iterator<T> it : its) {
final T b = it.hasNext() ? it.next() : null;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java
index 3af06a8..5ebc8dc 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java
@@ -76,7 +76,7 @@ public class CodecRamMap<T> implements ExternalMap<T> {
@Override
public Iterable<Map.Entry<CharSequence, T>> getAll(
final Set<? extends CharSequence> keys) {
- return new GetAllIterable<T>(keys, this);
+ return new GetAllIterable<>(keys, this);
}
@NamedParameter
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/RamSpool.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/RamSpool.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/RamSpool.java
index 1b82739..8534195 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/RamSpool.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/RamSpool.java
@@ -34,7 +34,7 @@ import java.util.List;
*/
public final class RamSpool<T> implements Spool<T> {
- private final List<T> backingStore = new ArrayList<T>();
+ private final List<T> backingStore = new ArrayList<>();
private boolean canAppend = true;
private boolean canGetAccumulator = true;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/test/java/org/apache/reef/io/network/NetworkServiceTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/NetworkServiceTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/NetworkServiceTest.java
index 292d70e..1c0dcc0 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/NetworkServiceTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/NetworkServiceTest.java
@@ -99,10 +99,10 @@ public class NetworkServiceTest {
LOG.log(Level.FINEST, "=== Test network service receiver start");
LOG.log(Level.FINEST, "=== Test network service sender start");
try (final NameResolver nameResolver = injector2.getInstance(NameResolver.class);
- final NetworkService<String> ns2 = new NetworkService<String>(factory, 0, nameResolver,
+ final NetworkService<String> ns2 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name2, monitor, numMessages), new ExceptionHandler(), localAddressProvider);
- final NetworkService<String> ns1 = new NetworkService<String>(factory, 0, nameResolver,
+ final NetworkService<String> ns1 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name1, null, 0), new ExceptionHandler(), localAddressProvider)) {
@@ -168,10 +168,10 @@ public class NetworkServiceTest {
LOG.log(Level.FINEST, "=== Test network service receiver start");
LOG.log(Level.FINEST, "=== Test network service sender start");
try (final NameResolver nameResolver = injector2.getInstance(NameResolver.class);
- NetworkService<String> ns2 = new NetworkService<String>(factory, 0, nameResolver,
+ NetworkService<String> ns2 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name2, monitor, numMessages), new ExceptionHandler(), localAddressProvider);
- NetworkService<String> ns1 = new NetworkService<String>(factory, 0, nameResolver,
+ NetworkService<String> ns1 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name1, null, 0), new ExceptionHandler(), localAddressProvider)) {
@@ -222,7 +222,7 @@ public class NetworkServiceTest {
try (final NameServer server = injector.getInstance(NameServer.class)) {
final int nameServerPort = server.getPort();
- final BlockingQueue<Object> barrier = new LinkedBlockingQueue<Object>();
+ final BlockingQueue<Object> barrier = new LinkedBlockingQueue<>();
final int numThreads = 4;
final int size = 2000;
@@ -344,11 +344,11 @@ public class NetworkServiceTest {
LOG.log(Level.FINEST, "=== Test network service receiver start");
LOG.log(Level.FINEST, "=== Test network service sender start");
try (final NameResolver nameResolver = injector2.getInstance(NameResolver.class);
- NetworkService<String> ns2 = new NetworkService<String>(factory, 0, nameResolver,
+ NetworkService<String> ns2 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name2, monitor, totalNumMessages),
new ExceptionHandler(), localAddressProvider);
- NetworkService<String> ns1 = new NetworkService<String>(factory, 0, nameResolver,
+ NetworkService<String> ns1 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name1, null, 0), new ExceptionHandler(), localAddressProvider)) {
@@ -435,10 +435,10 @@ public class NetworkServiceTest {
LOG.log(Level.FINEST, "=== Test network service receiver start");
LOG.log(Level.FINEST, "=== Test network service sender start");
try (final NameResolver nameResolver = injector2.getInstance(NameResolver.class);
- NetworkService<String> ns2 = new NetworkService<String>(factory, 0, nameResolver,
+ NetworkService<String> ns2 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name2, monitor, numMessages), new ExceptionHandler(), localAddressProvider);
- NetworkService<String> ns1 = new NetworkService<String>(factory, 0, nameResolver,
+ NetworkService<String> ns1 = new NetworkService<>(factory, 0, nameResolver,
new StringCodec(), injector.getInstance(MessagingTransportFactory.class),
new MessageHandler<String>(name1, null, 0), new ExceptionHandler(), localAddressProvider)) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java
index ed881ab..2954d53 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java
@@ -87,7 +87,7 @@ public class NamingTest {
LOG.log(Level.FINEST, this.name.getMethodName());
// names
- final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<>();
idToAddrMap.put(this.factory.getNewInstance("task1"), new InetSocketAddress(localAddress, 7001));
idToAddrMap.put(this.factory.getNewInstance("task2"), new InetSocketAddress(localAddress, 7002));
@@ -108,7 +108,7 @@ public class NamingTest {
final Identifier id1 = this.factory.getNewInstance("task1");
final Identifier id2 = this.factory.getNewInstance("task2");
- final Map<Identifier, InetSocketAddress> respMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> respMap = new HashMap<>();
final InetSocketAddress addr1 = client.lookup(id1);
respMap.put(id1, addr1);
final InetSocketAddress addr2 = client.lookup(id2);
@@ -140,7 +140,7 @@ public class NamingTest {
LOG.log(Level.FINEST, "test {0}", i);
// names
- final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<>();
idToAddrMap.put(this.factory.getNewInstance("task1"), new InetSocketAddress(localAddress, 7001));
idToAddrMap.put(this.factory.getNewInstance("task2"), new InetSocketAddress(localAddress, 7002));
idToAddrMap.put(this.factory.getNewInstance("task3"), new InetSocketAddress(localAddress, 7003));
@@ -165,8 +165,7 @@ public class NamingTest {
final ExecutorService e = Executors.newCachedThreadPool();
- final ConcurrentMap<Identifier, InetSocketAddress> respMap =
- new ConcurrentHashMap<Identifier, InetSocketAddress>();
+ final ConcurrentMap<Identifier, InetSocketAddress> respMap = new ConcurrentHashMap<>();
final Future<?> f1 = e.submit(new Runnable() {
@Override
@@ -240,7 +239,7 @@ public class NamingTest {
final String localAddress = localAddressProvider.getLocalAddress();
// names to start with
- final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<>();
idToAddrMap.put(this.factory.getNewInstance("task1"), new InetSocketAddress(localAddress, 7001));
idToAddrMap.put(this.factory.getNewInstance("task2"), new InetSocketAddress(localAddress, 7002));
@@ -257,7 +256,7 @@ public class NamingTest {
busyWait(server, ids.size(), ids);
// check the server side
- Map<Identifier, InetSocketAddress> serverMap = new HashMap<Identifier, InetSocketAddress>();
+ Map<Identifier, InetSocketAddress> serverMap = new HashMap<>();
Iterable<NameAssignment> nas = server.lookup(ids);
for (final NameAssignment na : nas) {
@@ -276,7 +275,7 @@ public class NamingTest {
// wait
busyWait(server, 0, ids);
- serverMap = new HashMap<Identifier, InetSocketAddress>();
+ serverMap = new HashMap<>();
nas = server.lookup(ids);
for (final NameAssignment na : nas) {
serverMap.put(na.getIdentifier(), na.getAddress());
@@ -304,7 +303,7 @@ public class NamingTest {
try (final NameServer server = injector.getInstance(NameServer.class)) {
this.port = server.getPort();
- final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> idToAddrMap = new HashMap<>();
idToAddrMap.put(this.factory.getNewInstance("task1"), new InetSocketAddress(localAddress, 7001));
idToAddrMap.put(this.factory.getNewInstance("task2"), new InetSocketAddress(localAddress, 7002));
@@ -332,7 +331,7 @@ public class NamingTest {
final Identifier id1 = this.factory.getNewInstance("task1");
final Identifier id2 = this.factory.getNewInstance("task2");
- final Map<Identifier, InetSocketAddress> respMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> respMap = new HashMap<>();
InetSocketAddress addr1 = client.lookup(id1);
respMap.put(id1, addr1);
InetSocketAddress addr2 = client.lookup(id2);
@@ -352,7 +351,7 @@ public class NamingTest {
// wait
busyWait(server, 0, ids);
- final Map<Identifier, InetSocketAddress> serverMap = new HashMap<Identifier, InetSocketAddress>();
+ final Map<Identifier, InetSocketAddress> serverMap = new HashMap<>();
addr1 = server.lookup(id1);
if (addr1 != null) {
serverMap.put(id1, addr1);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/SortingSpoolTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/SortingSpoolTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/SortingSpoolTest.java
index 68b7879..f73d1f4 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/SortingSpoolTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/SortingSpoolTest.java
@@ -74,7 +74,7 @@ public class SortingSpoolTest {
void genericTest(final Spool<Integer> s, final Comparator<Integer> comparator)
throws ServiceException {
- final List<Integer> l = new ArrayList<Integer>();
+ final List<Integer> l = new ArrayList<>();
final Random r = new Random(42);
while (l.size() < 100) {
l.add(r.nextInt(75));
@@ -84,7 +84,7 @@ public class SortingSpoolTest {
a.add(l.get(i));
}
a.close();
- final List<Integer> m = new ArrayList<Integer>();
+ final List<Integer> m = new ArrayList<>();
for (final int i : s) {
m.add(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
index 614582a..c7a5ed3 100644
--- a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
+++ b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
@@ -113,7 +113,7 @@ public class ResourceManagerTest {
@Test(expected = InjectionException.class)
public void testInvalidRacksConfigured() throws InjectionException {
// Given
- final Set<String> availableRacks = new HashSet<String>(Arrays.asList("/rack1/*"));
+ final Set<String> availableRacks = new HashSet<>(Arrays.asList("/rack1/*"));
injector.bindVolatileParameter(RackNames.class, availableRacks);
// When
containerManager = injector.getInstance(ContainerManager.class);
@@ -158,7 +158,7 @@ public class ResourceManagerTest {
public void testTwoAllocationsInDifferentRacks() throws InjectionException {
// Given
final List<String> availableRacks = Arrays.asList("/rack1", "/rack2");
- final Set<String> availableRacksSet = new HashSet<String>(availableRacks);
+ final Set<String> availableRacksSet = new HashSet<>(availableRacks);
injector.bindVolatileParameter(RackNames.class, availableRacksSet); // 2 available racks
injector.bindVolatileParameter(MaxNumberOfEvaluators.class, 2); // 1 evaluator per rack
containerManager = injector.getInstance(ContainerManager.class); // inject containerManager with this updated info
@@ -200,7 +200,7 @@ public class ResourceManagerTest {
public void testOneAllocationInRack1AndTwoInDatacenter2() throws InjectionException {
// Given
final List<String> availableRacks = Arrays.asList("/dc1/rack1", "/dc2/rack1", "/dc2/rack2");
- final Set<String> availableRacksSet = new HashSet<String>(availableRacks);
+ final Set<String> availableRacksSet = new HashSet<>(availableRacks);
injector.bindVolatileParameter(RackNames.class, availableRacksSet); // 3 available racks
injector.bindVolatileParameter(MaxNumberOfEvaluators.class, 3); // 1 evaluator per rack
containerManager = injector.getInstance(ContainerManager.class);
@@ -253,7 +253,7 @@ public class ResourceManagerTest {
public void testOneAllocationInRack1AndTwoInDifferentRacksDueToRelaxLocality() throws InjectionException {
// Given
final List<String> availableRacks = Arrays.asList("/dc1/rack1", "/dc2/rack1", "/dc3/rack1");
- final Set<String> availableRacksSet = new HashSet<String>(availableRacks);
+ final Set<String> availableRacksSet = new HashSet<>(availableRacks);
injector.bindVolatileParameter(RackNames.class, availableRacksSet);
injector.bindVolatileParameter(MaxNumberOfEvaluators.class, 3); // 3 evaluators in three different racks
containerManager = injector.getInstance(ContainerManager.class);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
index 81509a5..6034c58 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
@@ -132,7 +132,7 @@ public class TangImpl implements Tang {
private final Set<Object> key;
public SetValuedKey(final Object[] ts, final Object[] us) {
- key = new HashSet<Object>(Arrays.asList(ts));
+ key = new HashSet<>(Arrays.asList(ts));
key.addAll(Arrays.asList(us));
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
index 08f29aa..f6877be 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
@@ -154,7 +154,7 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
Class<?> clazz;
String fullName;
try {
- clazz = (Class<?>) classForName(iface.getFullName());
+ clazz = classForName(iface.getFullName());
fullName = null;
} catch (final ClassNotFoundException e) {
clazz = null;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
index 33aaafd..9aaafe0 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
@@ -183,7 +183,7 @@ public class InjectorImpl implements Injector {
.addAll(Arrays.asList(thisCN.getInjectableConstructors()));
for (final ConstructorDef<T> def : constructorList) {
- final List<InjectionPlan<?>> args = new ArrayList<InjectionPlan<?>>();
+ final List<InjectionPlan<?>> args = new ArrayList<>();
final ConstructorArg[] defArgs = def.getArgs();
for (final ConstructorArg arg : defArgs) {
@@ -199,8 +199,7 @@ public class InjectorImpl implements Injector {
}
} else {
try {
- args.add(new InjectionFuturePlan<>(namespace.getNode(arg
- .getName())));
+ args.add(new InjectionFuturePlan<>(namespace.getNode(arg.getName())));
} catch (final NameResolutionException e) {
throw new IllegalStateException("Detected unresolvable "
+ "constructor arg while building injection plan. "
@@ -208,7 +207,7 @@ public class InjectorImpl implements Injector {
}
}
}
- final Constructor<T> constructor = new Constructor<T>(thisCN, def,
+ final Constructor<T> constructor = new Constructor<>(thisCN, def,
args.toArray(new InjectionPlan[0]));
constructors.add(constructor);
}
@@ -227,10 +226,8 @@ public class InjectorImpl implements Injector {
// by others.
for (int i = 0; i < liveIndices.size(); i++) {
for (int j = i + 1; j < liveIndices.size(); j++) {
- final ConstructorDef<T> ci = constructors.get(liveIndices.get(i))
- .getConstructorDef();
- final ConstructorDef<T> cj = constructors.get(liveIndices.get(j))
- .getConstructorDef();
+ final ConstructorDef<T> ci = constructors.get(liveIndices.get(i)).getConstructorDef();
+ final ConstructorDef<T> cj = constructors.get(liveIndices.get(j)).getConstructorDef();
if (ci.isMoreSpecificThan(cj)) {
liveIndices.remove(j);
@@ -631,7 +628,7 @@ public class InjectorImpl implements Injector {
concurrentModificationGuard = true;
T ret;
try {
- final ConstructorDef<T> def = (ConstructorDef<T>) constructor.getConstructorDef();
+ final ConstructorDef<T> def = constructor.getConstructorDef();
final java.lang.reflect.Constructor<T> construct = getConstructor(def);
if (aspect != null) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
index 0a6132c..1727564 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
@@ -121,7 +121,7 @@ public class ProtocolBufferInjectionPlan {
final InjectionPlan<?>[] ipArgs = new InjectionPlan[protoBufArgs.length];
for (int i = 0; i < protoBufArgs.length; i++) {
- ipArgs[i] = (InjectionPlan<?>) deserialize(ch, protoBufArgs[i]);
+ ipArgs[i] = deserialize(ch, protoBufArgs[i]);
}
final ConstructorDef<T> constructor = cn.getConstructorDef(cnArgs);
@@ -137,7 +137,7 @@ public class ProtocolBufferInjectionPlan {
final InjectionPlan<T>[] subPlans = new InjectionPlan[protoBufPlans.length];
for (int i = 0; i < protoBufPlans.length; i++) {
- subPlans[i] = (InjectionPlan<T>) deserialize(ch, protoBufPlans[i]);
+ subPlans[i] = deserialize(ch, protoBufPlans[i]);
}
final Node n = ch.getNode(fullName);
return new Subplan<T>(n, subPlans);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/PubSubEventHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/PubSubEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/PubSubEventHandler.java
index 5667eb5..dccdeb7 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/PubSubEventHandler.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/PubSubEventHandler.java
@@ -45,7 +45,7 @@ public class PubSubEventHandler<T> implements EventHandler<T> {
* Constructs a pub-sub event handler.
*/
public PubSubEventHandler() {
- this.clazzToListOfHandlersMap = new HashMap<Class<? extends T>, List<EventHandler<? extends T>>>();
+ this.clazzToListOfHandlersMap = new HashMap<>();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java
index 2e6a786..7724b4e 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java
@@ -153,7 +153,7 @@ public class WakeProfiler implements Aspect {
} else {
ret = constructor.newInstance(args);
}
- final Vertex<T> v = new Vertex<T>(ret, constructorDef, vArgs);
+ final Vertex<T> v = new Vertex<>(ret, constructorDef, vArgs);
vertexObject.put(ret, v);
return ret;
}
@@ -201,7 +201,7 @@ public class WakeProfiler implements Aspect {
final StringBuffer sb = new StringBuffer("{\"nodes\":[\n");
- final List<String> nodes = new ArrayList<String>();
+ final List<String> nodes = new ArrayList<>();
final LinkedList<Vertex<?>> workQueue = new LinkedList<>();
for (final Object o : vertexObject.keySet()) {
if (whitelist(o)) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java
index d37cea1..c57ab1c 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java
@@ -43,16 +43,14 @@ public class MultiCodec<T> implements Codec<T> {
* @param clazzToDecoderMap
*/
public MultiCodec(final Map<Class<? extends T>, Codec<? extends T>> clazzToCodecMap) {
- final Map<Class<? extends T>, Encoder<? extends T>> clazzToEncoderMap =
- new HashMap<Class<? extends T>, Encoder<? extends T>>();
- final Map<Class<? extends T>, Decoder<? extends T>> clazzToDecoderMap =
- new HashMap<Class<? extends T>, Decoder<? extends T>>();
+ final Map<Class<? extends T>, Encoder<? extends T>> clazzToEncoderMap = new HashMap<>();
+ final Map<Class<? extends T>, Decoder<? extends T>> clazzToDecoderMap = new HashMap<>();
for (final Entry<Class<? extends T>, Codec<? extends T>> e : clazzToCodecMap.entrySet()) {
clazzToEncoderMap.put(e.getKey(), e.getValue());
clazzToDecoderMap.put(e.getKey(), e.getValue());
}
- encoder = new MultiEncoder<T>(clazzToEncoderMap);
- decoder = new MultiDecoder<T>(clazzToDecoderMap);
+ encoder = new MultiEncoder<>(clazzToEncoderMap);
+ decoder = new MultiDecoder<>(clazzToDecoderMap);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventCodec.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventCodec.java
index b3e2023..dbb15ac 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventCodec.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventCodec.java
@@ -36,8 +36,8 @@ public class RemoteEventCodec<T> implements Codec<RemoteEvent<T>> {
* @param codec the codec for the event
*/
public RemoteEventCodec(final Codec<T> codec) {
- encoder = new RemoteEventEncoder<T>(codec);
- decoder = new RemoteEventDecoder<T>(codec);
+ encoder = new RemoteEventEncoder<>(codec);
+ decoder = new RemoteEventDecoder<>(codec);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java
index 057caac..8e158f9 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java
@@ -54,11 +54,11 @@ class RemoteSenderEventHandler<T> implements EventHandler<RemoteEvent<T>> {
* @param executor the executor service used for creating channels
*/
RemoteSenderEventHandler(final Encoder<T> encoder, final Transport transport, final ExecutorService executor) {
- this.encoder = new RemoteEventEncoder<T>(encoder);
+ this.encoder = new RemoteEventEncoder<>(encoder);
this.transport = transport;
this.executor = executor;
- this.linkRef = new AtomicReference<Link<byte[]>>();
- this.queue = new LinkedBlockingQueue<RemoteEvent<T>>();
+ this.linkRef = new AtomicReference<>();
+ this.queue = new LinkedBlockingQueue<>();
}
void setLink(final Link<byte[]> link) {
@@ -99,7 +99,7 @@ class RemoteSenderEventHandler<T> implements EventHandler<RemoteEvent<T>> {
return;
}
- final ConnectFutureTask<Link<byte[]>> cf = new ConnectFutureTask<Link<byte[]>>(
+ final ConnectFutureTask<Link<byte[]>> cf = new ConnectFutureTask<>(
new ConnectCallable(transport, value.localAddress(), value.remoteAddress()),
new ConnectEventHandler<T>(this));
executor.submit(cf);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java
index e2e7fe3..d4a004a 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java
@@ -48,7 +48,7 @@ public class ForkPoolStageTest {
final WakeSharedPool p = new WakeSharedPool(10);
- final EStage<TestEventA> stage = new ForkPoolStage<TestEventA>(eventHandler, p);
+ final EStage<TestEventA> stage = new ForkPoolStage<>(eventHandler, p);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -78,8 +78,8 @@ public class ForkPoolStageTest {
final WakeSharedPool p = new WakeSharedPool(10);
- final EStage<TestEventA> stage1 = new ForkPoolStage<TestEventA>(eventHandler, p);
- final EStage<TestEventA> stage2 = new ForkPoolStage<TestEventA>(eventHandler, p);
+ final EStage<TestEventA> stage1 = new ForkPoolStage<>(eventHandler, p);
+ final EStage<TestEventA> stage2 = new ForkPoolStage<>(eventHandler, p);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -112,14 +112,13 @@ public class ForkPoolStageTest {
final Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
- final Map<Class<? extends TestEvent>, EventHandler<? extends TestEvent>> map
- = new HashMap<Class<? extends TestEvent>, EventHandler<? extends TestEvent>>();
+ final Map<Class<? extends TestEvent>, EventHandler<? extends TestEvent>> map = new HashMap<>();
map.put(TestEventA.class, new TestEventHandlerA(procSet));
map.put(TestEventB.class, new TestEventHandlerB(procSet));
- final EventHandler<TestEvent> eventHandler = new MultiEventHandler<TestEvent>(map);
+ final EventHandler<TestEvent> eventHandler = new MultiEventHandler<>(map);
final WakeSharedPool p = new WakeSharedPool(10);
- final EStage<TestEvent> stage = new ForkPoolStage<TestEvent>(eventHandler, p);
+ final EStage<TestEvent> stage = new ForkPoolStage<>(eventHandler, p);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -146,7 +145,7 @@ public class ForkPoolStageTest {
System.out.println(LOG_PREFIX + name.getMethodName());
final WakeSharedPool p = new WakeSharedPool(10);
final EventHandler<TestEvent> eventHandler = new TestEventHandler();
- final ForkPoolStage<TestEvent> stage = new ForkPoolStage<TestEvent>(eventHandler, p);
+ final ForkPoolStage<TestEvent> stage = new ForkPoolStage<>(eventHandler, p);
final TestEvent e = new TestEvent();
for (int i = 0; i < 1000000; ++i) {
@@ -163,8 +162,8 @@ public class ForkPoolStageTest {
System.out.println(LOG_PREFIX + name.getMethodName());
final WakeSharedPool p = new WakeSharedPool(10);
final EventHandler<TestEvent> eventHandler = new TestEventHandler();
- final ForkPoolStage<TestEvent> stage2 = new ForkPoolStage<TestEvent>(eventHandler, p);
- final ForkPoolStage<TestEvent> stage1 = new ForkPoolStage<TestEvent>(stage2, p);
+ final ForkPoolStage<TestEvent> stage2 = new ForkPoolStage<>(eventHandler, p);
+ final ForkPoolStage<TestEvent> stage1 = new ForkPoolStage<>(stage2, p);
final TestEvent e = new TestEvent();
for (int i = 0; i < 1000000; ++i) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java
index b401989..54217e7 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java
@@ -52,11 +52,11 @@ public class PubSubThreadPoolStageTest {
final Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final int expected = 10;
- final PubSubEventHandler<TestEvent> handler = new PubSubEventHandler<TestEvent>();
+ final PubSubEventHandler<TestEvent> handler = new PubSubEventHandler<>();
handler.subscribe(TestEvent.class, new TestEventHandler("Handler1", monitor, procSet, expected));
handler.subscribe(TestEvent.class, new TestEventHandler("Handler2", monitor, procSet, expected));
- final EStage<TestEvent> stage = new ThreadPoolStage<TestEvent>(handler, 10);
+ final EStage<TestEvent> stage = new ThreadPoolStage<>(handler, 10);
for (int i = 0; i < expected; ++i) {
final TestEvent a = new TestEvent("aaa");
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java
index a46f6a6..35b64a2 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java
@@ -43,7 +43,7 @@ public class SyncStageTest {
final Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
- final EStage<TestEventA> stage = new SyncStage<TestEventA>(new TestEventHandlerA(procSet));
+ final EStage<TestEventA> stage = new SyncStage<>(new TestEventHandlerA(procSet));
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -64,14 +64,13 @@ public class SyncStageTest {
final Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
- final Map<Class<? extends TestEvent>, EventHandler<? extends TestEvent>> map
- = new HashMap<Class<? extends TestEvent>, EventHandler<? extends TestEvent>>();
+ final Map<Class<? extends TestEvent>, EventHandler<? extends TestEvent>> map = new HashMap<>();
map.put(TestEventA.class, new TestEventHandlerA(procSet));
map.put(TestEventB.class, new TestEventHandlerB(procSet));
- final EventHandler<TestEvent> eventHandler = new MultiEventHandler<TestEvent>(map);
+ final EventHandler<TestEvent> eventHandler = new MultiEventHandler<>(map);
- final EStage<TestEvent> stage = new SyncStage<TestEvent>(eventHandler);
+ final EStage<TestEvent> stage = new SyncStage<>(eventHandler);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
index 59730ff..03ec1c1 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
@@ -45,7 +45,7 @@ public class ThreadPoolStageTest {
final Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final EventHandler<TestEventA> eventHandler = new TestEventHandlerA(procSet);
- final EStage<TestEventA> stage = new SingleThreadStage<TestEventA>(eventHandler, 20);
+ final EStage<TestEventA> stage = new SingleThreadStage<>(eventHandler, 20);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -69,7 +69,7 @@ public class ThreadPoolStageTest {
final Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final EventHandler<TestEventA> eventHandler = new TestEventHandlerA(procSet);
- final EStage<TestEventA> stage = new SingleThreadStage<TestEventA>(eventHandler, 1);
+ final EStage<TestEventA> stage = new SingleThreadStage<>(eventHandler, 1);
for (int i = 0; i < 10000; ++i) {
final TestEventA a = new TestEventA();
@@ -88,7 +88,7 @@ public class ThreadPoolStageTest {
final EventHandler<TestEventA> eventHandler = new TestEventHandlerA(procSet);
- final EStage<TestEventA> stage = new ThreadPoolStage<TestEventA>(eventHandler, 10);
+ final EStage<TestEventA> stage = new ThreadPoolStage<>(eventHandler, 10);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -113,13 +113,12 @@ public class ThreadPoolStageTest {
final Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
- final Map<Class<? extends TestEvent>, EventHandler<? extends TestEvent>> map
- = new HashMap<Class<? extends TestEvent>, EventHandler<? extends TestEvent>>();
+ final Map<Class<? extends TestEvent>, EventHandler<? extends TestEvent>> map = new HashMap<>();
map.put(TestEventA.class, new TestEventHandlerA(procSet));
map.put(TestEventB.class, new TestEventHandlerB(procSet));
- final EventHandler<TestEvent> eventHandler = new MultiEventHandler<TestEvent>(map);
+ final EventHandler<TestEvent> eventHandler = new MultiEventHandler<>(map);
- final EStage<TestEvent> stage = new ThreadPoolStage<TestEvent>(eventHandler, 10);
+ final EStage<TestEvent> stage = new ThreadPoolStage<>(eventHandler, 10);
for (int i = 0; i < 10; ++i) {
final TestEventA a = new TestEventA();
@@ -144,7 +143,7 @@ public class ThreadPoolStageTest {
public void testMeter() throws Exception {
System.out.println(LOG_PREFIX + name.getMethodName());
final EventHandler<TestEvent> eventHandler = new TestEventHandler();
- final ThreadPoolStage<TestEvent> stage = new ThreadPoolStage<TestEvent>(eventHandler, 10);
+ final ThreadPoolStage<TestEvent> stage = new ThreadPoolStage<>(eventHandler, 10);
final TestEvent e = new TestEvent();
for (int i = 0; i < 1000000; ++i) {
@@ -160,8 +159,8 @@ public class ThreadPoolStageTest {
public void testMeterTwoStages() throws Exception {
System.out.println(LOG_PREFIX + name.getMethodName());
final EventHandler<TestEvent> eventHandler = new TestEventHandler();
- final ThreadPoolStage<TestEvent> stage2 = new ThreadPoolStage<TestEvent>(eventHandler, 5);
- final ThreadPoolStage<TestEvent> stage1 = new ThreadPoolStage<TestEvent>(stage2, 5);
+ final ThreadPoolStage<TestEvent> stage2 = new ThreadPoolStage<>(eventHandler, 5);
+ final ThreadPoolStage<TestEvent> stage1 = new ThreadPoolStage<>(stage2, 5);
final TestEvent e = new TestEvent();
for (int i = 0; i < 1000000; ++i) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
index 7a004fe..769c517 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
@@ -46,7 +46,7 @@ public class RemoteIdentifierFactoryTest {
public void testRemoteIdentifierFactory() {
System.out.println(LOG_PREFIX + name.getMethodName());
- final Map<String, Class<? extends Identifier>> typeToIdMap = new HashMap<String, Class<? extends Identifier>>();
+ final Map<String, Class<? extends Identifier>> typeToIdMap = new HashMap<>();
typeToIdMap.put("test", TestRemoteIdentifier.class);
final IdentifierFactory factory = new DefaultIdentifierFactory(typeToIdMap);
@@ -63,7 +63,7 @@ public class RemoteIdentifierFactoryTest {
.getInstance(RemoteManagerFactory.class);
final int port = 9100;
- final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
+ final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<>();
clazzToCodecMap.put(TestEvent.class, new TestEventCodec());
final Codec<?> codec = new MultiCodec<Object>(clazzToCodecMap);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
index 768fccc..19da884 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
@@ -74,7 +74,7 @@ public class RemoteManagerTest {
final Monitor monitor = new Monitor();
final TimerStage timer = new TimerStage(new TimeoutHandler(monitor), 2000, 2000);
- final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
+ final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<>();
clazzToCodecMap.put(StartEvent.class, new ObjectSerializableCodec<StartEvent>());
clazzToCodecMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
clazzToCodecMap.put(TestEvent1.class, new ObjectSerializableCodec<TestEvent1>());
@@ -141,7 +141,7 @@ public class RemoteManagerTest {
final int numOfSenderThreads = 5;
final ExecutorService smExecutor = Executors.newFixedThreadPool(numOfSenderThreads);
final ExecutorService rmExecutor = Executors.newFixedThreadPool(1);
- final ArrayList<Future<Integer>> smFutures = new ArrayList<Future<Integer>>(numOfSenderThreads);
+ final ArrayList<Future<Integer>> smFutures = new ArrayList<>(numOfSenderThreads);
final RemoteManager sendingManager = getTestRemoteManager("sender", 9030, 3, 5000);
@@ -178,7 +178,7 @@ public class RemoteManagerTest {
final Monitor monitor = new Monitor();
final TimerStage timer = new TimerStage(new TimeoutHandler(monitor), 2000, 2000);
- final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
+ final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<>();
clazzToCodecMap.put(StartEvent.class, new ObjectSerializableCodec<StartEvent>());
clazzToCodecMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
clazzToCodecMap.put(TestEvent1.class, new ObjectSerializableCodec<TestEvent1>());
@@ -225,7 +225,7 @@ public class RemoteManagerTest {
final Monitor monitor = new Monitor();
final TimerStage timer = new TimerStage(new TimeoutHandler(monitor), 2000, 2000);
- final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
+ final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<>();
clazzToCodecMap.put(TestEvent.class, new TestEventCodec());
final Codec<?> codec = new MultiCodec<Object>(clazzToCodecMap);
@@ -262,7 +262,7 @@ public class RemoteManagerTest {
final Monitor monitor = new Monitor();
final TimerStage timer = new TimerStage(new TimeoutHandler(monitor), 2000, 2000);
- final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
+ final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<>();
clazzToCodecMap.put(StartEvent.class, new ObjectSerializableCodec<StartEvent>());
clazzToCodecMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
final Codec<?> codec = new MultiCodec<Object>(clazzToCodecMap);
@@ -291,7 +291,7 @@ public class RemoteManagerTest {
private RemoteManager getTestRemoteManager(final String rmName, final int localPort,
final int retry, final int retryTimeout) {
- final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
+ final Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<>();
clazzToCodecMap.put(StartEvent.class, new ObjectSerializableCodec<StartEvent>());
clazzToCodecMap.put(TestEvent1.class, new ObjectSerializableCodec<TestEvent1>());
clazzToCodecMap.put(TestEvent2.class, new ObjectSerializableCodec<TestEvent1>());
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
index c6b6579..efc7a6b 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
@@ -66,13 +66,13 @@ public class RemoteTest {
public void testRemoteEventCodec() throws UnknownHostException {
System.out.println(LOG_PREFIX + name.getMethodName());
- final ObjectSerializableCodec<TestEvent> codec = new ObjectSerializableCodec<TestEvent>();
+ final ObjectSerializableCodec<TestEvent> codec = new ObjectSerializableCodec<>();
- final RemoteEventCodec<TestEvent> reCodec = new RemoteEventCodec<TestEvent>(codec);
+ final RemoteEventCodec<TestEvent> reCodec = new RemoteEventCodec<>(codec);
final SocketAddress localAddr = new InetSocketAddress(this.localAddressProvider.getLocalAddress(), 8000);
final SocketAddress remoteAddr = new InetSocketAddress(this.localAddressProvider.getLocalAddress(), 9000);
- final RemoteEvent<TestEvent> e1 = new RemoteEvent<TestEvent>(
+ final RemoteEvent<TestEvent> e1 = new RemoteEvent<>(
localAddr, remoteAddr, 1, new TestEvent("hello", 0.0));
System.out.println(e1);
@@ -119,18 +119,18 @@ public class RemoteTest {
// receiver stage
// decoder map
- final Map<Class<?>, Decoder<?>> clazzToDecoderMap = new HashMap<Class<?>, Decoder<?>>();
+ final Map<Class<?>, Decoder<?>> clazzToDecoderMap = new HashMap<>();
clazzToDecoderMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
clazzToDecoderMap.put(TestEvent2.class, new ObjectSerializableCodec<TestEvent2>());
- final Decoder<Object> decoder = new MultiDecoder<Object>(clazzToDecoderMap);
+ final Decoder<Object> decoder = new MultiDecoder<>(clazzToDecoderMap);
// receive handlers
final int finalSize = 6; // 6 events will be sent
- final Map<Class<?>, EventHandler<?>> clazzToHandlerMap = new HashMap<Class<?>, EventHandler<?>>();
- final Set<Object> set = Collections.synchronizedSet(new HashSet<Object>());
+ final Map<Class<?>, EventHandler<?>> clazzToHandlerMap = new HashMap<>();
+ final Set<Object> set = Collections.synchronizedSet(new HashSet<>());
clazzToHandlerMap.put(TestEvent.class, new ConsoleEventHandler<TestEvent>("recvEH1", set, finalSize, monitor));
clazzToHandlerMap.put(TestEvent2.class, new ConsoleEventHandler<TestEvent2>("recvEH2", set, finalSize, monitor));
- final EventHandler<Object> handler = new MultiEventHandler<Object>(clazzToHandlerMap);
+ final EventHandler<Object> handler = new MultiEventHandler<>(clazzToHandlerMap);
// receiver stage
final RemoteReceiverStage reRecvStage = new RemoteReceiverStage(
@@ -142,10 +142,10 @@ public class RemoteTest {
final Transport transport = tpFactory.newInstance(hostAddress, port, reRecvStage, reRecvStage, 1, 10000);
// mux encoder with encoder map
- final Map<Class<?>, Encoder<?>> clazzToEncoderMap = new HashMap<Class<?>, Encoder<?>>();
+ final Map<Class<?>, Encoder<?>> clazzToEncoderMap = new HashMap<>();
clazzToEncoderMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
clazzToEncoderMap.put(TestEvent2.class, new ObjectSerializableCodec<TestEvent2>());
- final Encoder<Object> encoder = new MultiEncoder<Object>(clazzToEncoderMap);
+ final Encoder<Object> encoder = new MultiEncoder<>(clazzToEncoderMap);
// sender stage
final RemoteSenderStage reSendStage = new RemoteSenderStage(encoder, transport, 10);
@@ -156,17 +156,17 @@ public class RemoteTest {
final RemoteSeqNumGenerator seqGen = new RemoteSeqNumGenerator();
// proxy handler for a remotely running handler
- final ProxyEventHandler<TestEvent> proxyHandler1 = new ProxyEventHandler<TestEvent>(
+ final ProxyEventHandler<TestEvent> proxyHandler1 = new ProxyEventHandler<>(
myId, remoteId, "recvEH1", reSendStage.<TestEvent>getHandler(), seqGen);
proxyHandler1.onNext(new TestEvent("hello1", 0.0));
proxyHandler1.onNext(new TestEvent("hello2", 0.0));
- final ProxyEventHandler<TestEvent2> proxyHandler2 = new ProxyEventHandler<TestEvent2>(
+ final ProxyEventHandler<TestEvent2> proxyHandler2 = new ProxyEventHandler<>(
myId, remoteId, "recvEH2", reSendStage.<TestEvent2>getHandler(), seqGen);
proxyHandler2.onNext(new TestEvent2("hello1", 1.0));
proxyHandler2.onNext(new TestEvent2("hello2", 1.0));
- final ProxyEventHandler<TestEvent> proxyHandler3 = new ProxyEventHandler<TestEvent>(
+ final ProxyEventHandler<TestEvent> proxyHandler3 = new ProxyEventHandler<>(
myId, remoteId, "recvEH3", reSendStage.<TestEvent>getHandler(), seqGen);
proxyHandler3.onNext(new TestEvent("hello1", 1.0));
proxyHandler3.onNext(new TestEvent("hello2", 1.0));
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
index 461308f..ec9f5bb 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
@@ -71,19 +71,18 @@ public class SmallMessagesTest {
// receiver stage
// decoder map
- final Map<Class<?>, Decoder<?>> clazzToDecoderMap = new HashMap<Class<?>, Decoder<?>>();
+ final Map<Class<?>, Decoder<?>> clazzToDecoderMap = new HashMap<>();
clazzToDecoderMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
clazzToDecoderMap.put(TestEvent2.class, new ObjectSerializableCodec<TestEvent2>());
- final Decoder<Object> decoder = new MultiDecoder<Object>(clazzToDecoderMap);
+ final Decoder<Object> decoder = new MultiDecoder<>(clazzToDecoderMap);
// receive handlers
final int finalSize = 6; // 6 events will be sent
- //int finalSize = 200000; // 6 events will be sent
- final Map<Class<?>, EventHandler<?>> clazzToHandlerMap = new HashMap<Class<?>, EventHandler<?>>();
- final Set<Object> set = Collections.synchronizedSet(new HashSet<Object>());
+ final Map<Class<?>, EventHandler<?>> clazzToHandlerMap = new HashMap<>();
+ final Set<Object> set = Collections.synchronizedSet(new HashSet<>());
clazzToHandlerMap.put(TestEvent.class, new ConsoleEventHandler<TestEvent>("recvEH1", set, finalSize, monitor));
clazzToHandlerMap.put(TestEvent2.class, new ConsoleEventHandler<TestEvent2>("recvEH2", set, finalSize, monitor));
- final EventHandler<Object> handler = new MultiEventHandler<Object>(clazzToHandlerMap);
+ final EventHandler<Object> handler = new MultiEventHandler<>(clazzToHandlerMap);
// receiver stage
final RemoteReceiverStage reRecvStage = new RemoteReceiverStage(
@@ -95,10 +94,10 @@ public class SmallMessagesTest {
final Transport transport = tpFactory.newInstance(hostAddress, port, reRecvStage, reRecvStage, 1, 10000);
// mux encoder with encoder map
- final Map<Class<?>, Encoder<?>> clazzToEncoderMap = new HashMap<Class<?>, Encoder<?>>();
+ final Map<Class<?>, Encoder<?>> clazzToEncoderMap = new HashMap<>();
clazzToEncoderMap.put(TestEvent.class, new ObjectSerializableCodec<TestEvent>());
clazzToEncoderMap.put(TestEvent2.class, new ObjectSerializableCodec<TestEvent2>());
- final Encoder<Object> encoder = new MultiEncoder<Object>(clazzToEncoderMap);
+ final Encoder<Object> encoder = new MultiEncoder<>(clazzToEncoderMap);
// sender stage
final RemoteSenderStage reSendStage = new RemoteSenderStage(encoder, transport, 10);
@@ -109,7 +108,7 @@ public class SmallMessagesTest {
// proxy handler for a remotely running handler
- final ProxyEventHandler<TestEvent> proxyHandler1 = new ProxyEventHandler<TestEvent>(
+ final ProxyEventHandler<TestEvent> proxyHandler1 = new ProxyEventHandler<>(
myId, remoteId, "recvEH1", reSendStage.<TestEvent>getHandler(), new RemoteSeqNumGenerator());
final long start = System.nanoTime();
for (int i = 0; i < finalSize; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java
index e34d90c..fc3c65c 100644
--- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java
+++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java
@@ -97,7 +97,7 @@ public final class ParsedHttpRequest {
* @return
*/
public List<HeaderEntry> getHeaderEntryList() {
- final List<HeaderEntry> list = new ArrayList<HeaderEntry>();
+ final List<HeaderEntry> list = new ArrayList<>();
final Iterator it = this.headers.entrySet().iterator();
while (it.hasNext()) {
final Map.Entry pair = (Map.Entry)it.next();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
index 29c9457..21c0b04 100644
--- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
+++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
@@ -63,7 +63,7 @@ public final class ReefEventStateManager {
*/
private final Map<String, ActiveContext> contexts = new HashMap<>();
- private final List<AvroReefServiceInfo> serviceInfoList = new ArrayList<AvroReefServiceInfo>();
+ private final List<AvroReefServiceInfo> serviceInfoList = new ArrayList<>();
/**
* Remote manager in driver the carries information such as driver endpoint identifier.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/93220694/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
index d31edb1..e557c9a 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
@@ -266,7 +266,7 @@ public final class TestAvroHttpSerializer {
}
private ArrayList<HeaderEntry> createHeader() {
- final ArrayList<HeaderEntry> list = new ArrayList<HeaderEntry>();
+ final ArrayList<HeaderEntry> list = new ArrayList<>();
final HeaderEntry e1 = HeaderEntry.newBuilder()
.setKey("a")
.setValue("xxx")