diff --git a/src/main/java/org/mapdb/Atomic.java b/src/main/java/org/mapdb/Atomic.java
index b06e7a5cf..2d8f3a9c1 100644
--- a/src/main/java/org/mapdb/Atomic.java
+++ b/src/main/java/org/mapdb/Atomic.java
@@ -23,9 +23,6 @@
*/
package org.mapdb;
-import java.io.DataInput;
-import java.io.IOException;
-
/**
*
* A small toolkit of classes that support lock-free thread-safe
diff --git a/src/main/java/org/mapdb/DBMaker.kt b/src/main/java/org/mapdb/DBMaker.kt
index 3a85d367d..80dec8f23 100644
--- a/src/main/java/org/mapdb/DBMaker.kt
+++ b/src/main/java/org/mapdb/DBMaker.kt
@@ -2,7 +2,6 @@ package org.mapdb
import org.mapdb.volume.*
import java.io.File
-import java.lang.ref.WeakReference
/**
diff --git a/src/main/java/org/mapdb/DataIO.java b/src/main/java/org/mapdb/DataIO.java
index 34bb154ec..e6b1fed50 100644
--- a/src/main/java/org/mapdb/DataIO.java
+++ b/src/main/java/org/mapdb/DataIO.java
@@ -1,14 +1,10 @@
package org.mapdb;
-import org.jetbrains.annotations.NotNull;
-
import java.io.*;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.Arrays;
-import static java.lang.Long.rotateLeft;
-
/**
* Various IO classes and utilities..
*/
diff --git a/src/main/java/org/mapdb/HTreeMap.kt b/src/main/java/org/mapdb/HTreeMap.kt
index f865e8d01..ded7a9276 100644
--- a/src/main/java/org/mapdb/HTreeMap.kt
+++ b/src/main/java/org/mapdb/HTreeMap.kt
@@ -5,9 +5,10 @@ import org.eclipse.collections.api.map.primitive.MutableLongLongMap
import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet
import java.io.Closeable
import java.security.SecureRandom
-
import java.util.*
-import java.util.concurrent.*
+import java.util.concurrent.ConcurrentMap
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
import java.util.concurrent.locks.ReadWriteLock
import java.util.function.BiConsumer
diff --git a/src/main/java/org/mapdb/IndexTreeListJava.java b/src/main/java/org/mapdb/IndexTreeListJava.java
index 6de424967..82ea2c28d 100644
--- a/src/main/java/org/mapdb/IndexTreeListJava.java
+++ b/src/main/java/org/mapdb/IndexTreeListJava.java
@@ -1,7 +1,5 @@
package org.mapdb;
-import org.jetbrains.annotations.NotNull;
-
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/IndexTreeLongLongMap.kt b/src/main/java/org/mapdb/IndexTreeLongLongMap.kt
index bc422bb4b..12452ba20 100644
--- a/src/main/java/org/mapdb/IndexTreeLongLongMap.kt
+++ b/src/main/java/org/mapdb/IndexTreeLongLongMap.kt
@@ -1,5 +1,6 @@
package org.mapdb
+import org.eclipse.collections.api.LazyIterable
import org.eclipse.collections.api.LazyLongIterable
import org.eclipse.collections.api.LongIterable
import org.eclipse.collections.api.RichIterable
@@ -11,7 +12,6 @@ import org.eclipse.collections.api.block.predicate.primitive.LongPredicate
import org.eclipse.collections.api.block.procedure.Procedure
import org.eclipse.collections.api.block.procedure.primitive.LongLongProcedure
import org.eclipse.collections.api.block.procedure.primitive.LongProcedure
-import org.eclipse.collections.api.collection.MutableCollection
import org.eclipse.collections.api.collection.primitive.ImmutableLongCollection
import org.eclipse.collections.api.collection.primitive.MutableLongCollection
import org.eclipse.collections.api.iterator.MutableLongIterator
@@ -30,10 +30,9 @@ import org.eclipse.collections.impl.factory.primitive.LongLongMaps
import org.eclipse.collections.impl.factory.primitive.LongSets
import org.eclipse.collections.impl.lazy.AbstractLazyIterable
import org.eclipse.collections.impl.lazy.primitive.LazyLongIterableAdapter
-import org.eclipse.collections.impl.list.mutable.ArrayListAdapter
-import org.eclipse.collections.impl.list.mutable.primitive.LongArrayList
import org.eclipse.collections.impl.map.mutable.primitive.LongLongHashMap
import org.eclipse.collections.impl.primitive.AbstractLongIterable
+import org.eclipse.collections.impl.set.mutable.primitive.BoxedMutableLongSet
import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet
import org.eclipse.collections.impl.set.mutable.primitive.SynchronizedLongSet
import org.eclipse.collections.impl.set.mutable.primitive.UnmodifiableLongSet
@@ -110,9 +109,9 @@ public class IndexTreeLongLongMap(
override fun containsValue(value: Long): Boolean {
//TODO perf
- return treeFold(rootRecid, store, levels, false, TreeTraverseCallback { k, v, b: Boolean ->
+ return treeFold(rootRecid, store, levels, false) { k, v, b: Boolean ->
b || v == value
- })
+ }
}
@@ -611,6 +610,13 @@ public class IndexTreeLongLongMap(
return this@IndexTreeLongLongMap.size()
}
+ override fun boxed(): MutableSet {
+ return BoxedMutableLongSet(this)
+ }
+
+ override fun cartesianProduct(set: LongSet?): LazyIterable {
+ return LongSets.cartesianProduct(this, set)
+ }
}
override fun keySet(): MutableLongSet {
@@ -823,7 +829,6 @@ internal abstract open class AbstractMutableLongCollection :
LongIterableIterate.appendString(this, appendable, start, separator, end)
}
-
override fun toArray(): LongArray? {
var ret = LongArray(32)
var pos = 0;
@@ -897,8 +902,6 @@ internal abstract open class AbstractMutableLongCollection :
return ret
}
-
-
override fun add(element: Long): Boolean {
throw UnsupportedOperationException("Cannot call add() on " + this.javaClass.simpleName)
}
@@ -927,7 +930,6 @@ internal abstract open class AbstractMutableLongCollection :
throw UnsupportedOperationException("Cannot call withoutAll() on " + this.javaClass.simpleName)
}
-
override fun equals(obj: Any?): Boolean {
if (this === obj) {
return true
@@ -938,7 +940,6 @@ internal abstract open class AbstractMutableLongCollection :
return this.size() == obj.size() && this.containsAll(obj)
}
-
override fun hashCode(): Int {
var ret = 0;
forEach{k->
diff --git a/src/main/java/org/mapdb/MapExtra.kt b/src/main/java/org/mapdb/MapExtra.kt
index 98830042b..eafe30e17 100644
--- a/src/main/java/org/mapdb/MapExtra.kt
+++ b/src/main/java/org/mapdb/MapExtra.kt
@@ -1,7 +1,5 @@
package org.mapdb
-import org.eclipse.collections.api.block.procedure.Procedure
-import java.util.EventListener
import java.util.concurrent.ConcurrentMap
import java.util.concurrent.ConcurrentNavigableMap
import java.util.function.BiConsumer
diff --git a/src/main/java/org/mapdb/StoreWAL.kt b/src/main/java/org/mapdb/StoreWAL.kt
index 6a6dcb80e..27be928d8 100644
--- a/src/main/java/org/mapdb/StoreWAL.kt
+++ b/src/main/java/org/mapdb/StoreWAL.kt
@@ -3,12 +3,12 @@ package org.mapdb
import org.eclipse.collections.impl.list.mutable.primitive.LongArrayList
import org.eclipse.collections.impl.map.mutable.primitive.LongLongHashMap
import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap
+import org.mapdb.DataIO.*
+import org.mapdb.StoreDirectJava.*
import org.mapdb.volume.ReadOnlyVolume
import org.mapdb.volume.SingleByteArrayVol
import org.mapdb.volume.Volume
import org.mapdb.volume.VolumeFactory
-import org.mapdb.DataIO.*
-import org.mapdb.StoreDirectJava.*
import java.io.File
import java.util.*
diff --git a/src/main/java/org/mapdb/serializer/SerializerBigDecimal.java b/src/main/java/org/mapdb/serializer/SerializerBigDecimal.java
index c081eb45d..41a63b80e 100644
--- a/src/main/java/org/mapdb/serializer/SerializerBigDecimal.java
+++ b/src/main/java/org/mapdb/serializer/SerializerBigDecimal.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.math.BigDecimal;
diff --git a/src/main/java/org/mapdb/serializer/SerializerBigInteger.java b/src/main/java/org/mapdb/serializer/SerializerBigInteger.java
index fc584d07e..ee0c2b1d6 100644
--- a/src/main/java/org/mapdb/serializer/SerializerBigInteger.java
+++ b/src/main/java/org/mapdb/serializer/SerializerBigInteger.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.math.BigInteger;
diff --git a/src/main/java/org/mapdb/serializer/SerializerBoolean.java b/src/main/java/org/mapdb/serializer/SerializerBoolean.java
index c9ce39401..4f2e53b67 100644
--- a/src/main/java/org/mapdb/serializer/SerializerBoolean.java
+++ b/src/main/java/org/mapdb/serializer/SerializerBoolean.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerByte.java b/src/main/java/org/mapdb/serializer/SerializerByte.java
index 94aa265b7..3fd9ca342 100644
--- a/src/main/java/org/mapdb/serializer/SerializerByte.java
+++ b/src/main/java/org/mapdb/serializer/SerializerByte.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerByteArray.java b/src/main/java/org/mapdb/serializer/SerializerByteArray.java
index 1afb38ba9..ca5058167 100644
--- a/src/main/java/org/mapdb/serializer/SerializerByteArray.java
+++ b/src/main/java/org/mapdb/serializer/SerializerByteArray.java
@@ -1,7 +1,10 @@
package org.mapdb.serializer;
import net.jpountz.xxhash.XXHash32;
-import org.mapdb.*;
+import org.mapdb.CC;
+import org.mapdb.DataInput2;
+import org.mapdb.DataOutput2;
+import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerByteArrayDelta2.java b/src/main/java/org/mapdb/serializer/SerializerByteArrayDelta2.java
index 028cb5463..8e153f38c 100644
--- a/src/main/java/org/mapdb/serializer/SerializerByteArrayDelta2.java
+++ b/src/main/java/org/mapdb/serializer/SerializerByteArrayDelta2.java
@@ -1,7 +1,6 @@
package org.mapdb.serializer;
import org.jetbrains.annotations.NotNull;
-import static org.mapdb.serializer.SerializerStringDelta2.ByteArrayKeys;
import org.mapdb.DataIO;
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
@@ -11,6 +10,8 @@
import java.util.Arrays;
import java.util.Comparator;
+import static org.mapdb.serializer.SerializerStringDelta2.ByteArrayKeys;
+
/**
* Created by jan on 2/29/16.
*/
diff --git a/src/main/java/org/mapdb/serializer/SerializerByteArrayNoSize.java b/src/main/java/org/mapdb/serializer/SerializerByteArrayNoSize.java
index 09b7b8dfe..fb8624656 100644
--- a/src/main/java/org/mapdb/serializer/SerializerByteArrayNoSize.java
+++ b/src/main/java/org/mapdb/serializer/SerializerByteArrayNoSize.java
@@ -6,7 +6,6 @@
import java.io.IOException;
import java.util.Arrays;
-import java.util.Comparator;
/**
* Created by jan on 2/28/16.
diff --git a/src/main/java/org/mapdb/serializer/SerializerChar.java b/src/main/java/org/mapdb/serializer/SerializerChar.java
index e7c42c839..6aff79cc0 100644
--- a/src/main/java/org/mapdb/serializer/SerializerChar.java
+++ b/src/main/java/org/mapdb/serializer/SerializerChar.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerCompressionDeflateWrapper.java b/src/main/java/org/mapdb/serializer/SerializerCompressionDeflateWrapper.java
index 96d35f59c..a4098032f 100644
--- a/src/main/java/org/mapdb/serializer/SerializerCompressionDeflateWrapper.java
+++ b/src/main/java/org/mapdb/serializer/SerializerCompressionDeflateWrapper.java
@@ -1,6 +1,9 @@
package org.mapdb.serializer;
-import org.mapdb.*;
+import org.mapdb.CC;
+import org.mapdb.DBException;
+import org.mapdb.DataInput2;
+import org.mapdb.DataOutput2;
import java.io.IOException;
import java.io.Serializable;
diff --git a/src/main/java/org/mapdb/serializer/SerializerCompressionWrapper.java b/src/main/java/org/mapdb/serializer/SerializerCompressionWrapper.java
index 27123a73e..d15da8eb1 100644
--- a/src/main/java/org/mapdb/serializer/SerializerCompressionWrapper.java
+++ b/src/main/java/org/mapdb/serializer/SerializerCompressionWrapper.java
@@ -1,6 +1,9 @@
package org.mapdb.serializer;
-import org.mapdb.*;
+import org.mapdb.CC;
+import org.mapdb.DBException;
+import org.mapdb.DataInput2;
+import org.mapdb.DataOutput2;
import java.io.IOException;
import java.io.Serializable;
diff --git a/src/main/java/org/mapdb/serializer/SerializerDoubleArray.java b/src/main/java/org/mapdb/serializer/SerializerDoubleArray.java
index 64a99a976..c6a5f790f 100644
--- a/src/main/java/org/mapdb/serializer/SerializerDoubleArray.java
+++ b/src/main/java/org/mapdb/serializer/SerializerDoubleArray.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerEightByte.java b/src/main/java/org/mapdb/serializer/SerializerEightByte.java
index 64d6a42eb..9da6de68b 100644
--- a/src/main/java/org/mapdb/serializer/SerializerEightByte.java
+++ b/src/main/java/org/mapdb/serializer/SerializerEightByte.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerFloatArray.java b/src/main/java/org/mapdb/serializer/SerializerFloatArray.java
index c0140a376..a4bbe158b 100644
--- a/src/main/java/org/mapdb/serializer/SerializerFloatArray.java
+++ b/src/main/java/org/mapdb/serializer/SerializerFloatArray.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerFourByte.java b/src/main/java/org/mapdb/serializer/SerializerFourByte.java
index a49d2b272..61e0a28d4 100644
--- a/src/main/java/org/mapdb/serializer/SerializerFourByte.java
+++ b/src/main/java/org/mapdb/serializer/SerializerFourByte.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerIllegalAccess.java b/src/main/java/org/mapdb/serializer/SerializerIllegalAccess.java
index d422ec65b..ef6d9b8b5 100644
--- a/src/main/java/org/mapdb/serializer/SerializerIllegalAccess.java
+++ b/src/main/java/org/mapdb/serializer/SerializerIllegalAccess.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerIntArray.java b/src/main/java/org/mapdb/serializer/SerializerIntArray.java
index b3c277b28..510434e08 100644
--- a/src/main/java/org/mapdb/serializer/SerializerIntArray.java
+++ b/src/main/java/org/mapdb/serializer/SerializerIntArray.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerJava.java b/src/main/java/org/mapdb/serializer/SerializerJava.java
index 22a13fed1..53f97e305 100644
--- a/src/main/java/org/mapdb/serializer/SerializerJava.java
+++ b/src/main/java/org/mapdb/serializer/SerializerJava.java
@@ -4,12 +4,7 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.OutputStream;
+import java.io.*;
/**
* Created by jan on 2/28/16.
diff --git a/src/main/java/org/mapdb/serializer/SerializerShort.java b/src/main/java/org/mapdb/serializer/SerializerShort.java
index f86e75d52..86f2c9e29 100644
--- a/src/main/java/org/mapdb/serializer/SerializerShort.java
+++ b/src/main/java/org/mapdb/serializer/SerializerShort.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerString.java b/src/main/java/org/mapdb/serializer/SerializerString.java
index 225074f21..1db7aa533 100644
--- a/src/main/java/org/mapdb/serializer/SerializerString.java
+++ b/src/main/java/org/mapdb/serializer/SerializerString.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerStringAscii.java b/src/main/java/org/mapdb/serializer/SerializerStringAscii.java
index 73c55b87b..aaca4e146 100644
--- a/src/main/java/org/mapdb/serializer/SerializerStringAscii.java
+++ b/src/main/java/org/mapdb/serializer/SerializerStringAscii.java
@@ -3,7 +3,6 @@
import org.jetbrains.annotations.NotNull;
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerStringDelta.java b/src/main/java/org/mapdb/serializer/SerializerStringDelta.java
index b7a17db76..934dd05db 100644
--- a/src/main/java/org/mapdb/serializer/SerializerStringDelta.java
+++ b/src/main/java/org/mapdb/serializer/SerializerStringDelta.java
@@ -1,6 +1,8 @@
package org.mapdb.serializer;
-import org.mapdb.*;
+import org.mapdb.DataIO;
+import org.mapdb.DataInput2;
+import org.mapdb.DataOutput2;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerStringIntern.java b/src/main/java/org/mapdb/serializer/SerializerStringIntern.java
index 3f03e6369..c5144be07 100644
--- a/src/main/java/org/mapdb/serializer/SerializerStringIntern.java
+++ b/src/main/java/org/mapdb/serializer/SerializerStringIntern.java
@@ -3,7 +3,6 @@
import org.jetbrains.annotations.NotNull;
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
diff --git a/src/main/java/org/mapdb/serializer/SerializerStringNoSize.java b/src/main/java/org/mapdb/serializer/SerializerStringNoSize.java
index b10f1d4ff..4918e401e 100644
--- a/src/main/java/org/mapdb/serializer/SerializerStringNoSize.java
+++ b/src/main/java/org/mapdb/serializer/SerializerStringNoSize.java
@@ -6,7 +6,6 @@
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.Comparator;
/**
* Created by jan on 2/28/16.
diff --git a/src/main/java/org/mapdb/serializer/SerializerUUID.java b/src/main/java/org/mapdb/serializer/SerializerUUID.java
index 5ee69bf7f..8588c6d91 100644
--- a/src/main/java/org/mapdb/serializer/SerializerUUID.java
+++ b/src/main/java/org/mapdb/serializer/SerializerUUID.java
@@ -2,7 +2,6 @@
import org.mapdb.DataInput2;
import org.mapdb.DataOutput2;
-import org.mapdb.Serializer;
import java.io.IOException;
import java.util.Arrays;
diff --git a/src/main/java/org/mapdb/serializer/SerializerUtils.java b/src/main/java/org/mapdb/serializer/SerializerUtils.java
index 10b942375..d8f659365 100644
--- a/src/main/java/org/mapdb/serializer/SerializerUtils.java
+++ b/src/main/java/org/mapdb/serializer/SerializerUtils.java
@@ -2,15 +2,15 @@
import org.mapdb.Serializer;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import org.mapdb.Serializer;
import static org.mapdb.Serializer.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.*;
-
/**
* Created by jan on 2/28/16.
*/
diff --git a/src/main/java/org/mapdb/volume/ByteBufferVol.java b/src/main/java/org/mapdb/volume/ByteBufferVol.java
index 84c663ea6..068d6bbb8 100644
--- a/src/main/java/org/mapdb/volume/ByteBufferVol.java
+++ b/src/main/java/org/mapdb/volume/ByteBufferVol.java
@@ -3,7 +3,6 @@
import org.mapdb.CC;
import org.mapdb.DBException;
import org.mapdb.DataInput2;
-import org.mapdb.volume.CleanerUtil;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/src/main/java/org/mapdb/volume/CleanerUtil.java b/src/main/java/org/mapdb/volume/CleanerUtil.java
index 1e485a412..b27e9f360 100644
--- a/src/main/java/org/mapdb/volume/CleanerUtil.java
+++ b/src/main/java/org/mapdb/volume/CleanerUtil.java
@@ -26,10 +26,7 @@
import java.nio.MappedByteBuffer;
import java.util.Objects;
-import static java.lang.invoke.MethodHandles.constant;
-import static java.lang.invoke.MethodHandles.dropArguments;
-import static java.lang.invoke.MethodHandles.filterReturnValue;
-import static java.lang.invoke.MethodHandles.guardWithTest;
+import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.methodType;
/**
diff --git a/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongCollectionTestCase.java b/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongCollectionTestCase.java
index a104b32f2..20142ed79 100644
--- a/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongCollectionTestCase.java
+++ b/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongCollectionTestCase.java
@@ -369,12 +369,7 @@ public void longIterator_with_remove()
iterator.remove();
}
Verify.assertEmpty(longIterable);
- Verify.assertThrows(NoSuchElementException.class, new Runnable() {
- @Override
- public void run() {
- iterator.next();
- }
- });
+ Verify.assertThrows(NoSuchElementException.class, iterator::next);
}
@Test
@@ -383,11 +378,9 @@ public void longIterator_throws_for_remove_before_next()
MutableLongCollection longIterable = this.classUnderTest();
final MutableLongIterator iterator = longIterable.longIterator();
Assert.assertTrue(iterator.hasNext());
- Verify.assertThrows(IllegalStateException.class, new Runnable() {
- @Override
- public void run() {
- iterator.remove();
- }
+ Verify.assertThrows(IllegalStateException.class, ()->{
+ iterator.remove();
+ return null;
});
}
@@ -399,11 +392,9 @@ public void longIterator_throws_for_consecutive_remove()
Assert.assertTrue(iterator.hasNext());
iterator.next();
iterator.remove();
- Verify.assertThrows(IllegalStateException.class,new Runnable() {
- @Override
- public void run() {
- iterator.remove();
- }
+ Verify.assertThrows(IllegalStateException.class, ()->{
+ iterator.remove();
+ return null;
});
}
diff --git a/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongLongMapTestCase.java b/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongLongMapTestCase.java
index a5729afaf..c1ce2cf8a 100644
--- a/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongLongMapTestCase.java
+++ b/src/test/java/org/mapdb/indexTreeLongLongMapTests_GS_GENERATED/AbstractMutableLongLongMapTestCase.java
@@ -711,7 +711,10 @@ public void iterator_throws_on_invocation_of_remove_before_next()
{
MutableLongIterator iterator = this.classUnderTest().longIterator();
Assert.assertTrue(iterator.hasNext());
- Verify.assertThrows(IllegalStateException.class, iterator::remove);
+ Verify.assertThrows(IllegalStateException.class, ()->{
+ iterator.remove();
+ return null;
+ });
}
@Test
@@ -721,6 +724,9 @@ public void iterator_throws_on_consecutive_invocation_of_remove()
Assert.assertTrue(iterator.hasNext());
iterator.next();
iterator.remove();
- Verify.assertThrows(IllegalStateException.class, iterator::remove);
+ Verify.assertThrows(IllegalStateException.class, ()->{
+ iterator.remove();
+ return null;
+ });
}
}