diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractLegacyDataSourceHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractLegacyDataSourceHandler.java index 117177e65..18b82fe15 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractLegacyDataSourceHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractLegacyDataSourceHandler.java @@ -34,8 +34,9 @@ import java.util.zip.Adler32; import java.util.zip.CheckedOutputStream; @Deprecated -public abstract class AbstractLegacyDataSourceHandler, TDhLevel extends IDhLevel> - implements ISourceProvider +public abstract class AbstractLegacyDataSourceHandler, TDhLevel extends IDhLevel> + implements AutoCloseable { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); private static final Timer DELAYED_SAVE_TIMER = TimerUtil.CreateTimer("DataSourceSaveTimer"); @@ -128,7 +129,6 @@ public abstract class AbstractLegacyDataSourceHandler getAsync(DhSectionPos pos) { ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); @@ -190,7 +190,6 @@ public abstract class AbstractLegacyDataSourceHandler updateDataSourceAsync(FullDataSourceV2 inputDataSource) { ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractNewDataSourceHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractNewDataSourceHandler.java index 7648f16de..3d804d013 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractNewDataSourceHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/AbstractNewDataSourceHandler.java @@ -24,8 +24,8 @@ public abstract class AbstractNewDataSourceHandler , TDTO extends IBaseDTO, TRepo extends AbstractDhRepo, - TDhLevel extends IDhLevel> - implements ISourceProvider + TDhLevel extends IDhLevel> + implements AutoCloseable { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); @@ -112,7 +112,6 @@ public abstract class AbstractNewDataSourceHandler * * This call is concurrent. I.e. it supports being called by multiple threads at the same time. */ - @Override public CompletableFuture getAsync(DhSectionPos pos) { ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); @@ -160,7 +159,6 @@ public abstract class AbstractNewDataSourceHandler // data updating // //===============// - @Override public CompletableFuture updateDataSourceAsync(FullDataSourceV2 inputDataSource) { ThreadPoolExecutor executor = ThreadPoolUtil.getUpdatePropagatorExecutor(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/ISourceProvider.java b/core/src/main/java/com/seibel/distanthorizons/core/file/ISourceProvider.java deleted file mode 100644 index 76f04dd70..000000000 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/ISourceProvider.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.seibel.distanthorizons.core.file; - -import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; -import com.seibel.distanthorizons.core.file.renderfile.IRenderSourceProvider; -import com.seibel.distanthorizons.core.level.IDhLevel; -import com.seibel.distanthorizons.core.pos.DhSectionPos; - -import java.util.concurrent.CompletableFuture; - -/** - * Base for all data source providers - * - * @see IRenderSourceProvider - */ -public interface ISourceProvider, TDhLevel extends IDhLevel> extends AutoCloseable -{ - CompletableFuture getAsync(DhSectionPos pos); - - CompletableFuture updateDataSourceAsync(FullDataSourceV2 inputData); - -} diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java index d1b1f8dff..8db7634b8 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java @@ -20,7 +20,6 @@ package com.seibel.distanthorizons.core.file.renderfile; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; -import com.seibel.distanthorizons.core.file.ISourceProvider; import com.seibel.distanthorizons.core.level.IDhClientLevel; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; @@ -31,8 +30,11 @@ import java.util.concurrent.CompletableFuture; /** * Handles reading, writing, and updating {@link ColumnRenderSource}'s.
* Should be backed by a database handled by a {@link RenderDataRepo}. + * + * @deprecated an interface isn't necessary for the single render source provider we have */ -public interface IRenderSourceProvider extends ISourceProvider +@Deprecated +public interface IRenderSourceProvider extends AutoCloseable { CompletableFuture getAsync(DhSectionPos pos);