Move key batches handler (#173)

* Move key batches handler

* Remove deleted modules

* Co-locate overloaded methods

Author: brinxmat

bulk-export/src/main/java/no/sikt/nva/data/report/api/export/CsvTransformer.java

@@ -63,6 +63,11 @@ protected void persist(List<ContentWithLocation> transformedData) {
         transformedData.forEach(this::persist);
     }
 
+    private void persist(ContentWithLocation transformation) {
+        var request = buildRequest(transformation.location());
+        s3OutputClient.putObject(request, RequestBody.fromString(transformation.content()));
+    }
+
     private static Model createModelAndLoadInput(Stream<JsonNode> jsonNodeStream) {
         var model = ModelFactory.createDefaultModel();
         jsonNodeStream.forEach(jsonNode -> RDFDataMgr.read(model, stringToStream(jsonNode.toString()), Lang.JSONLD));
@@ -86,11 +91,6 @@ private List<ContentWithLocation> transformResources(Model model) {
                    .toList();
     }
 
-    private void persist(ContentWithLocation transformation) {
-        var request = buildRequest(transformation.location());
-        s3OutputClient.putObject(request, RequestBody.fromString(transformation.content()));
-    }
-
     private ContentWithLocation transform(Model model, ReportType reportType) {
         var resultSet = new ModelQueryService().query(model, reportType);
         var formatted = new CsvFormatter().format(resultSet);

bulk-load/src/main/java/no/sikt/nva/data/report/api/etl/transformer/GenerateKeyBatchesHandler.java renamed to bulk-export/src/main/java/no/sikt/nva/data/report/api/export/GenerateKeyBatchesHandler.java

@@ -1,4 +1,4 @@
-package no.sikt.nva.data.report.api.etl.transformer;
+package no.sikt.nva.data.report.api.export;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.nonNull;

bulk-load/src/main/java/no/sikt/nva/data/report/api/etl/transformer/KeyBatchRequestEvent.java renamed to bulk-export/src/main/java/no/sikt/nva/data/report/api/export/KeyBatchRequestEvent.java

@@ -1,4 +1,4 @@
-package no.sikt.nva.data.report.api.etl.transformer;
+package no.sikt.nva.data.report.api.export;
 
 import static java.util.Objects.nonNull;
 import com.fasterxml.jackson.annotation.JsonCreator;

bulk-load/src/test/java/no/sikt/nva/data/report/api/etl/transformer/GenerateKeyBatchesHandlerTest.java renamed to bulk-export/src/test/java/no/sikt/nva/data/report/api/export/GenerateKeyBatchesHandlerTest.java

@@ -1,4 +1,4 @@
-package no.sikt.nva.data.report.api.etl.transformer;
+package no.sikt.nva.data.report.api.export;
 
 import static no.unit.nva.testutils.RandomDataGenerator.randomString;
 import static nva.commons.core.attempt.Try.attempt;
@@ -21,6 +21,7 @@
 import no.unit.nva.s3.S3Driver;
 import no.unit.nva.stubs.FakeS3Client;
 import nva.commons.core.SingletonCollector;
+import nva.commons.core.attempt.Try;
 import nva.commons.core.ioutils.IoUtils;
 import nva.commons.core.paths.UnixPath;
 import nva.commons.core.paths.UriWrapper;
@@ -174,7 +175,7 @@ private KeyBatchRequestEvent saveContainedEvent(PutEventsRequest putEventsReques
             PutEventsRequestEntry eventEntry = putEventsRequest.entries()
                                                    .stream()
                                                    .collect(SingletonCollector.collect());
-            return attempt(eventEntry::detail).map(
+            return Try.attempt(eventEntry::detail).map(
                 jsonString -> objectMapperWithEmpty.readValue(jsonString, KeyBatchRequestEvent.class)).orElseThrow();
         }
     }