From 4d5075c9d1df4b7fb80aa3c38b002598de6b5cd7 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 7 Mar 2019 11:32:45 +0100 Subject: [PATCH] Renamed the packages --- .../org/warp/{cowdb => jcwdb}/BlockInfo.java | 2 +- .../warp/{cowdb => jcwdb}/EnhancedObject.java | 15 +++-- .../EnhancedObjectUpgrader.java | 6 +- .../jcwdb/{ann => annotations}/DBClass.java | 2 +- .../{ann => annotations}/DBDataType.java | 2 +- .../jcwdb/{ann => annotations}/DBField.java | 2 +- .../DBPrimitiveField.java | 2 +- .../{ann => annotations}/DBPrimitiveType.java | 2 +- .../DBPropertyGetter.java | 2 +- .../DBPropertySetter.java | 2 +- .../{cowdb => jcwdb/database}/Database.java | 5 +- .../database/DatabaseBlocksIO.java | 8 +-- .../database/DatabaseBlocksMetadata.java | 5 +- .../database/DatabaseBlocksMetadataCache.java | 10 +-- .../DatabaseBlocksMetadataCacheFlusher.java | 4 +- .../database/DatabaseDataInitializer.java | 7 +- .../DatabaseEnhancedObjectUpgrader.java | 8 +-- .../database/DatabaseFileIO.java | 5 +- .../database/DatabaseObjectsIO.java | 9 +-- .../database/DatabaseReferencesIO.java | 6 +- .../database/DatabaseReferencesMetadata.java | 12 +--- .../DatabaseReferencesMetadataCache.java | 4 +- ...atabaseReferencesMetadataCacheFlusher.java | 2 +- .../database/EnhancedObjectFullInfo.java | 6 +- .../{cowdb => jcwdb/database}/IBlocksIO.java | 2 +- .../database}/IBlocksMetadata.java | 4 +- .../database}/IDataInitializer.java | 4 +- .../{cowdb => jcwdb/database}/IDatabase.java | 2 +- .../database}/IDatabaseTools.java | 5 +- .../{cowdb => jcwdb/database}/IFileIO.java | 2 +- .../{cowdb => jcwdb/database}/IObjectsIO.java | 5 +- .../database}/IReferencesIO.java | 2 +- .../database}/IReferencesMetadata.java | 2 +- .../database/Long2LongConsumer.java | 2 +- .../ConsumerWithIO.java | 2 +- .../functionalinterfaces}/FunctionWithIO.java | 2 +- .../RunnableWithIO.java | 2 +- .../SupplierWithIO.java | 2 +- .../lists/EnhancedObjectJCWDBList.java} | 17 +++-- .../lists/JCWDBList.java} | 15 ++--- .../lists/ObjectJCWDBList.java} | 15 ++--- src/test/java/org/warp/jcwdb/tests/Clean.java | 12 ++-- .../warp/jcwdb/tests/EnhancedClassUpdate.java | 10 +-- .../jcwdb/tests/MultipleEnhancedObjects.java | 13 ++-- .../java/org/warp/jcwdb/tests/OldClass.java | 12 ++-- .../org/warp/jcwdb/tests/Performance.java | 65 ++++++++++--------- .../java/org/warp/jcwdb/tests/V2Class.java | 16 ++--- .../org/warp/jcwdb/utils/NSimplestClass.java | 8 +-- .../java/org/warp/jcwdb/utils/NTestUtils.java | 9 +-- 49 files changed, 165 insertions(+), 193 deletions(-) rename src/main/java/org/warp/{cowdb => jcwdb}/BlockInfo.java (97%) rename src/main/java/org/warp/{cowdb => jcwdb}/EnhancedObject.java (92%) rename src/main/java/org/warp/{cowdb => jcwdb}/EnhancedObjectUpgrader.java (92%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBClass.java (88%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBDataType.java (65%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBField.java (89%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBPrimitiveField.java (89%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBPrimitiveType.java (72%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBPropertyGetter.java (89%) rename src/main/java/org/warp/jcwdb/{ann => annotations}/DBPropertySetter.java (89%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/Database.java (97%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseBlocksIO.java (81%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseBlocksMetadata.java (95%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseBlocksMetadataCache.java (91%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseBlocksMetadataCacheFlusher.java (74%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseDataInitializer.java (97%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseEnhancedObjectUpgrader.java (91%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseFileIO.java (93%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseObjectsIO.java (99%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseReferencesIO.java (90%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseReferencesMetadata.java (86%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseReferencesMetadataCache.java (97%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/DatabaseReferencesMetadataCacheFlusher.java (85%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/EnhancedObjectFullInfo.java (93%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IBlocksIO.java (93%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IBlocksMetadata.java (93%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IDataInitializer.java (64%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IDatabase.java (82%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IDatabaseTools.java (65%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IFileIO.java (95%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IObjectsIO.java (93%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IReferencesIO.java (96%) rename src/main/java/org/warp/{cowdb => jcwdb/database}/IReferencesMetadata.java (95%) rename src/main/java/org/warp/{cowdb => jcwdb}/database/Long2LongConsumer.java (75%) rename src/main/java/org/warp/jcwdb/{ann => functionalinterfaces}/ConsumerWithIO.java (87%) rename src/main/java/org/warp/{cowdb => jcwdb/functionalinterfaces}/FunctionWithIO.java (98%) rename src/main/java/org/warp/jcwdb/{ann => functionalinterfaces}/RunnableWithIO.java (91%) rename src/main/java/org/warp/jcwdb/{ann => functionalinterfaces}/SupplierWithIO.java (73%) rename src/main/java/org/warp/{cowdb/lists/EnhancedObjectCowList.java => jcwdb/lists/EnhancedObjectJCWDBList.java} (61%) rename src/main/java/org/warp/{cowdb/lists/CowList.java => jcwdb/lists/JCWDBList.java} (84%) rename src/main/java/org/warp/{cowdb/lists/ObjectCowList.java => jcwdb/lists/ObjectJCWDBList.java} (64%) diff --git a/src/main/java/org/warp/cowdb/BlockInfo.java b/src/main/java/org/warp/jcwdb/BlockInfo.java similarity index 97% rename from src/main/java/org/warp/cowdb/BlockInfo.java rename to src/main/java/org/warp/jcwdb/BlockInfo.java index 02b301b..83bf04c 100644 --- a/src/main/java/org/warp/cowdb/BlockInfo.java +++ b/src/main/java/org/warp/jcwdb/BlockInfo.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb; import java.util.Objects; import java.util.StringJoiner; diff --git a/src/main/java/org/warp/cowdb/EnhancedObject.java b/src/main/java/org/warp/jcwdb/EnhancedObject.java similarity index 92% rename from src/main/java/org/warp/cowdb/EnhancedObject.java rename to src/main/java/org/warp/jcwdb/EnhancedObject.java index 6e0108f..f003f17 100644 --- a/src/main/java/org/warp/cowdb/EnhancedObject.java +++ b/src/main/java/org/warp/jcwdb/EnhancedObject.java @@ -1,13 +1,14 @@ -package org.warp.cowdb; +package org.warp.jcwdb; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.reflect.MethodUtils; -import org.warp.cowdb.database.EnhancedObjectFullInfo; -import org.warp.jcwdb.ann.DBClass; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBPrimitiveType; -import org.warp.jcwdb.ann.DBPropertyGetter; -import org.warp.jcwdb.ann.DBPropertySetter; +import org.warp.jcwdb.database.EnhancedObjectFullInfo; +import org.warp.jcwdb.annotations.DBClass; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBPrimitiveType; +import org.warp.jcwdb.annotations.DBPropertyGetter; +import org.warp.jcwdb.annotations.DBPropertySetter; +import org.warp.jcwdb.database.IDatabaseTools; import java.io.IOException; import java.lang.reflect.Field; diff --git a/src/main/java/org/warp/cowdb/EnhancedObjectUpgrader.java b/src/main/java/org/warp/jcwdb/EnhancedObjectUpgrader.java similarity index 92% rename from src/main/java/org/warp/cowdb/EnhancedObjectUpgrader.java rename to src/main/java/org/warp/jcwdb/EnhancedObjectUpgrader.java index ad9f2d4..588a6fb 100644 --- a/src/main/java/org/warp/cowdb/EnhancedObjectUpgrader.java +++ b/src/main/java/org/warp/jcwdb/EnhancedObjectUpgrader.java @@ -1,7 +1,7 @@ -package org.warp.cowdb; +package org.warp.jcwdb; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBPrimitiveType; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBPrimitiveType; import java.io.IOException; import java.util.function.Supplier; diff --git a/src/main/java/org/warp/jcwdb/ann/DBClass.java b/src/main/java/org/warp/jcwdb/annotations/DBClass.java similarity index 88% rename from src/main/java/org/warp/jcwdb/ann/DBClass.java rename to src/main/java/org/warp/jcwdb/annotations/DBClass.java index 6902ce0..7ddad3c 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBClass.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBClass.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/warp/jcwdb/ann/DBDataType.java b/src/main/java/org/warp/jcwdb/annotations/DBDataType.java similarity index 65% rename from src/main/java/org/warp/jcwdb/ann/DBDataType.java rename to src/main/java/org/warp/jcwdb/annotations/DBDataType.java index 76d39aa..3fca81d 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBDataType.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBDataType.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; public enum DBDataType { ENHANCED_OBJECT, diff --git a/src/main/java/org/warp/jcwdb/ann/DBField.java b/src/main/java/org/warp/jcwdb/annotations/DBField.java similarity index 89% rename from src/main/java/org/warp/jcwdb/ann/DBField.java rename to src/main/java/org/warp/jcwdb/annotations/DBField.java index 0b51e0d..aba5e55 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBField.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBField.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/warp/jcwdb/ann/DBPrimitiveField.java b/src/main/java/org/warp/jcwdb/annotations/DBPrimitiveField.java similarity index 89% rename from src/main/java/org/warp/jcwdb/ann/DBPrimitiveField.java rename to src/main/java/org/warp/jcwdb/annotations/DBPrimitiveField.java index d6dad86..c495342 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBPrimitiveField.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBPrimitiveField.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/warp/jcwdb/ann/DBPrimitiveType.java b/src/main/java/org/warp/jcwdb/annotations/DBPrimitiveType.java similarity index 72% rename from src/main/java/org/warp/jcwdb/ann/DBPrimitiveType.java rename to src/main/java/org/warp/jcwdb/annotations/DBPrimitiveType.java index 25e13de..368087b 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBPrimitiveType.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBPrimitiveType.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; public enum DBPrimitiveType { BOOLEAN, diff --git a/src/main/java/org/warp/jcwdb/ann/DBPropertyGetter.java b/src/main/java/org/warp/jcwdb/annotations/DBPropertyGetter.java similarity index 89% rename from src/main/java/org/warp/jcwdb/ann/DBPropertyGetter.java rename to src/main/java/org/warp/jcwdb/annotations/DBPropertyGetter.java index a628213..0096b2b 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBPropertyGetter.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBPropertyGetter.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/warp/jcwdb/ann/DBPropertySetter.java b/src/main/java/org/warp/jcwdb/annotations/DBPropertySetter.java similarity index 89% rename from src/main/java/org/warp/jcwdb/ann/DBPropertySetter.java rename to src/main/java/org/warp/jcwdb/annotations/DBPropertySetter.java index 713ada4..889cb11 100644 --- a/src/main/java/org/warp/jcwdb/ann/DBPropertySetter.java +++ b/src/main/java/org/warp/jcwdb/annotations/DBPropertySetter.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/warp/cowdb/Database.java b/src/main/java/org/warp/jcwdb/database/Database.java similarity index 97% rename from src/main/java/org/warp/cowdb/Database.java rename to src/main/java/org/warp/jcwdb/database/Database.java index eeba6c5..aef79d6 100644 --- a/src/main/java/org/warp/cowdb/Database.java +++ b/src/main/java/org/warp/jcwdb/database/Database.java @@ -1,6 +1,7 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; -import org.warp.cowdb.database.*; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.functionalinterfaces.FunctionWithIO; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseBlocksIO.java b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksIO.java similarity index 81% rename from src/main/java/org/warp/cowdb/database/DatabaseBlocksIO.java rename to src/main/java/org/warp/jcwdb/database/DatabaseBlocksIO.java index e6830ce..bfa16f5 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseBlocksIO.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksIO.java @@ -1,13 +1,11 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; -import org.warp.cowdb.BlockInfo; -import org.warp.cowdb.IBlocksIO; -import org.warp.cowdb.IBlocksMetadata; +import org.warp.jcwdb.BlockInfo; import java.io.IOException; import java.nio.ByteBuffer; -import static org.warp.cowdb.IBlocksMetadata.EMPTY_BLOCK_ID; +import static org.warp.jcwdb.database.IBlocksMetadata.EMPTY_BLOCK_ID; public class DatabaseBlocksIO implements IBlocksIO { diff --git a/src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadata.java b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadata.java similarity index 95% rename from src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadata.java rename to src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadata.java index 849e9e7..1212d0e 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadata.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadata.java @@ -1,8 +1,7 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; -import org.warp.cowdb.BlockInfo; -import org.warp.cowdb.IBlocksMetadata; +import org.warp.jcwdb.BlockInfo; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadataCache.java b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadataCache.java similarity index 91% rename from src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadataCache.java rename to src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadataCache.java index 257d272..e2c6737 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadataCache.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadataCache.java @@ -1,11 +1,9 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; -import it.unimi.dsi.fastutil.longs.Long2LongLinkedOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2LongMap; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; -import org.warp.cowdb.BlockInfo; +import org.warp.jcwdb.BlockInfo; import java.io.IOException; import java.util.LinkedList; @@ -13,8 +11,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static org.warp.cowdb.database.DatabaseBlocksMetadata.ERROR_BLOCK_INFO; - public class DatabaseBlocksMetadataCache { private static final int GOOD_CACHE_SIZE = 70000; @@ -33,7 +29,7 @@ public class DatabaseBlocksMetadataCache { public BlockInfo get(long block) throws IOException { if (closed) throw new IOException("Cache already closed!"); synchronized (readAccessLock) { - return blocks2Info.getOrDefault(block, ERROR_BLOCK_INFO); + return blocks2Info.getOrDefault(block, DatabaseBlocksMetadata.ERROR_BLOCK_INFO); } } diff --git a/src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadataCacheFlusher.java b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadataCacheFlusher.java similarity index 74% rename from src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadataCacheFlusher.java rename to src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadataCacheFlusher.java index f87ce55..53e7b39 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseBlocksMetadataCacheFlusher.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseBlocksMetadataCacheFlusher.java @@ -1,6 +1,4 @@ -package org.warp.cowdb.database; - -import org.warp.cowdb.BlockInfo; +package org.warp.jcwdb.database; import java.io.IOException; import java.util.concurrent.Future; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseDataInitializer.java b/src/main/java/org/warp/jcwdb/database/DatabaseDataInitializer.java similarity index 97% rename from src/main/java/org/warp/cowdb/database/DatabaseDataInitializer.java rename to src/main/java/org/warp/jcwdb/database/DatabaseDataInitializer.java index c96b757..e6e0e90 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseDataInitializer.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseDataInitializer.java @@ -1,9 +1,8 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; import org.apache.commons.lang3.reflect.FieldUtils; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDataInitializer; -import org.warp.jcwdb.ann.*; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.annotations.*; import java.io.IOException; import java.lang.reflect.Field; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseEnhancedObjectUpgrader.java b/src/main/java/org/warp/jcwdb/database/DatabaseEnhancedObjectUpgrader.java similarity index 91% rename from src/main/java/org/warp/cowdb/database/DatabaseEnhancedObjectUpgrader.java rename to src/main/java/org/warp/jcwdb/database/DatabaseEnhancedObjectUpgrader.java index a36131a..e5c0158 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseEnhancedObjectUpgrader.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseEnhancedObjectUpgrader.java @@ -1,9 +1,9 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; import it.unimi.dsi.fastutil.longs.LongList; -import org.warp.cowdb.EnhancedObjectUpgrader; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBPrimitiveType; +import org.warp.jcwdb.EnhancedObjectUpgrader; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBPrimitiveType; import java.io.IOException; import java.util.function.Supplier; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseFileIO.java b/src/main/java/org/warp/jcwdb/database/DatabaseFileIO.java similarity index 93% rename from src/main/java/org/warp/cowdb/database/DatabaseFileIO.java rename to src/main/java/org/warp/jcwdb/database/DatabaseFileIO.java index 7304b12..874cbf3 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseFileIO.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseFileIO.java @@ -1,15 +1,12 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; -import org.warp.cowdb.IFileIO; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SeekableByteChannel; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; -import java.util.concurrent.ExecutionException; public class DatabaseFileIO implements IFileIO { diff --git a/src/main/java/org/warp/cowdb/database/DatabaseObjectsIO.java b/src/main/java/org/warp/jcwdb/database/DatabaseObjectsIO.java similarity index 99% rename from src/main/java/org/warp/cowdb/database/DatabaseObjectsIO.java rename to src/main/java/org/warp/jcwdb/database/DatabaseObjectsIO.java index 617d9f4..ecf572b 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseObjectsIO.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseObjectsIO.java @@ -1,4 +1,4 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; @@ -11,11 +11,8 @@ import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongList; import it.unimi.dsi.fastutil.shorts.ShortArrayList; import org.apache.commons.lang3.reflect.FieldUtils; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDataInitializer; -import org.warp.cowdb.IDatabaseTools; -import org.warp.cowdb.IObjectsIO; -import org.warp.jcwdb.ann.*; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.annotations.*; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseReferencesIO.java b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesIO.java similarity index 90% rename from src/main/java/org/warp/cowdb/database/DatabaseReferencesIO.java rename to src/main/java/org/warp/jcwdb/database/DatabaseReferencesIO.java index 24cbd77..4b410a2 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseReferencesIO.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesIO.java @@ -1,11 +1,9 @@ -package org.warp.cowdb.database; - -import org.warp.cowdb.IReferencesIO; +package org.warp.jcwdb.database; import java.io.IOException; import java.nio.ByteBuffer; -import static org.warp.cowdb.IBlocksMetadata.EMPTY_BLOCK_ID; +import static org.warp.jcwdb.database.IBlocksMetadata.EMPTY_BLOCK_ID; public class DatabaseReferencesIO implements IReferencesIO { diff --git a/src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadata.java b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadata.java similarity index 86% rename from src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadata.java rename to src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadata.java index b6aabe8..61f25b6 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadata.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadata.java @@ -1,21 +1,15 @@ -package org.warp.cowdb.database; - -import it.unimi.dsi.fastutil.bytes.ByteLinkedOpenCustomHashSet; -import org.warp.cowdb.IReferencesMetadata; -import org.warp.jcwdb.ann.DBClass; +package org.warp.jcwdb.database; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousFileChannel; -import java.nio.channels.SeekableByteChannel; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static org.warp.cowdb.IBlocksMetadata.EMPTY_BLOCK_ID; -import static org.warp.cowdb.IBlocksMetadata.ERROR_BLOCK_ID; +import static org.warp.jcwdb.database.IBlocksMetadata.EMPTY_BLOCK_ID; +import static org.warp.jcwdb.database.IBlocksMetadata.ERROR_BLOCK_ID; public class DatabaseReferencesMetadata implements IReferencesMetadata { private final AsynchronousFileChannel metaFileChannel; diff --git a/src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadataCache.java b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadataCache.java similarity index 97% rename from src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadataCache.java rename to src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadataCache.java index 3004c00..628d997 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadataCache.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadataCache.java @@ -1,4 +1,4 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; import it.unimi.dsi.fastutil.longs.*; import it.unimi.dsi.fastutil.objects.ObjectIterator; @@ -9,7 +9,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static org.warp.cowdb.IBlocksMetadata.ERROR_BLOCK_ID; +import static org.warp.jcwdb.database.IBlocksMetadata.ERROR_BLOCK_ID; public class DatabaseReferencesMetadataCache { diff --git a/src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadataCacheFlusher.java b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadataCacheFlusher.java similarity index 85% rename from src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadataCacheFlusher.java rename to src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadataCacheFlusher.java index 7a2c519..e87718f 100644 --- a/src/main/java/org/warp/cowdb/database/DatabaseReferencesMetadataCacheFlusher.java +++ b/src/main/java/org/warp/jcwdb/database/DatabaseReferencesMetadataCacheFlusher.java @@ -1,4 +1,4 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; import java.io.IOException; import java.util.concurrent.Future; diff --git a/src/main/java/org/warp/cowdb/database/EnhancedObjectFullInfo.java b/src/main/java/org/warp/jcwdb/database/EnhancedObjectFullInfo.java similarity index 93% rename from src/main/java/org/warp/cowdb/database/EnhancedObjectFullInfo.java rename to src/main/java/org/warp/jcwdb/database/EnhancedObjectFullInfo.java index dfa16bd..951c236 100644 --- a/src/main/java/org/warp/cowdb/database/EnhancedObjectFullInfo.java +++ b/src/main/java/org/warp/jcwdb/database/EnhancedObjectFullInfo.java @@ -1,7 +1,7 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBPrimitiveType; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBPrimitiveType; import java.lang.reflect.Field; diff --git a/src/main/java/org/warp/cowdb/IBlocksIO.java b/src/main/java/org/warp/jcwdb/database/IBlocksIO.java similarity index 93% rename from src/main/java/org/warp/cowdb/IBlocksIO.java rename to src/main/java/org/warp/jcwdb/database/IBlocksIO.java index 0fc0a14..6eedf78 100644 --- a/src/main/java/org/warp/cowdb/IBlocksIO.java +++ b/src/main/java/org/warp/jcwdb/database/IBlocksIO.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/warp/cowdb/IBlocksMetadata.java b/src/main/java/org/warp/jcwdb/database/IBlocksMetadata.java similarity index 93% rename from src/main/java/org/warp/cowdb/IBlocksMetadata.java rename to src/main/java/org/warp/jcwdb/database/IBlocksMetadata.java index 985af39..e88e9dc 100644 --- a/src/main/java/org/warp/cowdb/IBlocksMetadata.java +++ b/src/main/java/org/warp/jcwdb/database/IBlocksMetadata.java @@ -1,4 +1,6 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; + +import org.warp.jcwdb.BlockInfo; import java.io.IOException; diff --git a/src/main/java/org/warp/cowdb/IDataInitializer.java b/src/main/java/org/warp/jcwdb/database/IDataInitializer.java similarity index 64% rename from src/main/java/org/warp/cowdb/IDataInitializer.java rename to src/main/java/org/warp/jcwdb/database/IDataInitializer.java index 371d5ea..31c300b 100644 --- a/src/main/java/org/warp/cowdb/IDataInitializer.java +++ b/src/main/java/org/warp/jcwdb/database/IDataInitializer.java @@ -1,4 +1,6 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; + +import org.warp.jcwdb.EnhancedObject; import java.io.IOException; diff --git a/src/main/java/org/warp/cowdb/IDatabase.java b/src/main/java/org/warp/jcwdb/database/IDatabase.java similarity index 82% rename from src/main/java/org/warp/cowdb/IDatabase.java rename to src/main/java/org/warp/jcwdb/database/IDatabase.java index 828ea45..3e7e7be 100644 --- a/src/main/java/org/warp/cowdb/IDatabase.java +++ b/src/main/java/org/warp/jcwdb/database/IDatabase.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; import java.io.IOException; diff --git a/src/main/java/org/warp/cowdb/IDatabaseTools.java b/src/main/java/org/warp/jcwdb/database/IDatabaseTools.java similarity index 65% rename from src/main/java/org/warp/cowdb/IDatabaseTools.java rename to src/main/java/org/warp/jcwdb/database/IDatabaseTools.java index 0876f01..cf9d106 100644 --- a/src/main/java/org/warp/cowdb/IDatabaseTools.java +++ b/src/main/java/org/warp/jcwdb/database/IDatabaseTools.java @@ -1,9 +1,8 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; -import org.warp.jcwdb.ann.DBDataType; +import org.warp.jcwdb.EnhancedObject; import java.io.IOException; -import java.lang.reflect.Method; public interface IDatabaseTools { void initializeEnhancedObject(EnhancedObject enhancedObject) throws IOException; diff --git a/src/main/java/org/warp/cowdb/IFileIO.java b/src/main/java/org/warp/jcwdb/database/IFileIO.java similarity index 95% rename from src/main/java/org/warp/cowdb/IFileIO.java rename to src/main/java/org/warp/jcwdb/database/IFileIO.java index 31bda13..71c1880 100644 --- a/src/main/java/org/warp/cowdb/IFileIO.java +++ b/src/main/java/org/warp/jcwdb/database/IFileIO.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; import java.io.*; import java.nio.ByteBuffer; diff --git a/src/main/java/org/warp/cowdb/IObjectsIO.java b/src/main/java/org/warp/jcwdb/database/IObjectsIO.java similarity index 93% rename from src/main/java/org/warp/cowdb/IObjectsIO.java rename to src/main/java/org/warp/jcwdb/database/IObjectsIO.java index 72faf65..94b82ac 100644 --- a/src/main/java/org/warp/cowdb/IObjectsIO.java +++ b/src/main/java/org/warp/jcwdb/database/IObjectsIO.java @@ -1,8 +1,9 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongList; -import org.warp.jcwdb.ann.DBDataType; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.annotations.DBDataType; import java.io.IOException; import java.lang.reflect.Method; diff --git a/src/main/java/org/warp/cowdb/IReferencesIO.java b/src/main/java/org/warp/jcwdb/database/IReferencesIO.java similarity index 96% rename from src/main/java/org/warp/cowdb/IReferencesIO.java rename to src/main/java/org/warp/jcwdb/database/IReferencesIO.java index d89d3e9..18853f9 100644 --- a/src/main/java/org/warp/cowdb/IReferencesIO.java +++ b/src/main/java/org/warp/jcwdb/database/IReferencesIO.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/warp/cowdb/IReferencesMetadata.java b/src/main/java/org/warp/jcwdb/database/IReferencesMetadata.java similarity index 95% rename from src/main/java/org/warp/cowdb/IReferencesMetadata.java rename to src/main/java/org/warp/jcwdb/database/IReferencesMetadata.java index 2a40a52..70eaba0 100644 --- a/src/main/java/org/warp/cowdb/IReferencesMetadata.java +++ b/src/main/java/org/warp/jcwdb/database/IReferencesMetadata.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb.database; import java.io.IOException; diff --git a/src/main/java/org/warp/cowdb/database/Long2LongConsumer.java b/src/main/java/org/warp/jcwdb/database/Long2LongConsumer.java similarity index 75% rename from src/main/java/org/warp/cowdb/database/Long2LongConsumer.java rename to src/main/java/org/warp/jcwdb/database/Long2LongConsumer.java index ea14c24..b630222 100644 --- a/src/main/java/org/warp/cowdb/database/Long2LongConsumer.java +++ b/src/main/java/org/warp/jcwdb/database/Long2LongConsumer.java @@ -1,4 +1,4 @@ -package org.warp.cowdb.database; +package org.warp.jcwdb.database; import java.io.IOException; diff --git a/src/main/java/org/warp/jcwdb/ann/ConsumerWithIO.java b/src/main/java/org/warp/jcwdb/functionalinterfaces/ConsumerWithIO.java similarity index 87% rename from src/main/java/org/warp/jcwdb/ann/ConsumerWithIO.java rename to src/main/java/org/warp/jcwdb/functionalinterfaces/ConsumerWithIO.java index 3bda55b..b77e4ec 100644 --- a/src/main/java/org/warp/jcwdb/ann/ConsumerWithIO.java +++ b/src/main/java/org/warp/jcwdb/functionalinterfaces/ConsumerWithIO.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.functionalinterfaces; import java.io.IOException; import java.util.Objects; diff --git a/src/main/java/org/warp/cowdb/FunctionWithIO.java b/src/main/java/org/warp/jcwdb/functionalinterfaces/FunctionWithIO.java similarity index 98% rename from src/main/java/org/warp/cowdb/FunctionWithIO.java rename to src/main/java/org/warp/jcwdb/functionalinterfaces/FunctionWithIO.java index fb15117..4aac443 100644 --- a/src/main/java/org/warp/cowdb/FunctionWithIO.java +++ b/src/main/java/org/warp/jcwdb/functionalinterfaces/FunctionWithIO.java @@ -1,4 +1,4 @@ -package org.warp.cowdb; +package org.warp.jcwdb.functionalinterfaces; import java.io.IOException; import java.util.Objects; diff --git a/src/main/java/org/warp/jcwdb/ann/RunnableWithIO.java b/src/main/java/org/warp/jcwdb/functionalinterfaces/RunnableWithIO.java similarity index 91% rename from src/main/java/org/warp/jcwdb/ann/RunnableWithIO.java rename to src/main/java/org/warp/jcwdb/functionalinterfaces/RunnableWithIO.java index 6f3215d..b2a9f69 100644 --- a/src/main/java/org/warp/jcwdb/ann/RunnableWithIO.java +++ b/src/main/java/org/warp/jcwdb/functionalinterfaces/RunnableWithIO.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.functionalinterfaces; import java.io.IOException; diff --git a/src/main/java/org/warp/jcwdb/ann/SupplierWithIO.java b/src/main/java/org/warp/jcwdb/functionalinterfaces/SupplierWithIO.java similarity index 73% rename from src/main/java/org/warp/jcwdb/ann/SupplierWithIO.java rename to src/main/java/org/warp/jcwdb/functionalinterfaces/SupplierWithIO.java index 2e8fa67..2d2598c 100644 --- a/src/main/java/org/warp/jcwdb/ann/SupplierWithIO.java +++ b/src/main/java/org/warp/jcwdb/functionalinterfaces/SupplierWithIO.java @@ -1,4 +1,4 @@ -package org.warp.jcwdb.ann; +package org.warp.jcwdb.functionalinterfaces; import java.io.IOException; diff --git a/src/main/java/org/warp/cowdb/lists/EnhancedObjectCowList.java b/src/main/java/org/warp/jcwdb/lists/EnhancedObjectJCWDBList.java similarity index 61% rename from src/main/java/org/warp/cowdb/lists/EnhancedObjectCowList.java rename to src/main/java/org/warp/jcwdb/lists/EnhancedObjectJCWDBList.java index 8fc4fa5..8da4091 100644 --- a/src/main/java/org/warp/cowdb/lists/EnhancedObjectCowList.java +++ b/src/main/java/org/warp/jcwdb/lists/EnhancedObjectJCWDBList.java @@ -1,15 +1,14 @@ -package org.warp.cowdb.lists; +package org.warp.jcwdb.lists; import it.unimi.dsi.fastutil.longs.LongArrayList; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabase; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBField; import java.io.IOException; -public class EnhancedObjectCowList extends CowList { +public class EnhancedObjectJCWDBList extends JCWDBList { @DBField(id = 0, type = DBDataType.REFERENCES_LIST) private LongArrayList indices; @@ -22,11 +21,11 @@ public class EnhancedObjectCowList extends CowList return indices; } - public EnhancedObjectCowList() { + public EnhancedObjectJCWDBList() { super(); } - public EnhancedObjectCowList(IDatabaseTools databaseTools, Class type) throws IOException { + public EnhancedObjectJCWDBList(IDatabaseTools databaseTools, Class type) throws IOException { super(databaseTools); this.type = type; indices = new LongArrayList(); diff --git a/src/main/java/org/warp/cowdb/lists/CowList.java b/src/main/java/org/warp/jcwdb/lists/JCWDBList.java similarity index 84% rename from src/main/java/org/warp/cowdb/lists/CowList.java rename to src/main/java/org/warp/jcwdb/lists/JCWDBList.java index 9cf6bc3..ba2b160 100644 --- a/src/main/java/org/warp/cowdb/lists/CowList.java +++ b/src/main/java/org/warp/jcwdb/lists/JCWDBList.java @@ -1,24 +1,23 @@ -package org.warp.cowdb.lists; +package org.warp.jcwdb.lists; import it.unimi.dsi.fastutil.longs.LongArrayList; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabase; -import org.warp.cowdb.IDatabaseTools; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; import java.io.IOException; import java.util.StringJoiner; -public abstract class CowList extends EnhancedObject { +public abstract class JCWDBList extends EnhancedObject { private final Object indicesAccessLock = new Object(); protected abstract LongArrayList getIndices(); - public CowList() { + public JCWDBList() { } - public CowList(IDatabaseTools databaseTools) throws IOException { + public JCWDBList(IDatabaseTools databaseTools) throws IOException { super(databaseTools); } @@ -88,7 +87,7 @@ public abstract class CowList extends EnhancedObject { @Override public String toString() { - return new StringJoiner(", ", CowList.class.getSimpleName() + "[", "]") + return new StringJoiner(", ", JCWDBList.class.getSimpleName() + "[", "]") .add(getIndices().size() + " items") .toString(); } diff --git a/src/main/java/org/warp/cowdb/lists/ObjectCowList.java b/src/main/java/org/warp/jcwdb/lists/ObjectJCWDBList.java similarity index 64% rename from src/main/java/org/warp/cowdb/lists/ObjectCowList.java rename to src/main/java/org/warp/jcwdb/lists/ObjectJCWDBList.java index 697b0ed..bdba6dd 100644 --- a/src/main/java/org/warp/cowdb/lists/ObjectCowList.java +++ b/src/main/java/org/warp/jcwdb/lists/ObjectJCWDBList.java @@ -1,14 +1,13 @@ -package org.warp.cowdb.lists; +package org.warp.jcwdb.lists; import it.unimi.dsi.fastutil.longs.LongArrayList; -import org.warp.cowdb.IDatabase; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBField; import java.io.IOException; -public class ObjectCowList extends CowList { +public class ObjectJCWDBList extends JCWDBList { @DBField(id = 0, type = DBDataType.REFERENCES_LIST) private LongArrayList indices; @@ -18,11 +17,11 @@ public class ObjectCowList extends CowList { return indices; } - public ObjectCowList() { + public ObjectJCWDBList() { super(); } - public ObjectCowList(IDatabaseTools databaseTools) throws IOException { + public ObjectJCWDBList(IDatabaseTools databaseTools) throws IOException { super(databaseTools); indices = new LongArrayList(); } diff --git a/src/test/java/org/warp/jcwdb/tests/Clean.java b/src/test/java/org/warp/jcwdb/tests/Clean.java index 5a12baf..20f7f92 100644 --- a/src/test/java/org/warp/jcwdb/tests/Clean.java +++ b/src/test/java/org/warp/jcwdb/tests/Clean.java @@ -3,12 +3,12 @@ package org.warp.jcwdb.tests; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; -import org.warp.jcwdb.ann.DBPropertyGetter; -import org.warp.jcwdb.ann.DBPropertySetter; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBField; +import org.warp.jcwdb.annotations.DBPropertyGetter; +import org.warp.jcwdb.annotations.DBPropertySetter; import org.warp.jcwdb.utils.NTestUtils; import java.io.IOException; diff --git a/src/test/java/org/warp/jcwdb/tests/EnhancedClassUpdate.java b/src/test/java/org/warp/jcwdb/tests/EnhancedClassUpdate.java index 42b988e..2d1c08e 100644 --- a/src/test/java/org/warp/jcwdb/tests/EnhancedClassUpdate.java +++ b/src/test/java/org/warp/jcwdb/tests/EnhancedClassUpdate.java @@ -3,19 +3,11 @@ package org.warp.jcwdb.tests; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.warp.cowdb.Database; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabase; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; -import org.warp.jcwdb.ann.DBPropertyGetter; -import org.warp.jcwdb.ann.DBPropertySetter; -import org.warp.jcwdb.utils.NTestUtils; +import org.warp.jcwdb.database.Database; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/warp/jcwdb/tests/MultipleEnhancedObjects.java b/src/test/java/org/warp/jcwdb/tests/MultipleEnhancedObjects.java index 7fe7b50..0e02b0d 100644 --- a/src/test/java/org/warp/jcwdb/tests/MultipleEnhancedObjects.java +++ b/src/test/java/org/warp/jcwdb/tests/MultipleEnhancedObjects.java @@ -3,13 +3,12 @@ package org.warp.jcwdb.tests; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabase; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; -import org.warp.jcwdb.ann.DBPropertyGetter; -import org.warp.jcwdb.ann.DBPropertySetter; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBField; +import org.warp.jcwdb.annotations.DBPropertyGetter; +import org.warp.jcwdb.annotations.DBPropertySetter; import org.warp.jcwdb.utils.NTestUtils; import java.io.IOException; diff --git a/src/test/java/org/warp/jcwdb/tests/OldClass.java b/src/test/java/org/warp/jcwdb/tests/OldClass.java index 7ad5f1c..af97bae 100644 --- a/src/test/java/org/warp/jcwdb/tests/OldClass.java +++ b/src/test/java/org/warp/jcwdb/tests/OldClass.java @@ -1,11 +1,11 @@ package org.warp.jcwdb.tests; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; -import org.warp.jcwdb.ann.DBPrimitiveField; -import org.warp.jcwdb.ann.DBPrimitiveType; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBField; +import org.warp.jcwdb.annotations.DBPrimitiveField; +import org.warp.jcwdb.annotations.DBPrimitiveType; import java.io.IOException; diff --git a/src/test/java/org/warp/jcwdb/tests/Performance.java b/src/test/java/org/warp/jcwdb/tests/Performance.java index fda4a9a..e4d9185 100644 --- a/src/test/java/org/warp/jcwdb/tests/Performance.java +++ b/src/test/java/org/warp/jcwdb/tests/Performance.java @@ -1,13 +1,14 @@ package org.warp.jcwdb.tests; import it.unimi.dsi.fastutil.longs.LongArrayList; -import org.warp.cowdb.Database; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabaseTools; -import org.warp.cowdb.lists.EnhancedObjectCowList; -import org.warp.cowdb.lists.ObjectCowList; +import org.warp.jcwdb.functionalinterfaces.RunnableWithIO; +import org.warp.jcwdb.database.Database; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.lists.EnhancedObjectJCWDBList; +import org.warp.jcwdb.lists.ObjectJCWDBList; import org.warp.jcwdb.VariableWrapper; -import org.warp.jcwdb.ann.*; +import org.warp.jcwdb.annotations.*; import java.io.IOException; import java.nio.file.Files; @@ -51,23 +52,23 @@ public class Performance { testS("Database root creation", 3000, Performance::regenDb, () -> db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new), () -> {}); final VariableWrapper preloadedListContainer = new VariableWrapper<>(null); final VariableWrapper simpleEnhancedObjectContainer = new VariableWrapper<>(null); - testS("ObjectCowList creation", 3000, () -> { + testS("ObjectJCWDBList creation", 3000, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - }, () -> preloadedListContainer.var.list = new ObjectCowList<>(db), () -> {}); - testS("ObjectCowList: Filling with 1000 items", 100, () -> { + }, () -> preloadedListContainer.var.list = new ObjectJCWDBList<>(db), () -> {}); + testS("ObjectJCWDBList: Filling with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); }, () -> { for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> {}); - testS("ObjectCowList: Filling with 1000 items", 100, () -> { + testS("ObjectJCWDBList: Filling with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectCowList<>(db, SimpleEnhancedObject.class); + preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectJCWDBList<>(db, SimpleEnhancedObject.class); simpleEnhancedObjectContainer.var = new SimpleEnhancedObject(db); simpleEnhancedObjectContainer.var.integerNumber = 10; simpleEnhancedObjectContainer.var.longNumber = 10L; @@ -80,28 +81,28 @@ public class Performance { preloadedListContainer.var.listOfEnhancedObj.add(simpleEnhancedObjectContainer.var); } }, () -> {}); - testS("ObjectCowList: Filling with 10000 items", 10, () -> { + testS("ObjectJCWDBList: Filling with 10000 items", 10, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); }, () -> { for (int i = 0; i < 10000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> {}); - testS("ObjectCowList: Filling with 100000 items", 1, () -> { + testS("ObjectJCWDBList: Filling with 100000 items", 1, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); }, () -> { for (int i = 0; i < 100000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> {}); - testS("ObjectCowList: Loading 1000 items", 100, () -> { + testS("ObjectJCWDBList: Loading 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } @@ -110,10 +111,10 @@ public class Performance { preloadedListContainer.var.list.get(i); } }, () -> {}); - testS("ObjectCowList: Loading with 1000 items", 100, () -> { + testS("ObjectJCWDBList: Loading with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectCowList<>(db, SimpleEnhancedObject.class); + preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectJCWDBList<>(db, SimpleEnhancedObject.class); simpleEnhancedObjectContainer.var = new SimpleEnhancedObject(db); simpleEnhancedObjectContainer.var.integerNumber = 10; simpleEnhancedObjectContainer.var.longNumber = 10L; @@ -129,10 +130,10 @@ public class Performance { preloadedListContainer.var.listOfEnhancedObj.get(i); } }, () -> {}); - testS("ObjectCowList: Loading 10000 items", 10, () -> { + testS("ObjectJCWDBList: Loading 10000 items", 10, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); for (int i = 0; i < 10000; i++) { preloadedListContainer.var.list.add(1000); } @@ -141,20 +142,20 @@ public class Performance { preloadedListContainer.var.list.get(i); } }, () -> {}); - testS("ObjectCowList: getLast() with 1000 items", 100, () -> { + testS("ObjectJCWDBList: getLast() with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> { preloadedListContainer.var.list.getLast(); }, () -> {}); - testS("ObjectCowList: getLast() with 1000 items", 100, () -> { + testS("ObjectJCWDBList: getLast() with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectCowList<>(db, SimpleEnhancedObject.class); + preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectJCWDBList<>(db, SimpleEnhancedObject.class); simpleEnhancedObjectContainer.var = new SimpleEnhancedObject(db); simpleEnhancedObjectContainer.var.integerNumber = 10; simpleEnhancedObjectContainer.var.longNumber = 10L; @@ -168,10 +169,10 @@ public class Performance { }, () -> { preloadedListContainer.var.listOfEnhancedObj.getLast(); }, () -> {}); - testS("ObjectCowList: size() with 1000 items", 100, () -> { + testS("ObjectJCWDBList: size() with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectCowList<>(db); + preloadedListContainer.var.list = new ObjectJCWDBList<>(db); for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } @@ -284,10 +285,10 @@ public class Performance { public static class PreloadedListContainer extends EnhancedObject { @DBField(id = 0, type = DBDataType.ENHANCED_OBJECT) - public ObjectCowList list; + public ObjectJCWDBList list; @DBField(id = 1, type = DBDataType.ENHANCED_OBJECT) - public EnhancedObjectCowList listOfEnhancedObj; + public EnhancedObjectJCWDBList listOfEnhancedObj; public PreloadedListContainer() { @@ -310,12 +311,12 @@ public class Performance { @DBPropertyGetter(id = 0, type = DBDataType.ENHANCED_OBJECT) - public ObjectCowList getList() { + public ObjectJCWDBList getList() { return getProperty(); } @DBPropertySetter(id = 1, type = DBDataType.ENHANCED_OBJECT) - public void setList(ObjectCowList list) { + public void setList(ObjectJCWDBList list) { setProperty(list); } } diff --git a/src/test/java/org/warp/jcwdb/tests/V2Class.java b/src/test/java/org/warp/jcwdb/tests/V2Class.java index 6f17d7a..53706b3 100644 --- a/src/test/java/org/warp/jcwdb/tests/V2Class.java +++ b/src/test/java/org/warp/jcwdb/tests/V2Class.java @@ -1,13 +1,13 @@ package org.warp.jcwdb.tests; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.EnhancedObjectUpgrader; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.DBClass; -import org.warp.jcwdb.ann.DBDataType; -import org.warp.jcwdb.ann.DBField; -import org.warp.jcwdb.ann.DBPrimitiveField; -import org.warp.jcwdb.ann.DBPrimitiveType; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.EnhancedObjectUpgrader; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.DBClass; +import org.warp.jcwdb.annotations.DBDataType; +import org.warp.jcwdb.annotations.DBField; +import org.warp.jcwdb.annotations.DBPrimitiveField; +import org.warp.jcwdb.annotations.DBPrimitiveType; import java.io.IOException; diff --git a/src/test/java/org/warp/jcwdb/utils/NSimplestClass.java b/src/test/java/org/warp/jcwdb/utils/NSimplestClass.java index 2c5dfda..073f71a 100644 --- a/src/test/java/org/warp/jcwdb/utils/NSimplestClass.java +++ b/src/test/java/org/warp/jcwdb/utils/NSimplestClass.java @@ -1,9 +1,9 @@ package org.warp.jcwdb.utils; -import org.warp.cowdb.Database; -import org.warp.cowdb.EnhancedObject; -import org.warp.jcwdb.ann.DBPrimitiveField; -import org.warp.jcwdb.ann.DBPrimitiveType; +import org.warp.jcwdb.database.Database; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.annotations.DBPrimitiveField; +import org.warp.jcwdb.annotations.DBPrimitiveType; import java.io.IOException; diff --git a/src/test/java/org/warp/jcwdb/utils/NTestUtils.java b/src/test/java/org/warp/jcwdb/utils/NTestUtils.java index 8a073e3..3942023 100644 --- a/src/test/java/org/warp/jcwdb/utils/NTestUtils.java +++ b/src/test/java/org/warp/jcwdb/utils/NTestUtils.java @@ -1,10 +1,11 @@ package org.warp.jcwdb.utils; import it.unimi.dsi.fastutil.longs.LongArrayList; -import org.warp.cowdb.Database; -import org.warp.cowdb.EnhancedObject; -import org.warp.cowdb.IDatabaseTools; -import org.warp.jcwdb.ann.*; +import org.warp.jcwdb.functionalinterfaces.RunnableWithIO; +import org.warp.jcwdb.database.Database; +import org.warp.jcwdb.EnhancedObject; +import org.warp.jcwdb.database.IDatabaseTools; +import org.warp.jcwdb.annotations.*; import java.io.File; import java.io.IOException;