From f8f0e3f4b96a11c2e2887e7531d07bbdd14577dc Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 3 Feb 2026 20:48:07 -0600 Subject: [PATCH] move phantom pool into a new namespace --- .../core/dataObjects/BlockBiomeWrapperPair.java | 5 ----- .../core/dataObjects/fullData/FullDataPointIdMap.java | 6 +++--- .../dataObjects/fullData/sources/FullDataSourceV2.java | 6 +++--- .../core/dataObjects/render/ColumnRenderSource.java | 5 ++--- .../core/dataObjects/render/bufferBuilding/ColumnBox.java | 3 +-- .../render/bufferBuilding/ColumnRenderBufferBuilder.java | 5 ++--- .../transformers/FullDataToRenderDataTransformer.java | 4 ++-- .../fullDatafile/GeneratedFullDataSourceProvider.java | 5 ++--- .../file/fullDatafile/V1/FullDataSourceProviderV1.java | 4 ++-- .../seibel/distanthorizons/core/logging/f3/F3Screen.java | 2 +- .../distanthorizons/core/sql/dto/FullDataSourceV2DTO.java | 7 +++---- .../core/sql/repo/FullDataSourceV2Repo.java | 2 +- .../core/util/RenderDataPointReducingList.java | 4 ++-- .../core/util/objects/dataStreams/DhDataInputStream.java | 2 +- .../util/objects/dataStreams/PooledZstdDecompressor.java | 2 +- .../objects}/pooling/AbstractPhantomArrayList.java | 3 +-- .../objects}/pooling/PhantomArrayListCheckout.java | 5 +---- .../{ => util/objects}/pooling/PhantomArrayListPool.java | 2 +- .../core/{ => util/objects}/pooling/StringPool.java | 2 +- core/src/test/java/tests/DelayedSaveCacheTest.java | 6 +----- core/src/test/java/tests/KeyedLockTest.java | 3 --- .../src/test/java/tests/PooledDataSourceCheckoutTest.java | 8 +------- 22 files changed, 32 insertions(+), 59 deletions(-) rename core/src/main/java/com/seibel/distanthorizons/core/{ => util/objects}/pooling/AbstractPhantomArrayList.java (95%) rename core/src/main/java/com/seibel/distanthorizons/core/{ => util/objects}/pooling/PhantomArrayListCheckout.java (95%) rename core/src/main/java/com/seibel/distanthorizons/core/{ => util/objects}/pooling/PhantomArrayListPool.java (99%) rename core/src/main/java/com/seibel/distanthorizons/core/{ => util/objects}/pooling/StringPool.java (99%) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/BlockBiomeWrapperPair.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/BlockBiomeWrapperPair.java index 834182cf6..ea4bb76ae 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/BlockBiomeWrapperPair.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/BlockBiomeWrapperPair.java @@ -2,14 +2,9 @@ package com.seibel.distanthorizons.core.dataObjects; import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.StringPool; -import com.seibel.distanthorizons.core.util.objects.DataCorruptedException; import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; -import it.unimi.dsi.fastutil.chars.CharArrayList; import java.util.concurrent.ConcurrentHashMap; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java index 081f814fb..3acbf033c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java @@ -22,9 +22,9 @@ package com.seibel.distanthorizons.core.dataObjects.fullData; import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; -import com.seibel.distanthorizons.core.pooling.StringPool; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.StringPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.objects.DataCorruptedException; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java index 21a9f6c98..ca126d288 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java @@ -31,9 +31,9 @@ import com.seibel.distanthorizons.core.enums.EDhDirection; import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.AbstractPhantomArrayList; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhLodPos; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java index 210820040..998463579 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java @@ -20,12 +20,11 @@ package com.seibel.distanthorizons.core.dataObjects.render; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.AbstractPhantomArrayList; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnQuadView; -import com.seibel.distanthorizons.core.util.ColorUtil; import com.seibel.distanthorizons.core.util.RenderDataPointUtil; import it.unimi.dsi.fastutil.longs.LongArrayList; import com.seibel.distanthorizons.core.logging.DhLogger; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java index 1c79b4e76..1a2f10db0 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java @@ -23,11 +23,10 @@ import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.enums.EDhDirection; import com.seibel.distanthorizons.core.level.IDhClientLevel; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; import com.seibel.distanthorizons.core.util.ColorUtil; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.RenderDataPointUtil; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.coreapi.util.MathUtil; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java index f999407e9..037bd5391 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java @@ -27,11 +27,10 @@ import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; import com.seibel.distanthorizons.core.level.IDhClientLevel; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos; import com.seibel.distanthorizons.core.pos.DhSectionPos; -import com.seibel.distanthorizons.core.render.glObject.GLProxy; import com.seibel.distanthorizons.core.util.ColorUtil; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.RenderDataPointUtil; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java index 64ef16159..2993efcb9 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java @@ -27,8 +27,8 @@ import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable; import com.seibel.distanthorizons.core.util.*; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataSourceProvider.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataSourceProvider.java index 38368fe3f..c6a61492a 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataSourceProvider.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataSourceProvider.java @@ -33,8 +33,8 @@ import com.seibel.distanthorizons.core.generation.tasks.ERetrievalResultState; import com.seibel.distanthorizons.core.level.IDhLevel; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D; import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable; @@ -54,7 +54,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; import java.util.stream.IntStream; public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 implements IDebugRenderable diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V1/FullDataSourceProviderV1.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V1/FullDataSourceProviderV1.java index 0b59bdba2..c5f3fdaf7 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V1/FullDataSourceProviderV1.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V1/FullDataSourceProviderV1.java @@ -5,8 +5,8 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSour import com.seibel.distanthorizons.core.file.structure.ISaveStructure; import com.seibel.distanthorizons.core.level.IDhLevel; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV1DTO; import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java b/core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java index 132672722..8e2fefe01 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java @@ -26,7 +26,7 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.jar.ModJarInfo; import com.seibel.distanthorizons.core.level.IDhLevel; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.render.RenderBufferHandler; import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java index 8a75e6799..2dcb119cd 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java @@ -19,7 +19,6 @@ package com.seibel.distanthorizons.core.sql.dto; -import com.github.luben.zstd.Zstd; import com.google.common.base.MoreObjects; import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode; import com.seibel.distanthorizons.api.enums.config.EDhApiWorldCompressionMode; @@ -27,9 +26,9 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGeneratio import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; import com.seibel.distanthorizons.core.enums.EDhDirection; -import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.AbstractPhantomArrayList; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.network.INetworkObject; import com.seibel.distanthorizons.core.sql.dto.util.FullDataMinMaxPosUtil; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java index 17af8af33..ebb220798 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java @@ -24,7 +24,7 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSour import com.seibel.distanthorizons.core.enums.EDhDirection; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.sql.DbConnectionClosedException; import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointReducingList.java b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointReducingList.java index c285ff817..87d473df1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointReducingList.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointReducingList.java @@ -22,8 +22,8 @@ package com.seibel.distanthorizons.core.util; import com.google.common.annotations.VisibleForTesting; import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; import com.seibel.distanthorizons.core.dataObjects.render.columnViews.IColumnDataView; -import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool; +import com.seibel.distanthorizons.core.util.objects.pooling.AbstractPhantomArrayList; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool; import com.seibel.distanthorizons.core.util.LodUtil.AssertFailureException; import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.shorts.ShortArrayList; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java index d6fe0c941..91aa5a2e1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java @@ -22,7 +22,7 @@ package com.seibel.distanthorizons.core.util.objects.dataStreams; import com.github.luben.zstd.*; import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; import it.unimi.dsi.fastutil.bytes.ByteArrayList; import net.jpountz.lz4.LZ4FrameInputStream; import com.seibel.distanthorizons.core.logging.DhLogger; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/PooledZstdDecompressor.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/PooledZstdDecompressor.java index 5af468a70..2a8e5a791 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/PooledZstdDecompressor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/PooledZstdDecompressor.java @@ -3,7 +3,7 @@ package com.seibel.distanthorizons.core.util.objects.dataStreams; import com.github.luben.zstd.Zstd; import com.github.luben.zstd.ZstdDecompressCtx; import com.github.luben.zstd.ZstdException; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; import it.unimi.dsi.fastutil.bytes.ByteArrayList; public class PooledZstdDecompressor diff --git a/core/src/main/java/com/seibel/distanthorizons/core/pooling/AbstractPhantomArrayList.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/AbstractPhantomArrayList.java similarity index 95% rename from core/src/main/java/com/seibel/distanthorizons/core/pooling/AbstractPhantomArrayList.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/AbstractPhantomArrayList.java index 9a1bee660..ae1263231 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/pooling/AbstractPhantomArrayList.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/AbstractPhantomArrayList.java @@ -1,7 +1,6 @@ -package com.seibel.distanthorizons.core.pooling; +package com.seibel.distanthorizons.core.util.objects.pooling; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import org.apache.logging.log4j.LogManager; import com.seibel.distanthorizons.core.logging.DhLogger; import java.lang.ref.PhantomReference; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListCheckout.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/PhantomArrayListCheckout.java similarity index 95% rename from core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListCheckout.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/PhantomArrayListCheckout.java index 42545fc01..c3030858d 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListCheckout.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/PhantomArrayListCheckout.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.pooling; +package com.seibel.distanthorizons.core.util.objects.pooling; import com.seibel.distanthorizons.core.util.ListUtil; import com.seibel.distanthorizons.coreapi.util.StringUtil; @@ -14,9 +14,6 @@ import java.util.ArrayList; import java.util.Arrays; /** - * TODO move into util.objects.pooling - * TODO split up trackable objects into inner objects to remove duplicate code - * * This keeps track of all the poolable * arrays that can be retrieved via the {@link PhantomArrayListPool}. * diff --git a/core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListPool.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/PhantomArrayListPool.java similarity index 99% rename from core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListPool.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/PhantomArrayListPool.java index 3f244e5c3..d5c3b4576 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListPool.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/PhantomArrayListPool.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.pooling; +package com.seibel.distanthorizons.core.util.objects.pooling; import com.seibel.distanthorizons.core.api.internal.ClientApi; import com.seibel.distanthorizons.core.config.Config; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/pooling/StringPool.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/StringPool.java similarity index 99% rename from core/src/main/java/com/seibel/distanthorizons/core/pooling/StringPool.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/StringPool.java index a291ade70..b93cefb84 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/pooling/StringPool.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/pooling/StringPool.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.core.pooling; +package com.seibel.distanthorizons.core.util.objects.pooling; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; diff --git a/core/src/test/java/tests/DelayedSaveCacheTest.java b/core/src/test/java/tests/DelayedSaveCacheTest.java index d5e3fe903..c7e01d334 100644 --- a/core/src/test/java/tests/DelayedSaveCacheTest.java +++ b/core/src/test/java/tests/DelayedSaveCacheTest.java @@ -21,16 +21,12 @@ package tests; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; import com.seibel.distanthorizons.core.file.fullDatafile.DelayedFullDataSourceSaveCache; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; import com.seibel.distanthorizons.core.pos.DhSectionPos; -import com.seibel.distanthorizons.core.util.KeyedLockContainer; import org.junit.Assert; -import org.junit.Test; -import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.ReentrantLock; /** * A few very basic tests to confirm {@link DelayedFullDataSourceSaveCache} diff --git a/core/src/test/java/tests/KeyedLockTest.java b/core/src/test/java/tests/KeyedLockTest.java index 30668f7ce..272a07b7b 100644 --- a/core/src/test/java/tests/KeyedLockTest.java +++ b/core/src/test/java/tests/KeyedLockTest.java @@ -19,9 +19,6 @@ package tests; -import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; -import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.util.KeyedLockContainer; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/tests/PooledDataSourceCheckoutTest.java b/core/src/test/java/tests/PooledDataSourceCheckoutTest.java index 215de9721..7e72a1765 100644 --- a/core/src/test/java/tests/PooledDataSourceCheckoutTest.java +++ b/core/src/test/java/tests/PooledDataSourceCheckoutTest.java @@ -20,17 +20,11 @@ package tests; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; -import com.seibel.distanthorizons.core.file.fullDatafile.DelayedFullDataSourceSaveCache; -import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout; +import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout; import com.seibel.distanthorizons.core.pos.DhSectionPos; -import com.seibel.distanthorizons.core.util.KeyedLockContainer; import org.junit.Assert; import org.junit.Test; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.ReentrantLock; - /** * @see PhantomArrayListCheckout *