Skip to content

Commit 25fe08a

Browse files
benalexaubenalexau
committed
Update import ordering to reflect new standard
1 parent e9d7720 commit 25fe08a

33 files changed

+257
-201
lines changed

‎src/main/java/org/lmdbjava/BufferProxy.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package org.lmdbjava;
2222

2323
import static java.lang.Long.BYTES;
24+
2425
import jnr.ffi.Pointer;
2526

2627
/**

‎src/main/java/org/lmdbjava/ByteArrayProxy.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020

2121
package org.lmdbjava;
2222

23-
import java.util.Arrays;
2423
import static java.util.Objects.requireNonNull;
24+
import static org.lmdbjava.Library.RUNTIME;
25+
26+
import java.util.Arrays;
27+
2528
import jnr.ffi.Pointer;
2629
import jnr.ffi.provider.MemoryManager;
27-
import static org.lmdbjava.Library.RUNTIME;
2830

2931
/**
3032
* Byte array proxy.

‎src/main/java/org/lmdbjava/ByteBufProxy.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020

2121
package org.lmdbjava;
2222

23-
import io.netty.buffer.ByteBuf;
2423
import static io.netty.buffer.PooledByteBufAllocator.DEFAULT;
2524
import static java.lang.Class.forName;
2625
import static java.lang.ThreadLocal.withInitial;
26+
import static org.lmdbjava.UnsafeAccess.UNSAFE;
27+
2728
import java.lang.reflect.Field;
2829
import java.util.ArrayDeque;
30+
31+
import io.netty.buffer.ByteBuf;
2932
import jnr.ffi.Pointer;
30-
import static org.lmdbjava.UnsafeAccess.UNSAFE;
3133

3234
/**
3335
* A buffer proxy backed by Netty's {@link ByteBuf}.

‎src/main/java/org/lmdbjava/ByteBufferProxy.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@
2222

2323
import static java.lang.Long.reverseBytes;
2424
import static java.lang.ThreadLocal.withInitial;
25-
import java.lang.reflect.Field;
26-
import java.nio.Buffer;
27-
import java.nio.ByteBuffer;
2825
import static java.nio.ByteBuffer.allocateDirect;
2926
import static java.nio.ByteOrder.BIG_ENDIAN;
3027
import static java.nio.ByteOrder.LITTLE_ENDIAN;
31-
import java.util.ArrayDeque;
3228
import static java.util.Objects.requireNonNull;
33-
import jnr.ffi.Pointer;
3429
import static org.lmdbjava.Env.SHOULD_CHECK;
3530
import static org.lmdbjava.UnsafeAccess.UNSAFE;
3631

32+
import java.lang.reflect.Field;
33+
import java.nio.Buffer;
34+
import java.nio.ByteBuffer;
35+
import java.util.ArrayDeque;
36+
37+
import jnr.ffi.Pointer;
38+
3739
/**
3840
* {@link ByteBuffer}-based proxy.
3941
*

‎src/main/java/org/lmdbjava/Cursor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
package org.lmdbjava;
2222

2323
import static java.util.Objects.requireNonNull;
24-
import jnr.ffi.Pointer;
25-
import jnr.ffi.byref.NativeLongByReference;
2624
import static org.lmdbjava.Dbi.KeyExistsException.MDB_KEYEXIST;
2725
import static org.lmdbjava.Dbi.KeyNotFoundException.MDB_NOTFOUND;
2826
import static org.lmdbjava.Env.SHOULD_CHECK;
@@ -39,6 +37,9 @@
3937
import static org.lmdbjava.SeekOp.MDB_NEXT;
4038
import static org.lmdbjava.SeekOp.MDB_PREV;
4139

40+
import jnr.ffi.Pointer;
41+
import jnr.ffi.byref.NativeLongByReference;
42+
4243
/**
4344
* A cursor handle.
4445
*

‎src/main/java/org/lmdbjava/CursorIterable.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020

2121
package org.lmdbjava;
2222

23-
import java.util.Comparator;
24-
import java.util.Iterator;
25-
import java.util.NoSuchElementException;
2623
import static org.lmdbjava.CursorIterable.State.RELEASED;
2724
import static org.lmdbjava.CursorIterable.State.REQUIRES_INITIAL_OP;
2825
import static org.lmdbjava.CursorIterable.State.REQUIRES_ITERATOR_OP;
2926
import static org.lmdbjava.CursorIterable.State.REQUIRES_NEXT_OP;
3027
import static org.lmdbjava.CursorIterable.State.TERMINATED;
3128
import static org.lmdbjava.GetOp.MDB_SET_RANGE;
29+
30+
import java.util.Comparator;
31+
import java.util.Iterator;
32+
import java.util.NoSuchElementException;
33+
3234
import org.lmdbjava.KeyRangeType.CursorOp;
3335
import org.lmdbjava.KeyRangeType.IteratorOp;
3436

‎src/main/java/org/lmdbjava/Dbi.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,14 @@
2020

2121
package org.lmdbjava;
2222

23-
import java.util.ArrayList;
24-
import java.util.Arrays;
25-
import java.util.Comparator;
26-
import java.util.List;
2723
import static java.util.Objects.requireNonNull;
2824
import static jnr.ffi.Memory.allocateDirect;
2925
import static jnr.ffi.NativeType.ADDRESS;
30-
import jnr.ffi.Pointer;
31-
import jnr.ffi.byref.IntByReference;
32-
import jnr.ffi.byref.PointerByReference;
3326
import static org.lmdbjava.Dbi.KeyExistsException.MDB_KEYEXIST;
3427
import static org.lmdbjava.Dbi.KeyNotFoundException.MDB_NOTFOUND;
3528
import static org.lmdbjava.Env.SHOULD_CHECK;
3629
import static org.lmdbjava.KeyRange.all;
37-
import org.lmdbjava.Library.ComparatorCallback;
3830
import static org.lmdbjava.Library.LIB;
39-
import org.lmdbjava.Library.MDB_stat;
4031
import static org.lmdbjava.Library.RUNTIME;
4132
import static org.lmdbjava.MaskedFlag.isSet;
4233
import static org.lmdbjava.MaskedFlag.mask;
@@ -45,6 +36,17 @@
4536
import static org.lmdbjava.PutFlags.MDB_RESERVE;
4637
import static org.lmdbjava.ResultCodeMapper.checkRc;
4738

39+
import java.util.ArrayList;
40+
import java.util.Arrays;
41+
import java.util.Comparator;
42+
import java.util.List;
43+
44+
import jnr.ffi.Pointer;
45+
import jnr.ffi.byref.IntByReference;
46+
import jnr.ffi.byref.PointerByReference;
47+
import org.lmdbjava.Library.ComparatorCallback;
48+
import org.lmdbjava.Library.MDB_stat;
49+
4850
/**
4951
* LMDB Database.
5052
*

‎src/main/java/org/lmdbjava/DirectBufferProxy.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@
2121
package org.lmdbjava;
2222

2323
import static java.lang.ThreadLocal.withInitial;
24-
import java.nio.ByteBuffer;
2524
import static java.nio.ByteBuffer.allocateDirect;
2625
import static java.nio.ByteOrder.BIG_ENDIAN;
2726
import static java.util.Objects.requireNonNull;
27+
import static org.lmdbjava.UnsafeAccess.UNSAFE;
28+
29+
import java.nio.ByteBuffer;
30+
2831
import jnr.ffi.Pointer;
2932
import org.agrona.DirectBuffer;
3033
import org.agrona.MutableDirectBuffer;
3134
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
3235
import org.agrona.concurrent.UnsafeBuffer;
33-
import static org.lmdbjava.UnsafeAccess.UNSAFE;
3436

3537
/**
3638
* A buffer proxy backed by Agrona's {@link DirectBuffer}.

‎src/main/java/org/lmdbjava/Env.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,31 @@
2020

2121
package org.lmdbjava;
2222

23-
import java.io.File;
2423
import static java.lang.Boolean.getBoolean;
25-
import java.nio.ByteBuffer;
2624
import static java.nio.charset.StandardCharsets.UTF_8;
27-
import java.util.ArrayList;
28-
import java.util.Collections;
29-
import java.util.Comparator;
30-
import java.util.List;
3125
import static java.util.Objects.requireNonNull;
32-
import jnr.ffi.Pointer;
33-
import jnr.ffi.byref.PointerByReference;
3426
import static org.lmdbjava.ByteBufferProxy.PROXY_OPTIMAL;
3527
import static org.lmdbjava.EnvFlags.MDB_NOSUBDIR;
3628
import static org.lmdbjava.EnvFlags.MDB_RDONLY_ENV;
3729
import static org.lmdbjava.Library.LIB;
38-
import org.lmdbjava.Library.MDB_envinfo;
39-
import org.lmdbjava.Library.MDB_stat;
4030
import static org.lmdbjava.Library.RUNTIME;
4131
import static org.lmdbjava.MaskedFlag.isSet;
4232
import static org.lmdbjava.MaskedFlag.mask;
4333
import static org.lmdbjava.ResultCodeMapper.checkRc;
4434
import static org.lmdbjava.TxnFlags.MDB_RDONLY_TXN;
4535

36+
import java.io.File;
37+
import java.nio.ByteBuffer;
38+
import java.util.ArrayList;
39+
import java.util.Collections;
40+
import java.util.Comparator;
41+
import java.util.List;
42+
43+
import jnr.ffi.Pointer;
44+
import jnr.ffi.byref.PointerByReference;
45+
import org.lmdbjava.Library.MDB_envinfo;
46+
import org.lmdbjava.Library.MDB_stat;
47+
4648
/**
4749
* LMDB environment.
4850
*

‎src/main/java/org/lmdbjava/KeyRangeType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
package org.lmdbjava;
2222

23-
import java.util.Comparator;
2423
import static java.util.Objects.requireNonNull;
2524
import static org.lmdbjava.KeyRangeType.CursorOp.FIRST;
2625
import static org.lmdbjava.KeyRangeType.CursorOp.GET_START_KEY;
@@ -32,6 +31,8 @@
3231
import static org.lmdbjava.KeyRangeType.IteratorOp.RELEASE;
3332
import static org.lmdbjava.KeyRangeType.IteratorOp.TERMINATE;
3433

34+
import java.util.Comparator;
35+
3536
/**
3637
* Key range type.
3738
*

0 commit comments

Comments
 (0)