diff options
| author | Kostya <mail@sartin.in> | 2026-10-09 15:32:09 +0300 |
|---|---|---|
| committer | Kostya <mail@sartin.in> | 2026-10-09 15:32:33 +0300 |
| commit | 9c1a10712a724b448de9e066ff76f97059c86b40 (patch) | |
| tree | bae467b5c29c32181e98cf13e7d5de0f155ba0e1 /server/src/main/java | |
| parent | 9a62e94261e6531c6b60d296322e0cef2a5b21e1 (diff) | |
| download | guess-market-9c1a10712a724b448de9e066ff76f97059c86b40.tar.gz guess-market-9c1a10712a724b448de9e066ff76f97059c86b40.tar.xz guess-market-9c1a10712a724b448de9e066ff76f97059c86b40.zip | |
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.
Diffstat (limited to 'server/src/main/java')
| -rw-r--r-- | server/src/main/java/market/guess/server/ServerEngine.java | 22 |
1 files changed, 3 insertions, 19 deletions
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 @@ | |||
| 1 | package market.guess.server; | 1 | package market.guess.server; |
| 2 | 2 | ||
| 3 | import jakarta.servlet.ServletContext; | 3 | import jakarta.servlet.ServletContext; |
| 4 | import java.nio.file.Path; | ||
| 5 | import java.time.Clock; | 4 | import java.time.Clock; |
| 6 | import market.guess.api.AccountContext; | 5 | import market.guess.api.AccountContext; |
| 7 | import market.guess.api.CatalogContext; | 6 | import market.guess.api.CatalogContext; |
| 8 | import market.guess.api.GuessMarketContext; | 7 | import market.guess.api.GuessMarketContext; |
| 9 | import market.guess.api.LoadResult; | ||
| 10 | import market.guess.api.Result; | ||
| 11 | import market.guess.service.LocalGuessMarketContext; | 8 | import market.guess.service.LocalGuessMarketContext; |
| 12 | import market.guess.service.catalog.LocalCatalogContext; | 9 | import market.guess.service.catalog.LocalCatalogContext; |
| 13 | import market.guess.service.catalog.infrastructure.MarketContext; | 10 | import market.guess.service.catalog.infrastructure.MarketContext; |
| @@ -31,7 +28,7 @@ public final class ServerEngine { | |||
| 31 | 28 | ||
| 32 | private final EventRepository events = new InMemoryEventRepository(); | 29 | private final EventRepository events = new InMemoryEventRepository(); |
| 33 | private final UserRepository users = new InMemoryUserRepository(); | 30 | private final UserRepository users = new InMemoryUserRepository(); |
| 34 | private final XMLLoaderV3 uploads; | 31 | private final Loader uploads; |
| 35 | private final CatalogContext catalog; | 32 | private final CatalogContext catalog; |
| 36 | private final AccountContext accounts; | 33 | private final AccountContext accounts; |
| 37 | private final GuessMarketContext market; | 34 | private final GuessMarketContext market; |
| @@ -41,7 +38,7 @@ public final class ServerEngine { | |||
| 41 | var ledger = new LedgerContext(users, clock); | 38 | var ledger = new LedgerContext(users, clock); |
| 42 | 39 | ||
| 43 | this.uploads = new XMLLoaderV3(events, new EventMapperV3(), new XMLValidatorV3()); | 40 | this.uploads = new XMLLoaderV3(events, new EventMapperV3(), new XMLValidatorV3()); |
| 44 | this.catalog = new LocalCatalogContext(NO_DISK, marketInfra, events); | 41 | this.catalog = new LocalCatalogContext(uploads, marketInfra, events); |
| 45 | this.accounts = new LocalAccountContext(users, ledger); | 42 | this.accounts = new LocalAccountContext(users, ledger); |
| 46 | this.market = | 43 | this.market = |
| 47 | new LocalGuessMarketContext( | 44 | new LocalGuessMarketContext( |
| @@ -68,7 +65,7 @@ public final class ServerEngine { | |||
| 68 | return users; | 65 | return users; |
| 69 | } | 66 | } |
| 70 | 67 | ||
| 71 | public XMLLoaderV3 uploads() { | 68 | public Loader uploads() { |
| 72 | return uploads; | 69 | return uploads; |
| 73 | } | 70 | } |
| 74 | 71 | ||
| @@ -83,17 +80,4 @@ public final class ServerEngine { | |||
| 83 | public GuessMarketContext market() { | 80 | public GuessMarketContext market() { |
| 84 | return market; | 81 | return market; |
| 85 | } | 82 | } |
| 86 | |||
| 87 | private static final Loader NO_DISK = | ||
| 88 | new Loader() { | ||
| 89 | @Override | ||
| 90 | public Result<LoadResult> load(Path path) { | ||
| 91 | return Result.error("UNSUPPORTED", "The server only accepts uploaded files."); | ||
| 92 | } | ||
| 93 | |||
| 94 | @Override | ||
| 95 | public Result<LoadResult> seed(CatalogContext context) { | ||
| 96 | return Result.error("UNSUPPORTED", "The server only accepts uploaded files."); | ||
| 97 | } | ||
| 98 | }; | ||
| 99 | } | 83 | } |