From 4f66528ebcf1603108218b8ebf48147d8ed3ad38 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 17 Jan 2022 17:05:57 +0100 Subject: [PATCH] Remove redundant type arguments We have Java 11, hence we can use diamond notation for anonymous subclasses. Change-Id: I2c30624fde5a9896f98a63d57d6d50b26e009f3f Signed-off-by: Robert Varga --- .../org/opendaylight/yangtools/util/ExecutorServiceUtil.java | 2 +- .../opendaylight/yangtools/util/ForwardingIdentityObject.java | 2 +- .../org/opendaylight/yangtools/util/ImmutableOffsetMap.java | 2 +- .../org/opendaylight/yangtools/util/MutableOffsetMap.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java index fee28f2b41..c6a933ab0d 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java @@ -56,7 +56,7 @@ public final class ExecutorServiceUtil { * @return A new blocking queue backed by the delegate */ public static @NonNull BlockingQueue offerFailingBlockingQueue(final BlockingQueue delegate) { - return new ForwardingBlockingQueue() { + return new ForwardingBlockingQueue<>() { @Override @SuppressWarnings("checkstyle:parameterName") public boolean offer(final E o) { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ForwardingIdentityObject.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ForwardingIdentityObject.java index f775562c9f..b581676416 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ForwardingIdentityObject.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ForwardingIdentityObject.java @@ -63,7 +63,7 @@ public abstract class ForwardingIdentityObject extends ForwardingObject imple protected abstract @NonNull T delegate(); private static ForwardingIdentityObject checkedOf(final @NonNull T delegate) { - return new ForwardingIdentityObject() { + return new ForwardingIdentityObject<>() { @Override protected @NonNull T delegate() { return delegate; diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java index be0bcbf3da..844086df74 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java @@ -350,7 +350,7 @@ public abstract class ImmutableOffsetMap implements UnmodifiableMapPhase> iterator() { final Iterator> it = offsets.entrySet().iterator(); - return new UnmodifiableIterator>() { + return new UnmodifiableIterator<>() { @Override public boolean hasNext() { return it.hasNext(); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java index d71b3aade8..60f52396de 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java @@ -555,7 +555,7 @@ public abstract class MutableOffsetMap extends AbstractMap implement private final class EntrySet extends AbstractSet> { @Override public @NonNull Iterator> iterator() { - return new AbstractSetIterator>() { + return new AbstractSetIterator<>() { @Override public Entry next() { final K key = nextKey(); @@ -623,7 +623,7 @@ public abstract class MutableOffsetMap extends AbstractMap implement private final class KeySet extends AbstractSet { @Override public @NonNull Iterator iterator() { - return new AbstractSetIterator() { + return new AbstractSetIterator<>() { @Override public K next() { return nextKey(); -- 2.36.6