From db4cafc4139346184d0a57af36e5a2f10e6abb4f Mon Sep 17 00:00:00 2001
From: Jo Rabin <jo@linguafranca.org>
Date: Tue, 24 Sep 2024 11:50:07 +0100
Subject: [PATCH] Refactor package names

---
 .../main/java/org/linguafranca/{pwdb => all}/IgnoreMe.java    | 2 +-
 .../java/org/linguafranca/{pwdb => all}/package-info.java     | 4 ++--
 .../main/java/org/linguafranca/pwdb/kdbx/OpenDbExample.java   | 1 +
 .../src/main/java/org/linguafranca/pwdb/kdbx/QuickStart.java  | 1 +
 example/src/main/java/org/linguafranca/pwdb/kdbx/Util.java    | 1 +
 .../java/org/linguafranca/pwdb/kdbx/SimpleQuickStartTest.java | 1 +
 .../org/linguafranca/pwdb/kdbx/validation/Issue27Test.java    | 2 +-
 .../org/linguafranca/pwdb/kdbx/validation/Issue33Test.java    | 2 +-
 .../org/linguafranca/pwdb/kdbx/validation/Issue38Test.java    | 2 +-
 .../linguafranca/pwdb/kdbx/{ => jackson}/KdbxDatabase.java    | 4 ++--
 .../org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxEntry.java   | 2 +-
 .../org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxGroup.java   | 2 +-
 .../org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxHistory.java | 2 +-
 .../org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxIcon.java    | 2 +-
 .../pwdb/kdbx/{ => jackson}/KdbxSerializableDatabase.java     | 2 +-
 .../linguafranca/pwdb/kdbx/jackson/model/EntryClasses.java    | 2 +-
 .../org/linguafranca/pwdb/kdbx/jackson/model/KeePassFile.java | 2 +-
 .../org/linguafranca/pwdb/JacksonBinaryPropertyV3Test.java    | 2 +-
 .../org/linguafranca/pwdb/JacksonBinaryPropertyV4Test.java    | 2 +-
 .../java/org/linguafranca/pwdb/JacksonPropertyValueTest.java  | 2 +-
 .../java/org/linguafranca/pwdb/JacksonRecycleBinTest.java     | 2 +-
 .../java/org/linguafranca/pwdb/JacksonSaveAndReloadTest.java  | 2 +-
 .../test/java/org/linguafranca/pwdb/KdbxDatabaseLoadTest.java | 2 +-
 .../java/org/linguafranca/pwdb/KdbxDatabaseLoaderTest.java    | 2 +-
 .../src/test/java/org/linguafranca/pwdb/KdbxDatabaseTest.java | 2 +-
 25 files changed, 27 insertions(+), 23 deletions(-)
 rename all/src/main/java/org/linguafranca/{pwdb => all}/IgnoreMe.java (73%)
 rename all/src/main/java/org/linguafranca/{pwdb => all}/package-info.java (68%)
 rename kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxDatabase.java (97%)
 rename kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxEntry.java (99%)
 rename kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxGroup.java (99%)
 rename kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxHistory.java (96%)
 rename kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxIcon.java (96%)
 rename kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/{ => jackson}/KdbxSerializableDatabase.java (99%)

diff --git a/all/src/main/java/org/linguafranca/pwdb/IgnoreMe.java b/all/src/main/java/org/linguafranca/all/IgnoreMe.java
similarity index 73%
rename from all/src/main/java/org/linguafranca/pwdb/IgnoreMe.java
rename to all/src/main/java/org/linguafranca/all/IgnoreMe.java
index 0f2521c5..463fbdbe 100644
--- a/all/src/main/java/org/linguafranca/pwdb/IgnoreMe.java
+++ b/all/src/main/java/org/linguafranca/all/IgnoreMe.java
@@ -1,4 +1,4 @@
-package org.linguafranca.pwdb;
+package org.linguafranca.all;
 
 /**
  * This is here for Javadoc generation purposes only
diff --git a/all/src/main/java/org/linguafranca/pwdb/package-info.java b/all/src/main/java/org/linguafranca/all/package-info.java
similarity index 68%
rename from all/src/main/java/org/linguafranca/pwdb/package-info.java
rename to all/src/main/java/org/linguafranca/all/package-info.java
index a544df96..83bf3905 100644
--- a/all/src/main/java/org/linguafranca/pwdb/package-info.java
+++ b/all/src/main/java/org/linguafranca/all/package-info.java
@@ -1,9 +1,9 @@
 /**
- * This module provides a simple import of the database implementations of KeePass, "all" in the diagram below.
+ * This package/module provides a simple import of the database implementations of KeePass, "all" in the diagram below.
  * <p>
  *     <img src="https://github.com/jorabin/KeePassJava2/blob/master/ModuleStructure.svg">
  * <p>
  * @see <a href="https://github.com/jorabin/KeePassJava2/blob/master/readme.md#module-structure">Module Structure</a>
  * in the readme at GitHub for a discussion of the project modules and links to JavaDocs.
  */
-package org.linguafranca.pwdb;
\ No newline at end of file
+package org.linguafranca.all;
\ No newline at end of file
diff --git a/example/src/main/java/org/linguafranca/pwdb/kdbx/OpenDbExample.java b/example/src/main/java/org/linguafranca/pwdb/kdbx/OpenDbExample.java
index f95d2074..f05c9a4a 100644
--- a/example/src/main/java/org/linguafranca/pwdb/kdbx/OpenDbExample.java
+++ b/example/src/main/java/org/linguafranca/pwdb/kdbx/OpenDbExample.java
@@ -3,6 +3,7 @@
 import org.linguafranca.pwdb.Database;
 import org.linguafranca.pwdb.Visitor;
 import org.linguafranca.pwdb.format.KdbxCreds;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/example/src/main/java/org/linguafranca/pwdb/kdbx/QuickStart.java b/example/src/main/java/org/linguafranca/pwdb/kdbx/QuickStart.java
index 0ab4a0c6..338080e6 100644
--- a/example/src/main/java/org/linguafranca/pwdb/kdbx/QuickStart.java
+++ b/example/src/main/java/org/linguafranca/pwdb/kdbx/QuickStart.java
@@ -23,6 +23,7 @@
 import org.linguafranca.pwdb.format.KdbxStreamFormat;
 import org.linguafranca.pwdb.kdb.KdbCredentials;
 import org.linguafranca.pwdb.kdb.KdbDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 import org.linguafranca.pwdb.security.Encryption;
 
 import java.io.*;
diff --git a/example/src/main/java/org/linguafranca/pwdb/kdbx/Util.java b/example/src/main/java/org/linguafranca/pwdb/kdbx/Util.java
index 62f34d1a..f6639086 100644
--- a/example/src/main/java/org/linguafranca/pwdb/kdbx/Util.java
+++ b/example/src/main/java/org/linguafranca/pwdb/kdbx/Util.java
@@ -7,6 +7,7 @@
 import org.linguafranca.pwdb.format.KdbxCreds;
 import org.linguafranca.pwdb.format.KdbxHeader;
 import org.linguafranca.pwdb.format.KdbxSerializer;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
diff --git a/example/src/test/java/org/linguafranca/pwdb/kdbx/SimpleQuickStartTest.java b/example/src/test/java/org/linguafranca/pwdb/kdbx/SimpleQuickStartTest.java
index a223c71c..be4001de 100644
--- a/example/src/test/java/org/linguafranca/pwdb/kdbx/SimpleQuickStartTest.java
+++ b/example/src/test/java/org/linguafranca/pwdb/kdbx/SimpleQuickStartTest.java
@@ -20,6 +20,7 @@
 import org.linguafranca.pwdb.Credentials;
 import org.linguafranca.pwdb.format.KdbxCreds;
 import org.linguafranca.pwdb.format.KdbxStreamFormat;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 import org.linguafranca.pwdb.security.Encryption;
 
 import java.io.IOException;
diff --git a/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue27Test.java b/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue27Test.java
index a385dc88..9c0f7b01 100644
--- a/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue27Test.java
+++ b/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue27Test.java
@@ -8,7 +8,7 @@
 import org.linguafranca.pwdb.format.KdbxCreds;
 import org.linguafranca.pwdb.format.KdbxHeader;
 import org.linguafranca.pwdb.format.KdbxSerializer;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue33Test.java b/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue33Test.java
index b732aef4..d5f65d65 100644
--- a/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue33Test.java
+++ b/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue33Test.java
@@ -9,7 +9,7 @@
 import org.linguafranca.pwdb.format.Helpers;
 import org.linguafranca.pwdb.format.KdbxCreds;
 import org.linguafranca.pwdb.kdbx.Util;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import java.io.*;
 import java.nio.file.Files;
diff --git a/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue38Test.java b/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue38Test.java
index 777f1607..339c7b5e 100644
--- a/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue38Test.java
+++ b/example/src/test/java/org/linguafranca/pwdb/kdbx/validation/Issue38Test.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.linguafranca.pwdb.Entry;
 import org.linguafranca.pwdb.format.KdbxCreds;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxDatabase.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxDatabase.java
similarity index 97%
rename from kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxDatabase.java
rename to kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxDatabase.java
index 476ce8a1..475b43f1 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxDatabase.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxDatabase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.linguafranca.pwdb.kdbx;
+package org.linguafranca.pwdb.kdbx.jackson;
 
 import org.linguafranca.pwdb.Credentials;
 import org.linguafranca.pwdb.StreamConfiguration;
@@ -32,7 +32,7 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import static org.linguafranca.pwdb.kdbx.KdbxSerializableDatabase.createEmptyDatabase;
+import static org.linguafranca.pwdb.kdbx.jackson.KdbxSerializableDatabase.createEmptyDatabase;
 
 public class KdbxDatabase extends ProtectedDatabase {
 
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxEntry.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxEntry.java
similarity index 99%
rename from kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxEntry.java
rename to kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxEntry.java
index d870d049..c135b631 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxEntry.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxEntry.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.linguafranca.pwdb.kdbx;
+package org.linguafranca.pwdb.kdbx.jackson;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxGroup.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxGroup.java
similarity index 99%
rename from kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxGroup.java
rename to kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxGroup.java
index 5069826d..2ee79095 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxGroup.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxGroup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.linguafranca.pwdb.kdbx;
+package org.linguafranca.pwdb.kdbx.jackson;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxHistory.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxHistory.java
similarity index 96%
rename from kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxHistory.java
rename to kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxHistory.java
index a35d78e4..fd2fd91b 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxHistory.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxHistory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.linguafranca.pwdb.kdbx;
+package org.linguafranca.pwdb.kdbx.jackson;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxIcon.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxIcon.java
similarity index 96%
rename from kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxIcon.java
rename to kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxIcon.java
index cf196f1c..c1f34a74 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxIcon.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.linguafranca.pwdb.kdbx;
+package org.linguafranca.pwdb.kdbx.jackson;
 
 import org.linguafranca.pwdb.Icon;
 
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxSerializableDatabase.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxSerializableDatabase.java
similarity index 99%
rename from kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxSerializableDatabase.java
rename to kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxSerializableDatabase.java
index b2eb6376..2faf44a0 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/KdbxSerializableDatabase.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/KdbxSerializableDatabase.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.linguafranca.pwdb.kdbx;
+package org.linguafranca.pwdb.kdbx.jackson;
 
 import com.ctc.wstx.api.WstxInputProperties;
 import com.ctc.wstx.api.WstxOutputProperties;
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/EntryClasses.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/EntryClasses.java
index 580afc70..309cc814 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/EntryClasses.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/EntryClasses.java
@@ -20,7 +20,7 @@
 import java.util.List;
 
 import org.linguafranca.pwdb.PropertyValue;
-import org.linguafranca.pwdb.kdbx.KdbxEntry;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxEntry;
 import org.linguafranca.pwdb.kdbx.jackson.converter.BooleanToStringConverter;
 import org.linguafranca.pwdb.kdbx.jackson.converter.StringToBooleanConverter;
 
diff --git a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/KeePassFile.java b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/KeePassFile.java
index 6ce1b750..4f7558b8 100644
--- a/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/KeePassFile.java
+++ b/kdbx-database/src/main/java/org/linguafranca/pwdb/kdbx/jackson/model/KeePassFile.java
@@ -22,7 +22,7 @@
 import java.util.UUID;
 
 import org.linguafranca.pwdb.Entry;
-import org.linguafranca.pwdb.kdbx.KdbxGroup;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxGroup;
 import org.linguafranca.pwdb.kdbx.jackson.converter.Base64ToByteConverter;
 import org.linguafranca.pwdb.kdbx.jackson.converter.Base64ToUUIDConverter;
 import org.linguafranca.pwdb.kdbx.jackson.converter.BooleanToStringConverter;
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV3Test.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV3Test.java
index 3ad55d1d..2add540b 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV3Test.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV3Test.java
@@ -22,7 +22,7 @@
 
 import org.linguafranca.pwdb.checks.BinaryPropertyChecks;
 import org.linguafranca.pwdb.format.KdbxCreds;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 public class JacksonBinaryPropertyV3Test extends BinaryPropertyChecks {
 
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV4Test.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV4Test.java
index f738dd41..794ed2a3 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV4Test.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonBinaryPropertyV4Test.java
@@ -21,7 +21,7 @@
 
 import org.linguafranca.pwdb.checks.BinaryPropertyChecks;
 import org.linguafranca.pwdb.format.KdbxCreds;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 public class JacksonBinaryPropertyV4Test extends BinaryPropertyChecks{
 
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonPropertyValueTest.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonPropertyValueTest.java
index 0cdb915a..c605d1b9 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonPropertyValueTest.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonPropertyValueTest.java
@@ -17,7 +17,7 @@
 
 import org.linguafranca.pwdb.checks.PropertyValueChecks;
 import org.linguafranca.pwdb.format.KdbxCreds;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonRecycleBinTest.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonRecycleBinTest.java
index 5a0123f1..71ed55e1 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonRecycleBinTest.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonRecycleBinTest.java
@@ -16,7 +16,7 @@
 package org.linguafranca.pwdb;
 
 import org.linguafranca.pwdb.checks.RecycleBinChecks;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 public class JacksonRecycleBinTest extends RecycleBinChecks {
 
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonSaveAndReloadTest.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonSaveAndReloadTest.java
index 5a7688d3..5f9eea33 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonSaveAndReloadTest.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/JacksonSaveAndReloadTest.java
@@ -25,7 +25,7 @@
 import org.linguafranca.pwdb.format.KdbxCreds;
 import org.linguafranca.pwdb.format.KdbxHeader;
 
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 
 public class JacksonSaveAndReloadTest extends SaveAndReloadChecks{
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoadTest.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoadTest.java
index 7cf9e5a8..91217cc6 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoadTest.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoadTest.java
@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 import org.linguafranca.pwdb.format.KdbxCreds;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 import static org.linguafranca.util.TestUtil.getTestPrintStream;
 
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoaderTest.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoaderTest.java
index 4b0d323b..599b29a4 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoaderTest.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseLoaderTest.java
@@ -19,7 +19,7 @@
 
 import org.linguafranca.pwdb.checks.DatabaseLoaderChecks;
 import org.linguafranca.pwdb.format.KdbxCreds;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 public class KdbxDatabaseLoaderTest extends DatabaseLoaderChecks{
     
diff --git a/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseTest.java b/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseTest.java
index 40c2f5e4..2ca89590 100644
--- a/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseTest.java
+++ b/kdbx-database/src/test/java/org/linguafranca/pwdb/KdbxDatabaseTest.java
@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 import org.linguafranca.pwdb.checks.BasicDatabaseChecks;
-import org.linguafranca.pwdb.kdbx.KdbxDatabase;
+import org.linguafranca.pwdb.kdbx.jackson.KdbxDatabase;
 
 public class KdbxDatabaseTest extends BasicDatabaseChecks {