Consolidate into a single package

bp-alex · bp-alex · commit c51456cafc76 · 2016-06-07T14:35:12.000+10:00
diff --git a/src/main/java/org/lmdbjava/AlreadyCommittedException.java b/src/main/java/org/lmdbjava/AlreadyCommittedException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Transaction has already been committed.
diff --git a/src/main/java/org/lmdbjava/AlreadyOpenException.java b/src/main/java/org/lmdbjava/AlreadyOpenException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Object has already been opened and the operation is therefore prohibited.
diff --git a/src/main/java/org/lmdbjava/BadDatabaseIdException.java b/src/main/java/org/lmdbjava/BadDatabaseIdException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * The specified DBI was changed unexpectedly.
diff --git a/src/main/java/org/lmdbjava/BadReaderLockTableSlotException.java b/src/main/java/org/lmdbjava/BadReaderLockTableSlotException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Invalid reuse of reader locktable slot.
diff --git a/src/main/java/org/lmdbjava/BadTransactionException.java b/src/main/java/org/lmdbjava/BadTransactionException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Transaction must abort, has a child, or is invalid.
diff --git a/src/main/java/org/lmdbjava/BadValueSizeException.java b/src/main/java/org/lmdbjava/BadValueSizeException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Unsupported size of key/DB name/data, or wrong DUPFIXED size.
diff --git a/src/main/java/org/lmdbjava/ConstantDerviedException.java b/src/main/java/org/lmdbjava/ConstantDerviedException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Exception raised from a system constant table lookup.
diff --git a/src/main/java/org/lmdbjava/CopyFlags.java b/src/main/java/org/lmdbjava/CopyFlags.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Flags for use when performing a "put".
diff --git a/src/main/java/org/lmdbjava/CorruptedException.java b/src/main/java/org/lmdbjava/CorruptedException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Located page was wrong type.
diff --git a/src/main/java/org/lmdbjava/Cursor.java b/src/main/java/org/lmdbjava/Cursor.java
@@ -1,17 +1,16 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import jnr.ffi.Pointer;
-import org.lmdbjava.core.lli.Library.MDB_val;
-import org.lmdbjava.core.lli.exceptions.LmdbNativeException;
+import org.lmdbjava.Library.MDB_val;
 
 import java.nio.ByteBuffer;
 
 import static java.util.Objects.requireNonNull;
-import static org.lmdbjava.core.lli.Library.lib;
-import static org.lmdbjava.core.lli.Library.runtime;
-import static org.lmdbjava.core.lli.MemoryAccess.createVal;
-import static org.lmdbjava.core.lli.MemoryAccess.wrap;
-import static org.lmdbjava.core.lli.exceptions.ResultCodeMapper.checkRc;
+import static org.lmdbjava.Library.lib;
+import static org.lmdbjava.Library.runtime;
+import static org.lmdbjava.MemoryAccess.createVal;
+import static org.lmdbjava.MemoryAccess.wrap;
+import static org.lmdbjava.ResultCodeMapper.checkRc;
 
 
 public class Cursor {
diff --git a/src/main/java/org/lmdbjava/CursorFullException.java b/src/main/java/org/lmdbjava/CursorFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Cursor stack too deep - internal error.
diff --git a/src/main/java/org/lmdbjava/CursorOp.java b/src/main/java/org/lmdbjava/CursorOp.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Flags for use when performing a cursor operation.
diff --git a/src/main/java/org/lmdbjava/Database.java b/src/main/java/org/lmdbjava/Database.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import java.nio.ByteBuffer;
 import java.util.Set;
@@ -7,16 +7,15 @@
 
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 import static java.util.Objects.requireNonNull;
-import static org.lmdbjava.core.lli.Library.lib;
+import static org.lmdbjava.Library.lib;
 
 import jnr.ffi.byref.PointerByReference;
-import org.lmdbjava.core.lli.Library.MDB_val;
-import org.lmdbjava.core.lli.exceptions.LmdbNativeException;
+import org.lmdbjava.Library.MDB_val;
 
-import static org.lmdbjava.core.lli.Library.runtime;
-import static org.lmdbjava.core.lli.MemoryAccess.createVal;
-import static org.lmdbjava.core.lli.MemoryAccess.wrap;
-import static org.lmdbjava.core.lli.exceptions.ResultCodeMapper.checkRc;
+import static org.lmdbjava.Library.runtime;
+import static org.lmdbjava.MemoryAccess.createVal;
+import static org.lmdbjava.MemoryAccess.wrap;
+import static org.lmdbjava.ResultCodeMapper.checkRc;
 
 /**
  * LMDB Database.
diff --git a/src/main/java/org/lmdbjava/DatabaseFlags.java b/src/main/java/org/lmdbjava/DatabaseFlags.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Flags for use when opening a {@link Database}.
diff --git a/src/main/java/org/lmdbjava/DatabasesFullException.java b/src/main/java/org/lmdbjava/DatabasesFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Environment maxdbs reached.
diff --git a/src/main/java/org/lmdbjava/Env.java b/src/main/java/org/lmdbjava/Env.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import java.io.File;
 import java.util.HashSet;
@@ -7,10 +7,9 @@
 import jnr.ffi.byref.PointerByReference;
 
 import static java.util.Objects.requireNonNull;
-import static org.lmdbjava.core.lli.Library.lib;
-import static org.lmdbjava.core.lli.TransactionFlags.MDB_RDONLY;
-import org.lmdbjava.core.lli.exceptions.LmdbNativeException;
-import static org.lmdbjava.core.lli.exceptions.ResultCodeMapper.checkRc;
+import static org.lmdbjava.Library.lib;
+import static org.lmdbjava.TransactionFlags.MDB_RDONLY;
+import static org.lmdbjava.ResultCodeMapper.checkRc;
 
 /**
  * LMDB environment.
diff --git a/src/main/java/org/lmdbjava/EnvFlags.java b/src/main/java/org/lmdbjava/EnvFlags.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Flags for use when opening the {@link Env}.
diff --git a/src/main/java/org/lmdbjava/IncompatibleException.java b/src/main/java/org/lmdbjava/IncompatibleException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Operation and DB incompatible, or DB type changed.
diff --git a/src/main/java/org/lmdbjava/InvalidException.java b/src/main/java/org/lmdbjava/InvalidException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * File is not a valid LMDB file.
diff --git a/src/main/java/org/lmdbjava/KeyExistsException.java b/src/main/java/org/lmdbjava/KeyExistsException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Key/data pair already exists.
diff --git a/src/main/java/org/lmdbjava/Library.java b/src/main/java/org/lmdbjava/Library.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import static jnr.ffi.LibraryLoader.create;
 import jnr.ffi.Pointer;
diff --git a/src/main/java/org/lmdbjava/LmdbException.java b/src/main/java/org/lmdbjava/LmdbException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Superclass for all LmdbJava custom exceptions.
diff --git a/src/main/java/org/lmdbjava/LmdbNativeException.java b/src/main/java/org/lmdbjava/LmdbNativeException.java
@@ -1,7 +1,6 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 import static java.lang.String.format;
-import org.lmdbjava.core.lli.LmdbException;
 
 /**
  * Superclass for all exceptions that originate from a native C call.
diff --git a/src/main/java/org/lmdbjava/MapFullException.java b/src/main/java/org/lmdbjava/MapFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Environment mapsize reached.
diff --git a/src/main/java/org/lmdbjava/MapResizedException.java b/src/main/java/org/lmdbjava/MapResizedException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Database contents grew beyond environment mapsize.
diff --git a/src/main/java/org/lmdbjava/MaskedFlag.java b/src/main/java/org/lmdbjava/MaskedFlag.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import java.util.Set;
 
diff --git a/src/main/java/org/lmdbjava/MemoryAccess.java b/src/main/java/org/lmdbjava/MemoryAccess.java
@@ -2,14 +2,14 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: http://lwjgl.org/license.php
  */
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import jnr.ffi.provider.jffi.ByteBufferMemoryIO;
-import org.lmdbjava.core.lli.Library.MDB_val;
+import org.lmdbjava.Library.MDB_val;
 
 import java.nio.*;
 
-import static org.lmdbjava.core.lli.Library.runtime;
+import static org.lmdbjava.Library.runtime;
 
 abstract class MemoryAccess {
 
diff --git a/src/main/java/org/lmdbjava/NotFoundException.java b/src/main/java/org/lmdbjava/NotFoundException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Key/data pair not found (EOF).
diff --git a/src/main/java/org/lmdbjava/NotOpenException.java b/src/main/java/org/lmdbjava/NotOpenException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Object has not been opened.
diff --git a/src/main/java/org/lmdbjava/PageFullException.java b/src/main/java/org/lmdbjava/PageFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Page has not enough space - internal error.
diff --git a/src/main/java/org/lmdbjava/PageNotFoundException.java b/src/main/java/org/lmdbjava/PageNotFoundException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Requested page not found - this usually indicates corruption.
diff --git a/src/main/java/org/lmdbjava/PanicException.java b/src/main/java/org/lmdbjava/PanicException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Update of meta page failed or environment had fatal error.
diff --git a/src/main/java/org/lmdbjava/PutFlags.java b/src/main/java/org/lmdbjava/PutFlags.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Flags for use when performing a "put".
diff --git a/src/main/java/org/lmdbjava/ReadersFullException.java b/src/main/java/org/lmdbjava/ReadersFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Environment maxreaders reached.
diff --git a/src/main/java/org/lmdbjava/ResultCodeMapper.java b/src/main/java/org/lmdbjava/ResultCodeMapper.java
@@ -1,28 +1,28 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 import jnr.constants.Constant;
 import jnr.constants.ConstantSet;
 import static jnr.constants.ConstantSet.getConstantSet;
-import static org.lmdbjava.core.lli.exceptions.BadDatabaseIdException.MDB_BAD_DBI;
-import static org.lmdbjava.core.lli.exceptions.BadReaderLockTableSlotException.MDB_BAD_RSLOT;
-import static org.lmdbjava.core.lli.exceptions.BadTransactionException.MDB_BAD_TXN;
-import static org.lmdbjava.core.lli.exceptions.BadValueSizeException.MDB_BAD_VALSIZE;
-import static org.lmdbjava.core.lli.exceptions.CorruptedException.MDB_CORRUPTED;
-import static org.lmdbjava.core.lli.exceptions.CursorFullException.MDB_CURSOR_FULL;
-import static org.lmdbjava.core.lli.exceptions.DatabasesFullException.MDB_DBS_FULL;
-import static org.lmdbjava.core.lli.exceptions.IncompatibleException.MDB_INCOMPATIBLE;
-import static org.lmdbjava.core.lli.exceptions.InvalidException.MDB_INVALID;
-import static org.lmdbjava.core.lli.exceptions.KeyExistsException.MDB_KEYEXIST;
-import static org.lmdbjava.core.lli.exceptions.MapFullException.MDB_MAP_FULL;
-import static org.lmdbjava.core.lli.exceptions.MapResizedException.MDB_MAP_RESIZED;
-import static org.lmdbjava.core.lli.exceptions.NotFoundException.MDB_NOTFOUND;
-import static org.lmdbjava.core.lli.exceptions.PageFullException.MDB_PAGE_FULL;
-import static org.lmdbjava.core.lli.exceptions.PageNotFoundException.MDB_PAGE_NOTFOUND;
-import static org.lmdbjava.core.lli.exceptions.PanicException.MDB_PANIC;
-import static org.lmdbjava.core.lli.exceptions.ReadersFullException.MDB_READERS_FULL;
-import static org.lmdbjava.core.lli.exceptions.TlsFullException.MDB_TLS_FULL;
-import static org.lmdbjava.core.lli.exceptions.TransactionFullException.MDB_TXN_FULL;
-import static org.lmdbjava.core.lli.exceptions.VersionMismatchException.MDB_VERSION_MISMATCH;
+import static org.lmdbjava.BadDatabaseIdException.MDB_BAD_DBI;
+import static org.lmdbjava.BadReaderLockTableSlotException.MDB_BAD_RSLOT;
+import static org.lmdbjava.BadTransactionException.MDB_BAD_TXN;
+import static org.lmdbjava.BadValueSizeException.MDB_BAD_VALSIZE;
+import static org.lmdbjava.CorruptedException.MDB_CORRUPTED;
+import static org.lmdbjava.CursorFullException.MDB_CURSOR_FULL;
+import static org.lmdbjava.DatabasesFullException.MDB_DBS_FULL;
+import static org.lmdbjava.IncompatibleException.MDB_INCOMPATIBLE;
+import static org.lmdbjava.InvalidException.MDB_INVALID;
+import static org.lmdbjava.KeyExistsException.MDB_KEYEXIST;
+import static org.lmdbjava.MapFullException.MDB_MAP_FULL;
+import static org.lmdbjava.MapResizedException.MDB_MAP_RESIZED;
+import static org.lmdbjava.NotFoundException.MDB_NOTFOUND;
+import static org.lmdbjava.PageFullException.MDB_PAGE_FULL;
+import static org.lmdbjava.PageNotFoundException.MDB_PAGE_NOTFOUND;
+import static org.lmdbjava.PanicException.MDB_PANIC;
+import static org.lmdbjava.ReadersFullException.MDB_READERS_FULL;
+import static org.lmdbjava.TlsFullException.MDB_TLS_FULL;
+import static org.lmdbjava.TransactionFullException.MDB_TXN_FULL;
+import static org.lmdbjava.VersionMismatchException.MDB_VERSION_MISMATCH;
 
 /**
  * Maps a LMDB C result code to the equivalent Java exception.
@@ -45,7 +45,7 @@ public final class ResultCodeMapper {
    * Checks the result code and raises an exception is not {@link #MDB_SUCCESS}.
    *
    * @param rc the LMDB result code
-   * @throws org.lmdbjava.core.lli.exceptions.LmdbNativeException
+   * @throws org.lmdbjava.LmdbNativeException
    */
   public static void checkRc(final int rc) throws LmdbNativeException {
     if (rc == MDB_SUCCESS) {
diff --git a/src/main/java/org/lmdbjava/TlsFullException.java b/src/main/java/org/lmdbjava/TlsFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Too many TLS keys in use - Windows only.
diff --git a/src/main/java/org/lmdbjava/Transaction.java b/src/main/java/org/lmdbjava/Transaction.java
@@ -1,16 +1,15 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
 import static jnr.ffi.Memory.allocateDirect;
 import static jnr.ffi.NativeType.ADDRESS;
 import jnr.ffi.Pointer;
-import static org.lmdbjava.core.lli.Library.lib;
-import static org.lmdbjava.core.lli.Library.runtime;
-import static org.lmdbjava.core.lli.TransactionFlags.MDB_RDONLY;
-import org.lmdbjava.core.lli.exceptions.LmdbNativeException;
-import static org.lmdbjava.core.lli.exceptions.ResultCodeMapper.checkRc;
+import static org.lmdbjava.Library.lib;
+import static org.lmdbjava.Library.runtime;
+import static org.lmdbjava.TransactionFlags.MDB_RDONLY;
+import static org.lmdbjava.ResultCodeMapper.checkRc;
 
 /**
  * LMDB transaction.
diff --git a/src/main/java/org/lmdbjava/TransactionFlags.java b/src/main/java/org/lmdbjava/TransactionFlags.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Flags for use when creating a {@link Transaction}.
diff --git a/src/main/java/org/lmdbjava/TransactionFullException.java b/src/main/java/org/lmdbjava/TransactionFullException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Transaction has too many dirty pages.
diff --git a/src/main/java/org/lmdbjava/Utils.java b/src/main/java/org/lmdbjava/Utils.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
 
 /**
  * Utility methods used internally by this package.
diff --git a/src/main/java/org/lmdbjava/VersionMismatchException.java b/src/main/java/org/lmdbjava/VersionMismatchException.java
@@ -1,4 +1,4 @@
-package org.lmdbjava.core.lli.exceptions;
+package org.lmdbjava;
 
 /**
  * Environment version mismatch.
diff --git a/src/main/java/org/lmdbjava/core/lli/exceptions/package-info.java b/src/main/java/org/lmdbjava/core/lli/exceptions/package-info.java
diff --git a/src/main/java/org/lmdbjava/package-info.java b/src/main/java/org/lmdbjava/package-info.java
@@ -22,4 +22,4 @@
  * <li>Any operation that uses a cursor</li>
  * </ul>
  */
-package org.lmdbjava.core.lli;
+package org.lmdbjava;
diff --git a/src/test/java/org/lmdbjava/CursorTest.java b/src/test/java/org/lmdbjava/CursorTest.java
diff --git a/src/test/java/org/lmdbjava/DatabaseTest.java b/src/test/java/org/lmdbjava/DatabaseTest.java
diff --git a/src/test/java/org/lmdbjava/EnvTest.java b/src/test/java/org/lmdbjava/EnvTest.java
diff --git a/src/test/java/org/lmdbjava/MaskedFlagTest.java b/src/test/java/org/lmdbjava/MaskedFlagTest.java
diff --git a/src/test/java/org/lmdbjava/ResultCodeMapperTest.java b/src/test/java/org/lmdbjava/ResultCodeMapperTest.java
diff --git a/src/test/java/org/lmdbjava/TestUtils.java b/src/test/java/org/lmdbjava/TestUtils.java
diff --git a/src/test/java/org/lmdbjava/TransactionTest.java b/src/test/java/org/lmdbjava/TransactionTest.java
diff --git a/src/test/java/org/lmdbjava/UtilsTest.java b/src/test/java/org/lmdbjava/UtilsTest.java
diff --git a/src/test/java/org/lmdbjava/core/lli/UtilsTest.java b/src/test/java/org/lmdbjava/core/lli/UtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.lmdbjava.core.lli;`
	`1`	`+package org.lmdbjava;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Transaction has already been committed.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.lmdbjava.core.lli.exceptions;`
	`1`	`+package org.lmdbjava;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* The specified DBI was changed unexpectedly.`