From 5b784ed70f1055992c788628c668d01c687d64e7 Mon Sep 17 00:00:00 2001 From: Dmitry Vyazelenko <696855+vyazelenko@users.noreply.github.com> Date: Wed, 17 Nov 2021 16:24:49 +0100 Subject: [PATCH] [Java] Remove Serializable from Agrona collections and mutable wrapper classes. (#250) --- agrona/src/main/java/org/agrona/MarkFile.java | 2 +- .../agrona/collections/BiInt2ObjectMap.java | 8 ++--- .../agrona/collections/Int2IntCounterMap.java | 4 +-- .../agrona/collections/Int2IntHashMap.java | 28 +++++---------- .../Int2NullableObjectHashMap.java | 2 -- .../agrona/collections/Int2ObjectCache.java | 8 ++--- .../agrona/collections/Int2ObjectHashMap.java | 35 ++++++------------ .../org/agrona/collections/IntArrayList.java | 4 +-- .../org/agrona/collections/IntArrayQueue.java | 7 ++-- .../org/agrona/collections/IntHashSet.java | 7 ++-- .../org/agrona/collections/IntLruCache.java | 1 - .../agrona/collections/MutableBoolean.java | 11 +++--- .../agrona/collections/MutableInteger.java | 12 +++---- .../org/agrona/collections/MutableLong.java | 12 +++---- .../agrona/collections/MutableReference.java | 11 +++--- .../org/agrona/collections/NullReference.java | 4 +-- .../agrona/collections/Object2IntHashMap.java | 33 +++++------------ .../Object2NullableObjectHashMap.java | 2 -- .../collections/Object2ObjectHashMap.java | 31 +++++----------- .../org/agrona/collections/ObjectHashSet.java | 18 +++++----- .../UnmodifiableCollectionView.java | 9 ++--- .../concurrent/BackoffIdleStrategy.java | 8 ++--- .../concurrent/BusySpinIdleStrategy.java | 8 ++--- .../org/agrona/concurrent/CompositeAgent.java | 4 +-- .../concurrent/ControllableIdleStrategy.java | 4 +-- .../concurrent/CountedErrorHandler.java | 2 +- .../concurrent/DynamicCompositeAgent.java | 4 +-- .../ManyToManyConcurrentArrayQueue.java | 12 +++---- .../ManyToOneConcurrentArrayQueue.java | 10 +++--- .../ManyToOneConcurrentLinkedQueue.java | 36 +++++++++---------- .../concurrent/MappedResizeableBuffer.java | 4 +-- .../agrona/concurrent/NoOpIdleStrategy.java | 8 ++--- .../concurrent/OffsetEpochNanoClock.java | 2 +- .../OneToOneConcurrentArrayQueue.java | 10 +++--- .../concurrent/SleepingIdleStrategy.java | 8 ++--- .../SleepingMillisIdleStrategy.java | 10 +++--- .../agrona/concurrent/SystemEpochClock.java | 2 +- .../concurrent/SystemEpochMicroClock.java | 2 +- .../concurrent/SystemEpochNanoClock.java | 2 +- .../agrona/concurrent/SystemNanoClock.java | 2 +- .../concurrent/YieldingIdleStrategy.java | 8 ++--- .../collections/Int2ObjectHashMapTest.java | 9 +---- 42 files changed, 152 insertions(+), 252 deletions(-) diff --git a/agrona/src/main/java/org/agrona/MarkFile.java b/agrona/src/main/java/org/agrona/MarkFile.java index 52b5f3d64..cf8886055 100644 --- a/agrona/src/main/java/org/agrona/MarkFile.java +++ b/agrona/src/main/java/org/agrona/MarkFile.java @@ -234,7 +234,7 @@ public boolean isClosed() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void close() { diff --git a/agrona/src/main/java/org/agrona/collections/BiInt2ObjectMap.java b/agrona/src/main/java/org/agrona/collections/BiInt2ObjectMap.java index b6a014ef2..e98fa8396 100644 --- a/agrona/src/main/java/org/agrona/collections/BiInt2ObjectMap.java +++ b/agrona/src/main/java/org/agrona/collections/BiInt2ObjectMap.java @@ -15,7 +15,6 @@ */ package org.agrona.collections; -import java.io.Serializable; import java.util.Arrays; import java.util.function.Consumer; @@ -28,11 +27,8 @@ * * @param type of the object stored in the map. */ -@SuppressWarnings("serial") -public class BiInt2ObjectMap implements Serializable +public class BiInt2ObjectMap { - private static final long serialVersionUID = -4306301811303037776L; - /** * Handler for a map entry * @@ -351,7 +347,7 @@ public boolean isEmpty() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/collections/Int2IntCounterMap.java b/agrona/src/main/java/org/agrona/collections/Int2IntCounterMap.java index c68a012aa..eab6228e9 100644 --- a/agrona/src/main/java/org/agrona/collections/Int2IntCounterMap.java +++ b/agrona/src/main/java/org/agrona/collections/Int2IntCounterMap.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.Arrays; import java.util.function.IntUnaryOperator; @@ -28,10 +27,9 @@ * An open-addressing with linear probing hash map specialised for primitive key and counter pairs. A counter map views * counters which hit {@link #initialValue} as deleted. This means that changing a counter may impact {@link #size()}. */ -public class Int2IntCounterMap implements Serializable +public class Int2IntCounterMap { @DoNotSub private static final int MIN_CAPACITY = 8; - private static final long serialVersionUID = -3044319458317497461L; @DoNotSub private final float loadFactor; private final int initialValue; diff --git a/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java b/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java index a151abbe6..fe7b57d69 100644 --- a/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java +++ b/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.BiConsumer; import java.util.function.Function; @@ -29,10 +28,9 @@ /** * An open-addressing with linear probing hash map specialised for primitive key and value pairs. */ -public class Int2IntHashMap implements Map, Serializable +public class Int2IntHashMap implements Map { @DoNotSub static final int MIN_CAPACITY = 8; - private static final long serialVersionUID = -690554872053575793L; private final float loadFactor; private final int missingValue; @@ -688,9 +686,8 @@ private Integer valOrNull(final int value) /** * Base iterator implementation. */ - abstract class AbstractIterator implements Serializable + abstract class AbstractIterator { - private static final long serialVersionUID = 5262459454112462433L; /** * Is current position valid. */ @@ -811,10 +808,8 @@ public void remove() /** * Iterator over keys which supports access to unboxed keys via {@link #nextValue()}. */ - public final class KeyIterator extends AbstractIterator implements Iterator, Serializable + public final class KeyIterator extends AbstractIterator implements Iterator { - private static final long serialVersionUID = 9151493609653852972L; - /** * {@inheritDoc} */ @@ -838,10 +833,8 @@ public int nextValue() /** * Iterator over values which supports access to unboxed values. */ - public final class ValueIterator extends AbstractIterator implements Iterator, Serializable + public final class ValueIterator extends AbstractIterator implements Iterator { - private static final long serialVersionUID = -5670291734793552927L; - /** * {@inheritDoc} */ @@ -867,10 +860,8 @@ public int nextValue() */ public final class EntryIterator extends AbstractIterator - implements Iterator>, Entry, Serializable + implements Iterator>, Entry { - private static final long serialVersionUID = 1744408438593481051L; - /** * {@inheritDoc} */ @@ -1067,9 +1058,8 @@ public String toString() /** * Set of keys which supports optional cached iterators to avoid allocation. */ - public final class KeySet extends AbstractSet implements Serializable + public final class KeySet extends AbstractSet { - private static final long serialVersionUID = -7645453993079742625L; private final KeyIterator keyIterator = shouldAvoidAllocation ? new KeyIterator() : null; /** @@ -1135,9 +1125,8 @@ public boolean contains(final int key) /** * Collection of values which supports optionally cached iterators to avoid allocation. */ - public final class ValueCollection extends AbstractCollection implements Serializable + public final class ValueCollection extends AbstractCollection { - private static final long serialVersionUID = -8925598924781601919L; private final ValueIterator valueIterator = shouldAvoidAllocation ? new ValueIterator() : null; /** @@ -1187,9 +1176,8 @@ public boolean contains(final int value) /** * Set of entries which supports optionally cached iterators to avoid allocation. */ - public final class EntrySet extends AbstractSet> implements Serializable + public final class EntrySet extends AbstractSet> { - private static final long serialVersionUID = 63641283589916174L; private final EntryIterator entryIterator = shouldAvoidAllocation ? new EntryIterator() : null; /** diff --git a/agrona/src/main/java/org/agrona/collections/Int2NullableObjectHashMap.java b/agrona/src/main/java/org/agrona/collections/Int2NullableObjectHashMap.java index c97e99eab..50ef96f42 100644 --- a/agrona/src/main/java/org/agrona/collections/Int2NullableObjectHashMap.java +++ b/agrona/src/main/java/org/agrona/collections/Int2NullableObjectHashMap.java @@ -24,8 +24,6 @@ */ public class Int2NullableObjectHashMap extends Int2ObjectHashMap { - private static final long serialVersionUID = -7081946803848112161L; - /** * Constructs map with default settings. */ diff --git a/agrona/src/main/java/org/agrona/collections/Int2ObjectCache.java b/agrona/src/main/java/org/agrona/collections/Int2ObjectCache.java index 6e0e3d163..d8d8f7ef1 100644 --- a/agrona/src/main/java/org/agrona/collections/Int2ObjectCache.java +++ b/agrona/src/main/java/org/agrona/collections/Int2ObjectCache.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.Consumer; import java.util.function.IntFunction; @@ -40,8 +39,7 @@ * * @param type of values stored in the {@link Map} */ -public class Int2ObjectCache - implements Map +public class Int2ObjectCache implements Map { private long cachePuts = 0; private long cacheHits = 0; @@ -643,10 +641,8 @@ public void clear() /** * Collection of values which supports cached iterator to avoid allocation. */ - @SuppressWarnings("serial") - public final class ValueCollection extends AbstractCollection implements Serializable + public final class ValueCollection extends AbstractCollection { - private static final long serialVersionUID = 4345278262685013239L; private final ValueIterator iterator = new ValueIterator(); /** diff --git a/agrona/src/main/java/org/agrona/collections/Int2ObjectHashMap.java b/agrona/src/main/java/org/agrona/collections/Int2ObjectHashMap.java index c92641639..d7fa6893e 100644 --- a/agrona/src/main/java/org/agrona/collections/Int2ObjectHashMap.java +++ b/agrona/src/main/java/org/agrona/collections/Int2ObjectHashMap.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.Consumer; import java.util.function.IntFunction; @@ -32,12 +31,9 @@ * * @param type of values stored in the {@link java.util.Map} */ -@SuppressWarnings("serial") -public class Int2ObjectHashMap - implements Map, Serializable +public class Int2ObjectHashMap implements Map { @DoNotSub static final int MIN_CAPACITY = 8; - private static final long serialVersionUID = -87577678740521569L; private final float loadFactor; @DoNotSub private int resizeThreshold; @@ -678,9 +674,8 @@ private void compactChain(@DoNotSub int deleteIndex) /** * Set of keys which supports optionally cached iterators to avoid allocation. */ - public final class KeySet extends AbstractSet implements Serializable + public final class KeySet extends AbstractSet { - private static final long serialVersionUID = 174654887531298424L; private final KeyIterator keyIterator = shouldAvoidAllocation ? new KeyIterator() : null; /** @@ -756,9 +751,8 @@ public void clear() /** * Collection of values which supports optionally cached iterators to avoid allocation. */ - public final class ValueCollection extends AbstractCollection implements Serializable + public final class ValueCollection extends AbstractCollection { - private static final long serialVersionUID = 6851282235497568109L; private final ValueIterator valueIterator = shouldAvoidAllocation ? new ValueIterator() : null; /** @@ -822,9 +816,8 @@ public void forEach(final Consumer action) /** * Set of entries which supports access via an optionally cached iterator to avoid allocation. */ - public final class EntrySet extends AbstractSet> implements Serializable + public final class EntrySet extends AbstractSet> { - private static final long serialVersionUID = 6797969139720339177L; private final EntryIterator entryIterator = shouldAvoidAllocation ? new EntryIterator() : null; /** @@ -919,9 +912,8 @@ public T[] toArray(final T[] a) * * @param type of elements. */ - abstract class AbstractIterator implements Iterator, Serializable + abstract class AbstractIterator implements Iterator { - private static final long serialVersionUID = 7955640333577513200L; @DoNotSub private int posCounter; @DoNotSub private int stopCounter; @DoNotSub private int remaining; @@ -1039,10 +1031,8 @@ final void reset() /** * Iterator over values. */ - public class ValueIterator extends AbstractIterator implements Serializable + public final class ValueIterator extends AbstractIterator { - private static final long serialVersionUID = -410109102792377049L; - /** * {@inheritDoc} */ @@ -1057,10 +1047,8 @@ public V next() /** * Iterator over keys which supports access to unboxed keys via {@link #nextInt()}. */ - public class KeyIterator extends AbstractIterator implements Serializable + public final class KeyIterator extends AbstractIterator { - private static final long serialVersionUID = -4905479491707153377L; - /** * {@inheritDoc} */ @@ -1085,12 +1073,10 @@ public int nextInt() /** * Iterator over entries which supports access to unboxed keys via {@link #getIntKey()}. */ - public class EntryIterator + public final class EntryIterator extends AbstractIterator> - implements Entry, Serializable + implements Entry { - private static final long serialVersionUID = 2227334666048171527L; - /** * {@inheritDoc} */ @@ -1160,9 +1146,8 @@ public V setValue(final V value) /** * An {@link java.util.Map.Entry} implementation. */ - public final class MapEntry implements Entry, Serializable + public final class MapEntry implements Entry { - private static final long serialVersionUID = -6648311124347304211L; private final int k; private final V v; diff --git a/agrona/src/main/java/org/agrona/collections/IntArrayList.java b/agrona/src/main/java/org/agrona/collections/IntArrayList.java index 192beec73..7e04f4fc2 100644 --- a/agrona/src/main/java/org/agrona/collections/IntArrayList.java +++ b/agrona/src/main/java/org/agrona/collections/IntArrayList.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.Consumer; import java.util.function.IntConsumer; @@ -26,7 +25,7 @@ /** * A {@link List} implementation that stores int values with the ability to not have them boxed. */ -public class IntArrayList extends AbstractList implements List, RandomAccess, Serializable +public class IntArrayList extends AbstractList implements List, RandomAccess { /** * The default value that will be used in place of null for an element. @@ -37,7 +36,6 @@ public class IntArrayList extends AbstractList implements List * Initial capacity to which the array will be sized. */ @DoNotSub public static final int INITIAL_CAPACITY = 10; - private static final long serialVersionUID = -2257879229511649624L; private final int nullValue; @DoNotSub private int size = 0; diff --git a/agrona/src/main/java/org/agrona/collections/IntArrayQueue.java b/agrona/src/main/java/org/agrona/collections/IntArrayQueue.java index 297076e56..e9f4c0323 100644 --- a/agrona/src/main/java/org/agrona/collections/IntArrayQueue.java +++ b/agrona/src/main/java/org/agrona/collections/IntArrayQueue.java @@ -18,7 +18,6 @@ import org.agrona.BitUtil; import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.Consumer; import java.util.function.IntConsumer; @@ -30,7 +29,7 @@ *

* Note: This class is not threadsafe. */ -public class IntArrayQueue extends AbstractQueue implements Serializable +public class IntArrayQueue extends AbstractQueue { /** * Default representation of null for an element. @@ -41,7 +40,6 @@ public class IntArrayQueue extends AbstractQueue implements Serializabl * Minimum capacity for the queue which must also be a power of 2. */ @DoNotSub public static final int MIN_CAPACITY = 8; - private static final long serialVersionUID = 8043508567156267834L; private final boolean shouldAvoidAllocation; @DoNotSub private int head; @@ -416,9 +414,8 @@ private void increaseCapacity() /** * Specialised {@link Iterator} from which the value can be retrieved without boxing via {@link #nextValue()}. */ - public final class IntIterator implements Iterator, Serializable + public final class IntIterator implements Iterator { - private static final long serialVersionUID = -7596692870537894897L; @DoNotSub private int index; IntIterator reset() diff --git a/agrona/src/main/java/org/agrona/collections/IntHashSet.java b/agrona/src/main/java/org/agrona/collections/IntHashSet.java index 5a44c5944..8232eb108 100644 --- a/agrona/src/main/java/org/agrona/collections/IntHashSet.java +++ b/agrona/src/main/java/org/agrona/collections/IntHashSet.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.lang.reflect.Array; import java.util.*; @@ -39,7 +38,7 @@ * @see IntIterator * @see Set */ -public class IntHashSet extends AbstractSet implements Serializable +public class IntHashSet extends AbstractSet { /** * The initial capacity used when none is specified in the constructor. @@ -47,7 +46,6 @@ public class IntHashSet extends AbstractSet implements Serializable @DoNotSub public static final int DEFAULT_INITIAL_CAPACITY = 8; static final int MISSING_VALUE = -1; - private static final long serialVersionUID = 8717061229749503234L; private final boolean shouldAvoidAllocation; private boolean containsMissingValue; @@ -703,9 +701,8 @@ public boolean equals(final Object other) /** * Iterator which supports unboxed access to the values via {@link #nextValue()}. */ - public final class IntIterator implements Iterator, Serializable + public final class IntIterator implements Iterator { - private static final long serialVersionUID = 351844349377836408L; @DoNotSub private int remaining; @DoNotSub private int positionCounter; @DoNotSub private int stopCounter; diff --git a/agrona/src/main/java/org/agrona/collections/IntLruCache.java b/agrona/src/main/java/org/agrona/collections/IntLruCache.java index 1ecaf3eac..53b659a29 100644 --- a/agrona/src/main/java/org/agrona/collections/IntLruCache.java +++ b/agrona/src/main/java/org/agrona/collections/IntLruCache.java @@ -31,7 +31,6 @@ */ public final class IntLruCache implements AutoCloseable { - private static final long serialVersionUID = 8349342109370417432L; @DoNotSub private final int capacity; private final IntFunction factory; private final Consumer closer; diff --git a/agrona/src/main/java/org/agrona/collections/MutableBoolean.java b/agrona/src/main/java/org/agrona/collections/MutableBoolean.java index 3aff4d623..9b8597764 100644 --- a/agrona/src/main/java/org/agrona/collections/MutableBoolean.java +++ b/agrona/src/main/java/org/agrona/collections/MutableBoolean.java @@ -15,14 +15,11 @@ */ package org.agrona.collections; -import java.io.Serializable; - /** * Mutable boolean valid that is useful for capturing a value when using lambdas or collections. */ -public class MutableBoolean implements Serializable +public class MutableBoolean { - private static final long serialVersionUID = 4524695016393435450L; /** * For convenient access. */ @@ -66,7 +63,7 @@ public void set(final boolean value) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean equals(final Object o) { @@ -86,7 +83,7 @@ public boolean equals(final Object o) } /** - * {@inheritDoc} + * {@inheritDoc} */ public int hashCode() { @@ -94,7 +91,7 @@ public int hashCode() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/collections/MutableInteger.java b/agrona/src/main/java/org/agrona/collections/MutableInteger.java index 973c85fad..8c7ba9832 100644 --- a/agrona/src/main/java/org/agrona/collections/MutableInteger.java +++ b/agrona/src/main/java/org/agrona/collections/MutableInteger.java @@ -15,13 +15,11 @@ */ package org.agrona.collections; -import java.io.Serializable; - /** * Holder for an int value that is mutable. Useful for being a counter in a {@link java.util.Map} or for passing by * reference. */ -public class MutableInteger extends Number implements Comparable, Serializable +public class MutableInteger extends Number implements Comparable { private static final long serialVersionUID = 985259236882848264L; /** @@ -207,7 +205,7 @@ public int addAndGet(final int delta) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean equals(final Object o) { @@ -227,7 +225,7 @@ public boolean equals(final Object o) } /** - * {@inheritDoc} + * {@inheritDoc} */ public int hashCode() { @@ -235,7 +233,7 @@ public int hashCode() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { @@ -243,7 +241,7 @@ public String toString() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int compareTo(final MutableInteger that) { diff --git a/agrona/src/main/java/org/agrona/collections/MutableLong.java b/agrona/src/main/java/org/agrona/collections/MutableLong.java index 3c3808e59..9adab696e 100644 --- a/agrona/src/main/java/org/agrona/collections/MutableLong.java +++ b/agrona/src/main/java/org/agrona/collections/MutableLong.java @@ -15,13 +15,11 @@ */ package org.agrona.collections; -import java.io.Serializable; - /** * Holder for a long value that is mutable. Useful for being a counter in a {@link java.util.Map} or for passing by * reference. */ -public class MutableLong extends Number implements Comparable, Serializable +public class MutableLong extends Number implements Comparable { private static final long serialVersionUID = -3537098518545563995L; /** @@ -207,7 +205,7 @@ public long addAndGet(final long delta) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean equals(final Object o) { @@ -227,7 +225,7 @@ public boolean equals(final Object o) } /** - * {@inheritDoc} + * {@inheritDoc} */ public int hashCode() { @@ -235,7 +233,7 @@ public int hashCode() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { @@ -243,7 +241,7 @@ public String toString() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int compareTo(final MutableLong that) { diff --git a/agrona/src/main/java/org/agrona/collections/MutableReference.java b/agrona/src/main/java/org/agrona/collections/MutableReference.java index aa9ac7105..c7176b1a8 100644 --- a/agrona/src/main/java/org/agrona/collections/MutableReference.java +++ b/agrona/src/main/java/org/agrona/collections/MutableReference.java @@ -15,7 +15,6 @@ */ package org.agrona.collections; -import java.io.Serializable; import java.util.Objects; /** @@ -23,10 +22,8 @@ * * @param type of the reference. */ -@SuppressWarnings("serial") -public class MutableReference implements Serializable +public class MutableReference { - private static final long serialVersionUID = 321431528882718691L; /** * For convenient access. */ @@ -70,7 +67,7 @@ public void set(final T ref) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean equals(final Object o) { @@ -90,7 +87,7 @@ public boolean equals(final Object o) } /** - * {@inheritDoc} + * {@inheritDoc} */ public int hashCode() { @@ -98,7 +95,7 @@ public int hashCode() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/collections/NullReference.java b/agrona/src/main/java/org/agrona/collections/NullReference.java index 37ea35444..6ed779da0 100644 --- a/agrona/src/main/java/org/agrona/collections/NullReference.java +++ b/agrona/src/main/java/org/agrona/collections/NullReference.java @@ -30,7 +30,7 @@ private NullReference() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int hashCode() { @@ -38,7 +38,7 @@ public int hashCode() } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean equals(final Object obj) { diff --git a/agrona/src/main/java/org/agrona/collections/Object2IntHashMap.java b/agrona/src/main/java/org/agrona/collections/Object2IntHashMap.java index 8f5dff967..c8d409e2b 100644 --- a/agrona/src/main/java/org/agrona/collections/Object2IntHashMap.java +++ b/agrona/src/main/java/org/agrona/collections/Object2IntHashMap.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.ToIntFunction; @@ -31,12 +30,9 @@ * * @param type of keys stored in the {@link java.util.Map} */ -@SuppressWarnings("serial") -public class Object2IntHashMap - implements Map, Serializable +public class Object2IntHashMap implements Map { @DoNotSub static final int MIN_CAPACITY = 8; - private static final long serialVersionUID = -6664980642816252596L; private final float loadFactor; private final int missingValue; @@ -678,9 +674,8 @@ private Integer valueOrNull(final int value) /** * Set of keys that can optionally cache iterators to avoid allocation. */ - public final class KeySet extends AbstractSet implements Serializable + public final class KeySet extends AbstractSet { - private static final long serialVersionUID = -1234547139181649343L; private final KeyIterator keyIterator = shouldAvoidAllocation ? new KeyIterator() : null; /** @@ -735,9 +730,8 @@ public void clear() /** * Collection of values which can optionally cache iterators to avoid allocation. */ - public final class ValueCollection extends AbstractCollection implements Serializable + public final class ValueCollection extends AbstractCollection { - private static final long serialVersionUID = -6589907057505627813L; private final ValueIterator valueIterator = shouldAvoidAllocation ? new ValueIterator() : null; /** @@ -783,9 +777,8 @@ public void clear() /** * Set of entries which can optionally cache iterators to avoid allocation. */ - public final class EntrySet extends AbstractSet> implements Serializable + public final class EntrySet extends AbstractSet> { - private static final long serialVersionUID = -5640061430571657431L; private final EntryIterator entryIterator = shouldAvoidAllocation ? new EntryIterator() : null; /** @@ -881,9 +874,8 @@ public T[] toArray(final T[] a) * * @param type of elements. */ - abstract class AbstractIterator implements Iterator, Serializable + abstract class AbstractIterator implements Iterator { - private static final long serialVersionUID = -5613227376239486119L; @DoNotSub private int posCounter; @DoNotSub private int stopCounter; @DoNotSub private int remaining; @@ -993,10 +985,8 @@ final void reset() /** * Iterator over values providing unboxed access via {@link #nextInt()}. */ - public final class ValueIterator extends AbstractIterator implements Serializable + public final class ValueIterator extends AbstractIterator { - private static final long serialVersionUID = 6755174304344657841L; - /** * {@inheritDoc} */ @@ -1020,10 +1010,8 @@ public int nextInt() /** * Iterator over keys. */ - public final class KeyIterator extends AbstractIterator implements Serializable + public final class KeyIterator extends AbstractIterator { - private static final long serialVersionUID = -5782758367804714619L; - /** * {@inheritDoc} */ @@ -1039,10 +1027,8 @@ public K next() */ public final class EntryIterator extends AbstractIterator> - implements Entry, Serializable + implements Entry { - private static final long serialVersionUID = 951101238418327235L; - /** * {@inheritDoc} */ @@ -1120,9 +1106,8 @@ public int setValue(final int value) /** * An {@link java.util.Map.Entry} implementation. */ - public final class MapEntry implements Entry, Serializable + public final class MapEntry implements Entry { - private static final long serialVersionUID = 7716717237784090877L; private final K k; private final int v; diff --git a/agrona/src/main/java/org/agrona/collections/Object2NullableObjectHashMap.java b/agrona/src/main/java/org/agrona/collections/Object2NullableObjectHashMap.java index accab0e42..716eb2824 100644 --- a/agrona/src/main/java/org/agrona/collections/Object2NullableObjectHashMap.java +++ b/agrona/src/main/java/org/agrona/collections/Object2NullableObjectHashMap.java @@ -20,8 +20,6 @@ */ public class Object2NullableObjectHashMap extends Object2ObjectHashMap { - private static final long serialVersionUID = 8456084431646897808L; - /** * Default constructor. */ diff --git a/agrona/src/main/java/org/agrona/collections/Object2ObjectHashMap.java b/agrona/src/main/java/org/agrona/collections/Object2ObjectHashMap.java index c84c39011..f379f04b9 100644 --- a/agrona/src/main/java/org/agrona/collections/Object2ObjectHashMap.java +++ b/agrona/src/main/java/org/agrona/collections/Object2ObjectHashMap.java @@ -17,7 +17,6 @@ import org.agrona.generation.DoNotSub; -import java.io.Serializable; import java.util.*; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -29,11 +28,9 @@ /** * An open-addressing with linear probing hash map, same algorithm as {@link Int2IntHashMap}. */ -@SuppressWarnings("serial") -public class Object2ObjectHashMap implements Map, Serializable +public class Object2ObjectHashMap implements Map { static final int MIN_CAPACITY = 8; - private static final long serialVersionUID = -1549211171492606678L; private final float loadFactor; private int resizeThreshold; @@ -524,9 +521,8 @@ private void capacity(final int newCapacity) /** * Base iterator impl. */ - abstract class AbstractIterator implements Serializable + abstract class AbstractIterator { - private static final long serialVersionUID = -6722944592177026218L; /** * Is position valid. */ @@ -567,7 +563,7 @@ final int keyPosition() /** * Return number of remaining elements. * - * @return number of remaining elements. + * @return number of remaining elements. */ public int remaining() { @@ -641,10 +637,8 @@ public void remove() /** * An iterator over keys. */ - public final class KeyIterator extends AbstractIterator implements Iterator, Serializable + public final class KeyIterator extends AbstractIterator implements Iterator { - private static final long serialVersionUID = 2381081253326969359L; - /** * {@inheritDoc} */ @@ -659,10 +653,8 @@ public K next() /** * An iterator over values. */ - public final class ValueIterator extends AbstractIterator implements Iterator, Serializable + public final class ValueIterator extends AbstractIterator implements Iterator { - private static final long serialVersionUID = -9021925571373462472L; - /** * {@inheritDoc} */ @@ -678,10 +670,8 @@ public V next() */ public final class EntryIterator extends AbstractIterator - implements Iterator>, Entry, Serializable + implements Iterator>, Entry { - private static final long serialVersionUID = 7273758986584625427L; - /** * {@inheritDoc} */ @@ -851,9 +841,8 @@ public String toString() /** * A key set implementation. */ - public final class KeySet extends AbstractSet implements Serializable + public final class KeySet extends AbstractSet { - private static final long serialVersionUID = 9104229702905879053L; private final KeyIterator keyIterator = shouldAvoidAllocation ? new KeyIterator() : null; /** @@ -925,9 +914,8 @@ public void forEach(final Consumer action) /** * A collection of values. */ - public final class ValueCollection extends AbstractCollection implements Serializable + public final class ValueCollection extends AbstractCollection { - private static final long serialVersionUID = 4700865656461554026L; private final ValueIterator valueIterator = shouldAvoidAllocation ? new ValueIterator() : null; /** @@ -982,9 +970,8 @@ public void forEach(final Consumer action) /** * An entry set implementation. */ - public final class EntrySet extends AbstractSet> implements Serializable + public final class EntrySet extends AbstractSet> { - private static final long serialVersionUID = 7025830249792699509L; private final EntryIterator entryIterator = shouldAvoidAllocation ? new EntryIterator() : null; /** diff --git a/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java b/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java index 6c0b56b3f..c4059af89 100644 --- a/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java +++ b/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java @@ -15,9 +15,10 @@ */ package org.agrona.collections; -import java.io.Serializable; import java.util.*; -import java.util.function.*; +import java.util.function.Consumer; +import java.util.function.IntConsumer; +import java.util.function.Predicate; import static org.agrona.BitUtil.findNextPositivePowerOfTwo; import static org.agrona.collections.CollectionUtil.validateLoadFactor; @@ -35,8 +36,7 @@ * @see ObjectIterator * @see Set */ -@SuppressWarnings("serial") -public class ObjectHashSet extends AbstractSet implements Serializable +public class ObjectHashSet extends AbstractSet { /** * The initial capacity used when none is specified in the constructor. @@ -44,7 +44,6 @@ public class ObjectHashSet extends AbstractSet implements Serializable public static final int DEFAULT_INITIAL_CAPACITY = 8; static final Object MISSING_VALUE = null; - private static final long serialVersionUID = -1323058412234306050L; private final boolean shouldAvoidAllocation; private final float loadFactor; @@ -591,9 +590,8 @@ public void forEach(final Consumer action) /** * Iterator over the set which can be optionally cached to avoid allocation. */ - public final class ObjectIterator implements Iterator, Serializable + public final class ObjectIterator implements Iterator { - private static final long serialVersionUID = 5661111157418381153L; private int remaining; private int positionCounter; private int stopCounter; @@ -636,7 +634,7 @@ public int remaining() } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean hasNext() { @@ -644,7 +642,7 @@ public boolean hasNext() } /** - * {@inheritDoc} + * {@inheritDoc} */ public T next() { @@ -683,7 +681,7 @@ public T nextValue() } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public void remove() diff --git a/agrona/src/main/java/org/agrona/collections/UnmodifiableCollectionView.java b/agrona/src/main/java/org/agrona/collections/UnmodifiableCollectionView.java index eb8b7441c..8a0d733aa 100644 --- a/agrona/src/main/java/org/agrona/collections/UnmodifiableCollectionView.java +++ b/agrona/src/main/java/org/agrona/collections/UnmodifiableCollectionView.java @@ -15,7 +15,6 @@ */ package org.agrona.collections; -import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; import java.util.Iterator; @@ -64,14 +63,12 @@ public ReusableIterator iterator() /** * A stateful reusable iterator. */ - @SuppressWarnings("serial") - public final class ReusableIterator implements Iterator, Serializable + public final class ReusableIterator implements Iterator { - private static final long serialVersionUID = 9183617352140354854L; private Iterator delegate; /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean hasNext() { @@ -79,7 +76,7 @@ public boolean hasNext() } /** - * {@inheritDoc} + * {@inheritDoc} */ public V next() { diff --git a/agrona/src/main/java/org/agrona/concurrent/BackoffIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/BackoffIdleStrategy.java index ca65745ac..79f283ad9 100644 --- a/agrona/src/main/java/org/agrona/concurrent/BackoffIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/BackoffIdleStrategy.java @@ -178,7 +178,7 @@ public void idle(final int workCount) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle() { @@ -218,7 +218,7 @@ public void idle() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void reset() { @@ -229,7 +229,7 @@ public void reset() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { @@ -237,7 +237,7 @@ public String alias() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/concurrent/BusySpinIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/BusySpinIdleStrategy.java index 875cd478a..73fb6b1af 100644 --- a/agrona/src/main/java/org/agrona/concurrent/BusySpinIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/BusySpinIdleStrategy.java @@ -37,7 +37,7 @@ public final class BusySpinIdleStrategy implements IdleStrategy /** * Note: this implementation will result in no safepoint poll once inlined. * - * {@inheritDoc} + * {@inheritDoc} */ public void idle(final int workCount) { @@ -50,7 +50,7 @@ public void idle(final int workCount) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle() { @@ -58,14 +58,14 @@ public void idle() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void reset() { } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { diff --git a/agrona/src/main/java/org/agrona/concurrent/CompositeAgent.java b/agrona/src/main/java/org/agrona/concurrent/CompositeAgent.java index cb5214dec..9c6485bfd 100644 --- a/agrona/src/main/java/org/agrona/concurrent/CompositeAgent.java +++ b/agrona/src/main/java/org/agrona/concurrent/CompositeAgent.java @@ -66,7 +66,7 @@ public CompositeAgent(final Agent... agents) } /** - * {@inheritDoc} + * {@inheritDoc} */ public String roleName() { @@ -107,7 +107,7 @@ public void onStart() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int doWork() throws Exception { diff --git a/agrona/src/main/java/org/agrona/concurrent/ControllableIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/ControllableIdleStrategy.java index 972e68be7..2560b3bed 100644 --- a/agrona/src/main/java/org/agrona/concurrent/ControllableIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/ControllableIdleStrategy.java @@ -123,7 +123,7 @@ public void reset() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { @@ -131,7 +131,7 @@ public String alias() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/concurrent/CountedErrorHandler.java b/agrona/src/main/java/org/agrona/concurrent/CountedErrorHandler.java index 4e88efc36..8cd82f6c8 100644 --- a/agrona/src/main/java/org/agrona/concurrent/CountedErrorHandler.java +++ b/agrona/src/main/java/org/agrona/concurrent/CountedErrorHandler.java @@ -63,7 +63,7 @@ public boolean isClosed() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void onError(final Throwable throwable) { diff --git a/agrona/src/main/java/org/agrona/concurrent/DynamicCompositeAgent.java b/agrona/src/main/java/org/agrona/concurrent/DynamicCompositeAgent.java index bdf0a944e..fe9206a0e 100644 --- a/agrona/src/main/java/org/agrona/concurrent/DynamicCompositeAgent.java +++ b/agrona/src/main/java/org/agrona/concurrent/DynamicCompositeAgent.java @@ -133,7 +133,7 @@ public void onStart() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int doWork() throws Exception { @@ -202,7 +202,7 @@ public void onClose() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String roleName() { diff --git a/agrona/src/main/java/org/agrona/concurrent/ManyToManyConcurrentArrayQueue.java b/agrona/src/main/java/org/agrona/concurrent/ManyToManyConcurrentArrayQueue.java index 5e0991c9f..5811fc76e 100644 --- a/agrona/src/main/java/org/agrona/concurrent/ManyToManyConcurrentArrayQueue.java +++ b/agrona/src/main/java/org/agrona/concurrent/ManyToManyConcurrentArrayQueue.java @@ -77,7 +77,7 @@ public ManyToManyConcurrentArrayQueue(final int requestedCapacity) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean offer(final E e) { @@ -114,7 +114,7 @@ public boolean offer(final E e) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public E poll() @@ -150,7 +150,7 @@ public E poll() } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public E peek() @@ -187,7 +187,7 @@ public E peek() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int drain(final Consumer elementConsumer) { @@ -195,7 +195,7 @@ public int drain(final Consumer elementConsumer) } /** - * {@inheritDoc} + * {@inheritDoc} */ public int drain(final Consumer elementConsumer, final int limit) { @@ -212,7 +212,7 @@ public int drain(final Consumer elementConsumer, final int limit) } /** - * {@inheritDoc} + * {@inheritDoc} */ public int drainTo(final Collection target, final int limit) { diff --git a/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentArrayQueue.java b/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentArrayQueue.java index 5fd5d58b2..7c652ae20 100644 --- a/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentArrayQueue.java +++ b/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentArrayQueue.java @@ -49,7 +49,7 @@ public ManyToOneConcurrentArrayQueue(final int requestedCapacity) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean offer(final E e) { @@ -85,7 +85,7 @@ public boolean offer(final E e) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public E poll() @@ -105,7 +105,7 @@ public E poll() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int drain(final Consumer elementConsumer) { @@ -113,7 +113,7 @@ public int drain(final Consumer elementConsumer) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public int drain(final Consumer elementConsumer, final int limit) @@ -144,7 +144,7 @@ public int drain(final Consumer elementConsumer, final int limit) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public int drainTo(final Collection target, final int limit) diff --git a/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentLinkedQueue.java b/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentLinkedQueue.java index 4a2a42604..3ab665ee0 100644 --- a/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentLinkedQueue.java +++ b/agrona/src/main/java/org/agrona/concurrent/ManyToOneConcurrentLinkedQueue.java @@ -147,7 +147,7 @@ public ManyToOneConcurrentLinkedQueue() } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean add(final E e) { @@ -155,7 +155,7 @@ public boolean add(final E e) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean offer(final E e) { @@ -172,7 +172,7 @@ public boolean offer(final E e) } /** - * {@inheritDoc} + * {@inheritDoc} */ public E remove() { @@ -186,7 +186,7 @@ public E remove() } /** - * {@inheritDoc} + * {@inheritDoc} */ public E poll() { @@ -216,7 +216,7 @@ public E poll() } /** - * {@inheritDoc} + * {@inheritDoc} */ public E element() { @@ -230,7 +230,7 @@ public E element() } /** - * {@inheritDoc} + * {@inheritDoc} */ public E peek() { @@ -269,7 +269,7 @@ public int size() } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean isEmpty() { @@ -277,7 +277,7 @@ public boolean isEmpty() } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean contains(final Object o) { @@ -285,7 +285,7 @@ public boolean contains(final Object o) } /** - * {@inheritDoc} + * {@inheritDoc} */ public Iterator iterator() { @@ -293,7 +293,7 @@ public Iterator iterator() } /** - * {@inheritDoc} + * {@inheritDoc} */ public Object[] toArray() { @@ -301,7 +301,7 @@ public Object[] toArray() } /** - * {@inheritDoc} + * {@inheritDoc} */ public T[] toArray(final T[] a) { @@ -309,7 +309,7 @@ public T[] toArray(final T[] a) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean remove(final Object o) { @@ -317,7 +317,7 @@ public boolean remove(final Object o) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean containsAll(final Collection c) { @@ -325,7 +325,7 @@ public boolean containsAll(final Collection c) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean addAll(final Collection c) { @@ -333,7 +333,7 @@ public boolean addAll(final Collection c) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean removeAll(final Collection c) { @@ -341,7 +341,7 @@ public boolean removeAll(final Collection c) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean retainAll(final Collection c) { @@ -349,7 +349,7 @@ public boolean retainAll(final Collection c) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void clear() { @@ -357,7 +357,7 @@ public void clear() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/concurrent/MappedResizeableBuffer.java b/agrona/src/main/java/org/agrona/concurrent/MappedResizeableBuffer.java index 5c4b33e97..697458826 100644 --- a/agrona/src/main/java/org/agrona/concurrent/MappedResizeableBuffer.java +++ b/agrona/src/main/java/org/agrona/concurrent/MappedResizeableBuffer.java @@ -77,7 +77,7 @@ public MappedResizeableBuffer( } /** - * {@inheritDoc} + * {@inheritDoc} */ public void close() { @@ -1472,7 +1472,7 @@ private void unmap() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/concurrent/NoOpIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/NoOpIdleStrategy.java index 4bb7aa3e3..dc44c4f5d 100644 --- a/agrona/src/main/java/org/agrona/concurrent/NoOpIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/NoOpIdleStrategy.java @@ -34,7 +34,7 @@ public final class NoOpIdleStrategy implements IdleStrategy /** * Note: this implementation will result in no safepoint poll once inlined. * - * {@inheritDoc} + * {@inheritDoc} */ public void idle(final int workCount) { @@ -43,21 +43,21 @@ public void idle(final int workCount) /** * Note: this implementation will result in no safepoint poll once inlined. * - * {@inheritDoc} + * {@inheritDoc} */ public void idle() { } /** - * {@inheritDoc} + * {@inheritDoc} */ public void reset() { } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { diff --git a/agrona/src/main/java/org/agrona/concurrent/OffsetEpochNanoClock.java b/agrona/src/main/java/org/agrona/concurrent/OffsetEpochNanoClock.java index 4a6cb8b1b..93bb54863 100644 --- a/agrona/src/main/java/org/agrona/concurrent/OffsetEpochNanoClock.java +++ b/agrona/src/main/java/org/agrona/concurrent/OffsetEpochNanoClock.java @@ -112,7 +112,7 @@ else if (nanoTimeWindow < bestNanoTimeWindow) } /** - * {@inheritDoc} + * {@inheritDoc} */ public long nanoTime() { diff --git a/agrona/src/main/java/org/agrona/concurrent/OneToOneConcurrentArrayQueue.java b/agrona/src/main/java/org/agrona/concurrent/OneToOneConcurrentArrayQueue.java index 85a2c758b..3e1aab1f3 100644 --- a/agrona/src/main/java/org/agrona/concurrent/OneToOneConcurrentArrayQueue.java +++ b/agrona/src/main/java/org/agrona/concurrent/OneToOneConcurrentArrayQueue.java @@ -39,7 +39,7 @@ public OneToOneConcurrentArrayQueue(final int requestedCapacity) } /** - * {@inheritDoc} + * {@inheritDoc} */ public boolean offer(final E e) { @@ -73,7 +73,7 @@ public boolean offer(final E e) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public E poll() @@ -93,7 +93,7 @@ public E poll() } /** - * {@inheritDoc} + * {@inheritDoc} */ public int drain(final Consumer elementConsumer) { @@ -101,7 +101,7 @@ public int drain(final Consumer elementConsumer) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public int drain(final Consumer elementConsumer, final int limit) @@ -132,7 +132,7 @@ public int drain(final Consumer elementConsumer, final int limit) } /** - * {@inheritDoc} + * {@inheritDoc} */ @SuppressWarnings("unchecked") public int drainTo(final Collection target, final int limit) diff --git a/agrona/src/main/java/org/agrona/concurrent/SleepingIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/SleepingIdleStrategy.java index c93a50a02..1d24e0001 100644 --- a/agrona/src/main/java/org/agrona/concurrent/SleepingIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/SleepingIdleStrategy.java @@ -55,7 +55,7 @@ public SleepingIdleStrategy(final long sleepPeriodNs) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle(final int workCount) { @@ -68,7 +68,7 @@ public void idle(final int workCount) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle() { @@ -76,14 +76,14 @@ public void idle() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void reset() { } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { diff --git a/agrona/src/main/java/org/agrona/concurrent/SleepingMillisIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/SleepingMillisIdleStrategy.java index c687ecd6f..59b2fa225 100644 --- a/agrona/src/main/java/org/agrona/concurrent/SleepingMillisIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/SleepingMillisIdleStrategy.java @@ -53,7 +53,7 @@ public SleepingMillisIdleStrategy(final long sleepPeriodMs) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle(final int workCount) { @@ -73,7 +73,7 @@ public void idle(final int workCount) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle() { @@ -88,14 +88,14 @@ public void idle() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void reset() { } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { @@ -103,7 +103,7 @@ public String alias() } /** - * {@inheritDoc} + * {@inheritDoc} */ public String toString() { diff --git a/agrona/src/main/java/org/agrona/concurrent/SystemEpochClock.java b/agrona/src/main/java/org/agrona/concurrent/SystemEpochClock.java index 7742c8786..abe6e2b79 100644 --- a/agrona/src/main/java/org/agrona/concurrent/SystemEpochClock.java +++ b/agrona/src/main/java/org/agrona/concurrent/SystemEpochClock.java @@ -26,7 +26,7 @@ public class SystemEpochClock implements EpochClock public static final SystemEpochClock INSTANCE = new SystemEpochClock(); /** - * {@inheritDoc} + * {@inheritDoc} */ public long time() { diff --git a/agrona/src/main/java/org/agrona/concurrent/SystemEpochMicroClock.java b/agrona/src/main/java/org/agrona/concurrent/SystemEpochMicroClock.java index 070480d40..0e0c452db 100644 --- a/agrona/src/main/java/org/agrona/concurrent/SystemEpochMicroClock.java +++ b/agrona/src/main/java/org/agrona/concurrent/SystemEpochMicroClock.java @@ -21,7 +21,7 @@ public class SystemEpochMicroClock implements EpochMicroClock { /** - * {@inheritDoc} + * {@inheritDoc} */ public long microTime() { diff --git a/agrona/src/main/java/org/agrona/concurrent/SystemEpochNanoClock.java b/agrona/src/main/java/org/agrona/concurrent/SystemEpochNanoClock.java index 18c4cf7a7..e1deee2fc 100644 --- a/agrona/src/main/java/org/agrona/concurrent/SystemEpochNanoClock.java +++ b/agrona/src/main/java/org/agrona/concurrent/SystemEpochNanoClock.java @@ -23,7 +23,7 @@ public class SystemEpochNanoClock implements EpochNanoClock { /** - * {@inheritDoc} + * {@inheritDoc} */ public long nanoTime() { diff --git a/agrona/src/main/java/org/agrona/concurrent/SystemNanoClock.java b/agrona/src/main/java/org/agrona/concurrent/SystemNanoClock.java index 8f48d61f5..28ae86f18 100644 --- a/agrona/src/main/java/org/agrona/concurrent/SystemNanoClock.java +++ b/agrona/src/main/java/org/agrona/concurrent/SystemNanoClock.java @@ -28,7 +28,7 @@ public class SystemNanoClock implements NanoClock public static final SystemNanoClock INSTANCE = new SystemNanoClock(); /** - * {@inheritDoc} + * {@inheritDoc} */ public long nanoTime() { diff --git a/agrona/src/main/java/org/agrona/concurrent/YieldingIdleStrategy.java b/agrona/src/main/java/org/agrona/concurrent/YieldingIdleStrategy.java index f2efd0a61..e8d317b3e 100644 --- a/agrona/src/main/java/org/agrona/concurrent/YieldingIdleStrategy.java +++ b/agrona/src/main/java/org/agrona/concurrent/YieldingIdleStrategy.java @@ -31,7 +31,7 @@ public final class YieldingIdleStrategy implements IdleStrategy public static final YieldingIdleStrategy INSTANCE = new YieldingIdleStrategy(); /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle(final int workCount) { @@ -44,7 +44,7 @@ public void idle(final int workCount) } /** - * {@inheritDoc} + * {@inheritDoc} */ public void idle() { @@ -52,14 +52,14 @@ public void idle() } /** - * {@inheritDoc} + * {@inheritDoc} */ public void reset() { } /** - * {@inheritDoc} + * {@inheritDoc} */ public String alias() { diff --git a/agrona/src/test/java/org/agrona/collections/Int2ObjectHashMapTest.java b/agrona/src/test/java/org/agrona/collections/Int2ObjectHashMapTest.java index 118c933d8..702fcb03f 100644 --- a/agrona/src/test/java/org/agrona/collections/Int2ObjectHashMapTest.java +++ b/agrona/src/test/java/org/agrona/collections/Int2ObjectHashMapTest.java @@ -15,14 +15,9 @@ */ package org.agrona.collections; -import java.util.ArrayList; import org.junit.jupiter.api.Test; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -412,8 +407,6 @@ public void shouldAllowNullValuesWithNullMapping() { final Int2ObjectHashMap map = new Int2ObjectHashMap() { - private static final long serialVersionUID = 4728671632683628332L; - private final Object nullRef = new Object(); protected Object mapNullValue(final Object value)