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 +++- 5 files changed, 31 insertions(+), 55 deletions(-) (limited to 'service/src/main/java/market/guess') 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."); -- cgit v1.2.3