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/service/Ex2LoaderTest.java | 25 ++++++++++++---------- .../java/market/guess/service/Ex3LoaderTest.java | 14 ++++++++++++ 2 files changed, 28 insertions(+), 11 deletions(-) (limited to 'service/src/test/java/market') diff --git a/service/src/test/java/market/guess/service/Ex2LoaderTest.java b/service/src/test/java/market/guess/service/Ex2LoaderTest.java index d2da8e0..978e4bf 100644 --- a/service/src/test/java/market/guess/service/Ex2LoaderTest.java +++ b/service/src/test/java/market/guess/service/Ex2LoaderTest.java @@ -7,6 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.nio.file.Files; import java.nio.file.Path; +import market.guess.service.catalog.LocalCatalogContext; +import market.guess.service.catalog.infrastructure.MarketContext; import market.guess.service.catalog.infrastructure.mapper.v2.EventMapperV2; import market.guess.service.catalog.infrastructure.provider.v2.XMLLoaderV2; import market.guess.service.catalog.infrastructure.provider.v2.XMLValidatorV2; @@ -19,19 +21,20 @@ import org.junit.jupiter.api.io.TempDir; class Ex2LoaderTest { private InMemoryEventRepository eventRepo; private InMemoryUserRepository userRepo; - private XMLLoaderV2 loader; + private LocalCatalogContext catalog; @BeforeEach void setUp() { eventRepo = new InMemoryEventRepository(); userRepo = new InMemoryUserRepository(); - loader = new XMLLoaderV2(eventRepo, userRepo, new EventMapperV2(), new XMLValidatorV2()); + var loader = new XMLLoaderV2(eventRepo, userRepo, new EventMapperV2(), new XMLValidatorV2()); + catalog = new LocalCatalogContext(loader, new MarketContext(eventRepo, userRepo), eventRepo); } @Test void testLoadSmallXml() { var path = Path.of("test-data/ex-2/small.xml"); - var res = loader.load(path); + var res = catalog.loadEvents(path); assertTrue(res.isSuccess(), "Loading small.xml should succeed"); assertEquals(2, res.getData().eventsLoaded()); assertEquals(2, eventRepo.getAll().size()); @@ -53,7 +56,7 @@ class Ex2LoaderTest { @Test void testLoadMultipleXml() { var path = Path.of("test-data/ex-2/multiple.xml"); - var res = loader.load(path); + var res = catalog.loadEvents(path); assertTrue(res.isSuccess(), "Loading multiple.xml should succeed"); assertEquals(4, res.getData().eventsLoaded()); assertEquals(4, eventRepo.getAll().size()); @@ -63,7 +66,7 @@ class Ex2LoaderTest { @Test void testError2XmlFailsOnZeroInitialCash() { var path = Path.of("test-data/ex-2/error-2.xml"); - var res = loader.load(path); + var res = catalog.loadEvents(path); assertFalse(res.isSuccess(), "error-2.xml must fail validation"); assertTrue( res.getMessage().contains("initial cash") || res.getDetails().contains("initial cash"), @@ -73,7 +76,7 @@ class Ex2LoaderTest { @Test void testError3XmlFailsOnUnknownEventId() { var path = Path.of("test-data/ex-2/error-3.xml"); - var res = loader.load(path); + var res = catalog.loadEvents(path); assertFalse(res.isSuccess(), "error-3.xml must fail validation"); assertTrue( res.getMessage().contains("12") || res.getDetails().contains("12"), @@ -83,14 +86,14 @@ class Ex2LoaderTest { @Test void testEventWithTwoMarketMakersFails(@TempDir Path dir) throws Exception { // Avrum now also claims event 1, which Tikva already makes; event 2 is left without one. - var res = loader.load(smallXmlWith(dir, "", "")); + var res = catalog.loadEvents(smallXmlWith(dir, "", "")); assertFalse(res.isSuccess()); assertTrue(res.getDetails().contains("more than one market maker"), res.getDetails()); } @Test void testEventWithoutMarketMakerFails(@TempDir Path dir) throws Exception { - var res = loader.load(smallXmlWith(dir, "", "")); + var res = catalog.loadEvents(smallXmlWith(dir, "", "")); assertFalse(res.isSuccess()); assertTrue(res.getDetails().contains("Event ID 2 has no market maker"), res.getDetails()); } @@ -117,8 +120,8 @@ class Ex2LoaderTest { {"ex2-event-two-mms.xml", "DUPLICATE_MM"}, }; for (var c : cases) { - assertTrue(loader.load(Path.of("test-data/ex-2/small.xml")).isSuccess()); - var res = loader.load(Path.of("test-data/ex-2/invalid", c[0])); + assertTrue(catalog.loadEvents(Path.of("test-data/ex-2/small.xml")).isSuccess()); + var res = catalog.loadEvents(Path.of("test-data/ex-2/invalid", c[0])); assertFalse(res.isSuccess(), c[0] + " must be rejected"); assertEquals(c[1], res.getMessage(), c[0] + " rejected for the wrong reason: " + res.getDetails()); assertEquals(2, eventRepo.getAll().size(), c[0] + " must not replace the loaded file"); @@ -129,7 +132,7 @@ class Ex2LoaderTest { @Test void testEx1MultipleXmlFailsBecauseV1NotSupported() { var path = Path.of("test-data/ex-1/multiple.xml"); - var res = loader.load(path); + var res = catalog.loadEvents(path); assertFalse(res.isSuccess(), "ex-1 multiple.xml must fail because V1 schema is not supported"); } } diff --git a/service/src/test/java/market/guess/service/Ex3LoaderTest.java b/service/src/test/java/market/guess/service/Ex3LoaderTest.java index 745b1fd..611e396 100644 --- a/service/src/test/java/market/guess/service/Ex3LoaderTest.java +++ b/service/src/test/java/market/guess/service/Ex3LoaderTest.java @@ -12,20 +12,25 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import market.guess.model.event.EventStatus; +import market.guess.service.catalog.LocalCatalogContext; +import market.guess.service.catalog.infrastructure.MarketContext; import market.guess.service.catalog.infrastructure.mapper.v3.EventMapperV3; import market.guess.service.catalog.infrastructure.provider.v3.XMLLoaderV3; import market.guess.service.catalog.infrastructure.provider.v3.XMLValidatorV3; import market.guess.service.catalog.infrastructure.repository.InMemoryEventRepository; +import market.guess.service.catalog.infrastructure.repository.InMemoryUserRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class Ex3LoaderTest { private InMemoryEventRepository eventRepo; + private InMemoryUserRepository userRepo; private XMLLoaderV3 loader; @BeforeEach void setUp() { eventRepo = new InMemoryEventRepository(); + userRepo = new InMemoryUserRepository(); loader = new XMLLoaderV3(eventRepo, new EventMapperV3(), new XMLValidatorV3()); } @@ -70,6 +75,15 @@ class Ex3LoaderTest { assertEquals(4, eventRepo.getAll().size()); } + @Test + void pathLoadsThroughTheCatalogHaveNoUploaderAndAreRefused() { + var catalog = + new LocalCatalogContext(loader, new MarketContext(eventRepo, userRepo), eventRepo); + var res = catalog.loadEvents(Path.of("test-data/ex-3/small.xml")); + assertEquals("INVALID_UPLOADER", res.getMessage()); + assertTrue(eventRepo.getAll().isEmpty()); + } + @Test void collisionRejectsWholeFileAndKeepsMarket() { loader.load(stream(market(lmsr("Rain"))), "a.xml", "alice"); -- cgit v1.2.3