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. --- .../guess/service/catalog/LocalCatalogContext.java | 19 ++++++++++++++- .../catalog/infrastructure/provider/Loader.java | 7 ++---- .../infrastructure/provider/v1/XMLLoaderV1.java | 28 ++++------------------ .../infrastructure/provider/v2/XMLLoaderV2.java | 28 ++++------------------ .../infrastructure/provider/v3/XMLLoaderV3.java | 4 +++- .../java/market/guess/service/Ex2LoaderTest.java | 25 ++++++++++--------- .../java/market/guess/service/Ex3LoaderTest.java | 14 +++++++++++ 7 files changed, 59 insertions(+), 66 deletions(-) (limited to 'service/src') diff --git a/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java b/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java index d767fd1..12fff3c 100644 --- a/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java +++ b/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java @@ -1,6 +1,8 @@ package market.guess.service.catalog; +import java.io.IOException; import java.math.BigDecimal; +import java.nio.file.Files; import java.nio.file.Path; import java.time.Instant; import java.util.ArrayList; @@ -41,7 +43,22 @@ public final class LocalCatalogContext implements CatalogContext { @Override public Result loadEvents(Path path) { - return provider.load(path); + if (path == null) { + return Result.error("INVALID_PATH", "File path cannot be null."); + } + if (!Files.isRegularFile(path)) { + return Result.error("FILE_NOT_FOUND", "No such file: " + path); + } + if (path.getFileName() == null + || !path.getFileName().toString().toLowerCase().endsWith(".xml")) { + return Result.error("NOT_XML", "The file must have a .xml extension."); + } + + try (var stream = Files.newInputStream(path)) { + return provider.load(stream, path.toString(), null); + } catch (IOException e) { + return Result.error("UNREADABLE", "The file could not be read: " + e.getMessage()); + } } @Override diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java index 62406bb..78e9ef1 100644 --- a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java +++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java @@ -1,12 +1,9 @@ package market.guess.service.catalog.infrastructure.provider; -import java.nio.file.Path; -import market.guess.api.CatalogContext; +import java.io.InputStream; import market.guess.api.LoadResult; import market.guess.api.Result; public interface Loader { - Result seed(CatalogContext context); - - Result load(Path path); + Result load(InputStream in, String source, String owner); } diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v1/XMLLoaderV1.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v1/XMLLoaderV1.java index 44e1c7f..4e93528 100644 --- a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v1/XMLLoaderV1.java +++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v1/XMLLoaderV1.java @@ -2,11 +2,9 @@ package market.guess.service.catalog.infrastructure.provider.v1; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; +import java.io.InputStream; import java.math.BigDecimal; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; -import market.guess.api.CatalogContext; import market.guess.api.LoadResult; import market.guess.api.Result; import market.guess.service.catalog.infrastructure.mapper.v1.EventMapperV1; @@ -43,21 +41,8 @@ public final class XMLLoaderV1 implements Loader { } @Override - public Result load(Path path) { - if (path == null) { - return Result.error("INVALID_PATH", "File path cannot be null."); - } - - if (!Files.isRegularFile(path)) { - return Result.error("FILE_NOT_FOUND", "No such file: " + path); - } - - if (path.getFileName() == null - || !path.getFileName().toString().toLowerCase().endsWith(".xml")) { - return Result.error("NOT_XML", "The file must have a .xml extension."); - } - - try (var stream = Files.newInputStream(path)) { + public Result load(InputStream stream, String source, String owner) { + try { var seed = (GuessMarket) context.createUnmarshaller().unmarshal(stream); var validation = validator.validate(seed); @@ -80,7 +65,7 @@ public final class XMLLoaderV1 implements Loader { userRepository.add(new User("Tester", new BigDecimal("500.00"))); - return Result.ok(new LoadResult(path.toString(), eventRepository.getAll().size())); + return Result.ok(new LoadResult(source, eventRepository.getAll().size())); } catch (JAXBException e) { var cause = e.getLinkedException() != null ? e.getLinkedException().getMessage() : e.getMessage(); @@ -91,9 +76,4 @@ public final class XMLLoaderV1 implements Loader { return Result.error("UNREADABLE", "The file could not be read: " + e.getMessage()); } } - - @Override - public Result seed(CatalogContext context) { - throw new UnsupportedOperationException("Unimplemented method 'seed'"); - } } diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java index 7ca141f..1000e6e 100644 --- a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java +++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v2/XMLLoaderV2.java @@ -2,13 +2,11 @@ package market.guess.service.catalog.infrastructure.provider.v2; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; +import java.io.InputStream; import java.math.BigDecimal; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import market.guess.api.CatalogContext; import market.guess.api.LoadResult; import market.guess.api.Result; import market.guess.service.catalog.infrastructure.mapper.v2.EventMapperV2; @@ -45,21 +43,8 @@ public final class XMLLoaderV2 implements Loader { } @Override - public Result load(Path path) { - if (path == null) { - return Result.error("INVALID_PATH", "File path cannot be null."); - } - - if (!Files.isRegularFile(path)) { - return Result.error("FILE_NOT_FOUND", "No such file: " + path); - } - - if (path.getFileName() == null - || !path.getFileName().toString().toLowerCase().endsWith(".xml")) { - return Result.error("NOT_XML", "The file must have a .xml extension."); - } - - try (var stream = Files.newInputStream(path)) { + public Result load(InputStream stream, String source, String owner) { + try { var seed = (GuessMarket) contextV2.createUnmarshaller().unmarshal(stream); var validation = validatorV2.validate(seed); @@ -100,7 +85,7 @@ public final class XMLLoaderV2 implements Loader { eventRepository.add(e); } - return Result.ok(new LoadResult(path.toString(), eventRepository.getAll().size())); + return Result.ok(new LoadResult(source, eventRepository.getAll().size())); } catch (JAXBException e) { var cause = e.getLinkedException() != null ? e.getLinkedException().getMessage() : e.getMessage(); @@ -111,9 +96,4 @@ public final class XMLLoaderV2 implements Loader { return Result.error("UNREADABLE", "The file could not be read: " + e.getMessage()); } } - - @Override - public Result seed(CatalogContext context) { - throw new UnsupportedOperationException("Unimplemented method 'seed'"); - } } diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v3/XMLLoaderV3.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v3/XMLLoaderV3.java index 59aa3ad..bf17f23 100644 --- a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v3/XMLLoaderV3.java +++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v3/XMLLoaderV3.java @@ -9,11 +9,12 @@ import javax.xml.stream.XMLStreamException; import market.guess.api.LoadResult; import market.guess.api.Result; import market.guess.service.catalog.infrastructure.mapper.v3.EventMapperV3; +import market.guess.service.catalog.infrastructure.provider.Loader; import market.guess.service.catalog.infrastructure.repository.EventRepository; import market.guess.service.catalog.model.v3.GMEvent; import market.guess.service.catalog.model.v3.GuessMarket; -public final class XMLLoaderV3 { +public final class XMLLoaderV3 implements Loader { private final JAXBContext contextV3; private final XMLInputFactory xmlInput; private final EventRepository eventRepository; @@ -35,6 +36,7 @@ public final class XMLLoaderV3 { xmlInput.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); } + @Override public synchronized Result load(InputStream in, String source, String uploader) { if (in == null) { return Result.error("INVALID_INPUT", "No file content was provided."); 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