From 9c1a10712a724b448de9e066ff76f97059c86b40 Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 9 Oct 2026 15:32:09 +0300 Subject: catalog: make Loader a stream-based strategy Loader was tied to the disk: load(Path) did its own file checks and opening, so the v3 loader, which reads HTTP uploads, could not implement it, and the server had to hand its catalog a stub loader that refused everything. Reduce Loader to a single strategy method, load(InputStream, source, owner). The v1, v2 and v3 loaders are now interchangeable implementations, picked by wiring: v1 for the console, v2 for the desktop, v3 for the server. The owner is the uploading user; v1 and v2 ignore it because their files name their own Market Makers. Opening a file by path is now LocalCatalogContext.loadEvents' job, with the same INVALID_PATH, FILE_NOT_FOUND and NOT_XML errors as before. The server catalog uses the v3 loader directly. A path load there passes no uploader, which v3 refuses, so nothing reaches the server's market except an upload. Drop Loader.seed, which every loader implemented by throwing and nothing called. --- .../java/market/guess/server/ServerEngine.java | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'server') diff --git a/server/src/main/java/market/guess/server/ServerEngine.java b/server/src/main/java/market/guess/server/ServerEngine.java index f9413a8..af7edd9 100644 --- a/server/src/main/java/market/guess/server/ServerEngine.java +++ b/server/src/main/java/market/guess/server/ServerEngine.java @@ -1,13 +1,10 @@ package market.guess.server; import jakarta.servlet.ServletContext; -import java.nio.file.Path; import java.time.Clock; import market.guess.api.AccountContext; import market.guess.api.CatalogContext; import market.guess.api.GuessMarketContext; -import market.guess.api.LoadResult; -import market.guess.api.Result; import market.guess.service.LocalGuessMarketContext; import market.guess.service.catalog.LocalCatalogContext; import market.guess.service.catalog.infrastructure.MarketContext; @@ -31,7 +28,7 @@ public final class ServerEngine { private final EventRepository events = new InMemoryEventRepository(); private final UserRepository users = new InMemoryUserRepository(); - private final XMLLoaderV3 uploads; + private final Loader uploads; private final CatalogContext catalog; private final AccountContext accounts; private final GuessMarketContext market; @@ -41,7 +38,7 @@ public final class ServerEngine { var ledger = new LedgerContext(users, clock); this.uploads = new XMLLoaderV3(events, new EventMapperV3(), new XMLValidatorV3()); - this.catalog = new LocalCatalogContext(NO_DISK, marketInfra, events); + this.catalog = new LocalCatalogContext(uploads, marketInfra, events); this.accounts = new LocalAccountContext(users, ledger); this.market = new LocalGuessMarketContext( @@ -68,7 +65,7 @@ public final class ServerEngine { return users; } - public XMLLoaderV3 uploads() { + public Loader uploads() { return uploads; } @@ -83,17 +80,4 @@ public final class ServerEngine { public GuessMarketContext market() { return market; } - - private static final Loader NO_DISK = - new Loader() { - @Override - public Result load(Path path) { - return Result.error("UNSUPPORTED", "The server only accepts uploaded files."); - } - - @Override - public Result seed(CatalogContext context) { - return Result.error("UNSUPPORTED", "The server only accepts uploaded files."); - } - }; } -- cgit v1.2.3