From cac555159d0799bba332a7c92764e91bbc2ffbfb Mon Sep 17 00:00:00 2001 From: Minimons Date: Sat, 8 Aug 2026 13:28:19 +0200 Subject: [PATCH] X: Rearrange source tree for misplaced services and plugins --- .../ticker/PriceObservation.tjava | 2 +- .../ticker/TickerService.tjava | 2 +- .../ticker/impl/ref/TickerServiceImpl.tjava | 10 +++---- .../plugins/pricesource}/PriceSink.tjava | 3 +- .../plugins/pricesource}/PriceSource.tjava | 2 +- .../hardcoded}/HardcodedPriceSource.tjava | 6 ++-- .../raydiumpool/RaydiumPoolPriceSource.tjava | 28 +++++++++++++++++++ .../nenjim/hubd/impl/ref/NenjimHubImpl.tjava | 5 ++-- 8 files changed, 42 insertions(+), 16 deletions(-) rename src/main/tjava/com/r35157/assetaz/{core/service => services}/ticker/PriceObservation.tjava (91%) rename src/main/tjava/com/r35157/assetaz/{core/service => services}/ticker/TickerService.tjava (95%) rename src/main/tjava/com/r35157/assetaz/{core/service => services}/ticker/impl/ref/TickerServiceImpl.tjava (98%) rename src/main/tjava/com/r35157/assetaz/{core/service/ticker => services/ticker/plugins/pricesource}/PriceSink.tjava (84%) rename src/main/tjava/com/r35157/assetaz/{core/service/ticker => services/ticker/plugins/pricesource}/PriceSource.tjava (85%) rename src/main/tjava/com/r35157/assetaz/{core/service/ticker/impl/ref => services/ticker/plugins/pricesource/impl/hardcoded}/HardcodedPriceSource.tjava (94%) create mode 100644 src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/raydiumpool/RaydiumPoolPriceSource.tjava diff --git a/src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceObservation.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/PriceObservation.tjava similarity index 91% rename from src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceObservation.tjava rename to src/main/tjava/com/r35157/assetaz/services/ticker/PriceObservation.tjava index 221c265..fdd394d 100644 --- a/src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceObservation.tjava +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/PriceObservation.tjava @@ -1,4 +1,4 @@ -package com.r35157.assetaz.core.service.ticker; +package com.r35157.assetaz.services.ticker; import com.r35157.libs.valuetypes.basic.AssetPrice; import org.jetbrains.annotations.NotNull; diff --git a/src/main/tjava/com/r35157/assetaz/core/service/ticker/TickerService.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/TickerService.tjava similarity index 95% rename from src/main/tjava/com/r35157/assetaz/core/service/ticker/TickerService.tjava rename to src/main/tjava/com/r35157/assetaz/services/ticker/TickerService.tjava index a0fd322..88b5864 100644 --- a/src/main/tjava/com/r35157/assetaz/core/service/ticker/TickerService.tjava +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/TickerService.tjava @@ -1,4 +1,4 @@ -package com.r35157.assetaz.core.service.ticker; +package com.r35157.assetaz.services.ticker; import com.r35157.libs.valuetypes.basic.TradingPair; import org.jetbrains.annotations.NotNull; diff --git a/src/main/tjava/com/r35157/assetaz/core/service/ticker/impl/ref/TickerServiceImpl.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/impl/ref/TickerServiceImpl.tjava similarity index 98% rename from src/main/tjava/com/r35157/assetaz/core/service/ticker/impl/ref/TickerServiceImpl.tjava rename to src/main/tjava/com/r35157/assetaz/services/ticker/impl/ref/TickerServiceImpl.tjava index 9590159..099ed8e 100644 --- a/src/main/tjava/com/r35157/assetaz/core/service/ticker/impl/ref/TickerServiceImpl.tjava +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/impl/ref/TickerServiceImpl.tjava @@ -1,9 +1,9 @@ -package com.r35157.assetaz.core.service.ticker.impl.ref; +package com.r35157.assetaz.services.ticker.impl.ref; -import com.r35157.assetaz.core.service.ticker.PriceObservation; -import com.r35157.assetaz.core.service.ticker.PriceSink; -import com.r35157.assetaz.core.service.ticker.PriceSource; -import com.r35157.assetaz.core.service.ticker.TickerService; +import com.r35157.assetaz.services.ticker.PriceObservation; +import com.r35157.assetaz.services.ticker.plugins.pricesource.PriceSink; +import com.r35157.assetaz.services.ticker.plugins.pricesource.PriceSource; +import com.r35157.assetaz.services.ticker.TickerService; import com.r35157.libs.valuetypes.basic.AssetPrice; import com.r35157.libs.valuetypes.basic.TradingPair; import org.jetbrains.annotations.NotNull; diff --git a/src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceSink.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/PriceSink.tjava similarity index 84% rename from src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceSink.tjava rename to src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/PriceSink.tjava index 3f32cca..cc796de 100644 --- a/src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceSink.tjava +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/PriceSink.tjava @@ -1,4 +1,4 @@ -package com.r35157.assetaz.core.service.ticker; +package com.r35157.assetaz.services.ticker.plugins.pricesource; import org.jetbrains.annotations.NotNull; @@ -10,7 +10,6 @@ import java.time.Instant; */ @FunctionalInterface public interface PriceSink { - void announce( @NotNull PriceSource source, @NotNull ΩPriceΩ price, diff --git a/src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceSource.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/PriceSource.tjava similarity index 85% rename from src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceSource.tjava rename to src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/PriceSource.tjava index 8061825..f7cd566 100644 --- a/src/main/tjava/com/r35157/assetaz/core/service/ticker/PriceSource.tjava +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/PriceSource.tjava @@ -1,4 +1,4 @@ -package com.r35157.assetaz.core.service.ticker; +package com.r35157.assetaz.services.ticker.plugins.pricesource; import com.r35157.libs.valuetypes.basic.TradingPair; import org.jetbrains.annotations.NotNull; diff --git a/src/main/tjava/com/r35157/assetaz/core/service/ticker/impl/ref/HardcodedPriceSource.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/hardcoded/HardcodedPriceSource.tjava similarity index 94% rename from src/main/tjava/com/r35157/assetaz/core/service/ticker/impl/ref/HardcodedPriceSource.tjava rename to src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/hardcoded/HardcodedPriceSource.tjava index 35d38b1..589760f 100644 --- a/src/main/tjava/com/r35157/assetaz/core/service/ticker/impl/ref/HardcodedPriceSource.tjava +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/hardcoded/HardcodedPriceSource.tjava @@ -1,7 +1,7 @@ -package com.r35157.assetaz.core.service.ticker.impl.ref; +package com.r35157.assetaz.services.ticker.plugins.pricesource.impl.hardcoded; -import com.r35157.assetaz.core.service.ticker.PriceSink; -import com.r35157.assetaz.core.service.ticker.PriceSource; +import com.r35157.assetaz.services.ticker.plugins.pricesource.PriceSink; +import com.r35157.assetaz.services.ticker.plugins.pricesource.PriceSource; import com.r35157.assetaz.services.cis.CurrencyIdentityService; import com.r35157.libs.valuetypes.basic.TradingPair; import org.jetbrains.annotations.NotNull; diff --git a/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/raydiumpool/RaydiumPoolPriceSource.tjava b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/raydiumpool/RaydiumPoolPriceSource.tjava new file mode 100644 index 0000000..3f37bf6 --- /dev/null +++ b/src/main/tjava/com/r35157/assetaz/services/ticker/plugins/pricesource/impl/raydiumpool/RaydiumPoolPriceSource.tjava @@ -0,0 +1,28 @@ +package com.r35157.assetaz.services.ticker.plugins.pricesource.impl.raydiumpool; + +import com.r35157.assetaz.services.ticker.plugins.pricesource.PriceSink; +import com.r35157.assetaz.services.ticker.plugins.pricesource.PriceSource; +import com.r35157.libs.valuetypes.basic.TradingPair; +import org.jetbrains.annotations.NotNull; + +public final class RaydiumPoolPriceSource implements PriceSource { + @Override + public @NotNull TradingPair getTradingPair() { + throw new UnsupportedOperationException("Not Implemented"); + } + + @Override + public @NotNull ΩPriceSourceNameΩ getSourceName() { + throw new UnsupportedOperationException("Not Implemented"); + } + + @Override + public void start(@NotNull PriceSink priceSink) { + throw new UnsupportedOperationException("Not Implemented"); + } + + @Override + public void stop() { + throw new UnsupportedOperationException("Not Implemented"); + } +} diff --git a/src/main/tjava/com/r35157/nenjim/hubd/impl/ref/NenjimHubImpl.tjava b/src/main/tjava/com/r35157/nenjim/hubd/impl/ref/NenjimHubImpl.tjava index 49f0142..993e1ef 100644 --- a/src/main/tjava/com/r35157/nenjim/hubd/impl/ref/NenjimHubImpl.tjava +++ b/src/main/tjava/com/r35157/nenjim/hubd/impl/ref/NenjimHubImpl.tjava @@ -2,8 +2,8 @@ package com.r35157.nenjim.hubd.impl.ref; import com.fanitas.evelyn.core.Evelyn; import com.fanitas.evelyn.core.impl.ref.EvelynImpl; -import com.r35157.assetaz.core.service.ticker.impl.ref.HardcodedPriceSource; -import com.r35157.assetaz.core.service.ticker.impl.ref.TickerServiceImpl; +import com.r35157.assetaz.services.ticker.plugins.pricesource.impl.hardcoded.HardcodedPriceSource; +import com.r35157.assetaz.services.ticker.impl.ref.TickerServiceImpl; import com.r35157.assetaz.services.cis.CurrencyIdentityService; import com.r35157.assetaz.services.cis.impl.hc.HardcodedCurrencyIdentityService; import com.r35157.evelyn.emc.EvelynMissionControl; @@ -12,7 +12,6 @@ import com.r35157.jupiterperpsalarm.impl.ref.JupiterPerpsAlarmImpl; import com.r35157.nenjim.composer.NenjimComposer; import com.r35157.nenjim.composer.impl.ref.NenjimComposerImpl; import com.r35157.nenjim.hubd.NenjimHub; -import com.r35157.nenjim.hubd.journal.Journal; import com.r35157.nenjim.npm.NenjimProcessManager; import com.r35157.nenjim.npm.impl.ref.NenjimProcessManagerImpl; import com.r35157.nenjim.ntt.NenjimTestTool;