diff --git a/build.gradle b/build.gradle index 4f4f00e09ad15734b0c1efc2cef5b120734ed255..5606e8e085b4793a20468ccabea577636ba8c6a8 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ jar { sourceCompatibility = 1.8 targetCompatibility = 1.8 + repositories { jcenter() mavenCentral() @@ -104,7 +105,6 @@ task integrationTest(type: Test) { shouldRunAfter test } - plugins.withType(DistributionPlugin) { distTar { archiveFileName = 'app.tar' diff --git a/src/integrationTest/kotlin/ServiceTest.kt b/src/integrationTest/kotlin/ServiceTest.kt index 8d19a8e05cfc3764ca7b47fb09fadf76c49904be..691fca1f97e06937db774cc08663fd513d4ee96c 100644 --- a/src/integrationTest/kotlin/ServiceTest.kt +++ b/src/integrationTest/kotlin/ServiceTest.kt @@ -17,6 +17,8 @@ */ package org.memobase +import ch.memobase.testing.EmbeddedKafkaExtension +import ch.memobase.testing.EmbeddedSftpServer import com.beust.klaxon.Klaxon import java.io.File import java.io.FileInputStream @@ -41,8 +43,6 @@ import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource -import org.memobase.testing.EmbeddedKafkaExtension -import org.memobase.testing.EmbeddedSftpServer @ExtendWith(EmbeddedKafkaExtension::class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/integrationTest/resources/log4j2.xml b/src/integrationTest/resources/log4j2.xml index 0d593ac00a4ad9731b0c6115a80aa1944a1f48b0..97143d766c9fa432da3d935dc690fd17fc46f7ca 100644 --- a/src/integrationTest/resources/log4j2.xml +++ b/src/integrationTest/resources/log4j2.xml @@ -20,11 +20,11 @@ - + - + diff --git a/src/main/kotlin/Ingester.kt b/src/main/kotlin/Ingester.kt index e6b0ae83c9e49971c9527eac7fd8d244a54e66e8..95f911a6194199972716f65add6931940ae05e49 100644 --- a/src/main/kotlin/Ingester.kt +++ b/src/main/kotlin/Ingester.kt @@ -18,6 +18,9 @@ package org.memobase import ch.memobase.sftp.SftpClient +import java.io.File +import java.io.StringWriter +import java.net.URI import org.apache.jena.rdf.model.Model import org.apache.jena.riot.Lang import org.apache.jena.riot.RDFDataMgr @@ -26,9 +29,6 @@ import org.fcrepo.client.FcrepoOperationFailedException import org.memobase.fedora.FedoraClient import org.memobase.fedora.FedoraTransactionClient import org.memobase.fedora.RdfContentTypes -import java.io.File -import java.io.StringWriter -import java.net.URI class Ingester( private val sftpClient: SftpClient, @@ -48,8 +48,6 @@ class Ingester( val data = recordOutput.toString() fedoraClient.startTransaction().use { transaction -> - log.info("Ingesting record ${recordPair.first}.") - // create placeholders referenced resources: val nonBinaryResources = rdfHandler.getReferencedNonBinaryResources() nonBinaryResources.forEach { resource -> @@ -59,15 +57,17 @@ class Ingester( } // ingest record, instantiations and binaries: + log.info("Ingesting record ${recordPair.first}.") transaction.createOrUpdateRdfResource(URI(recordPair.first), data, RdfContentTypes.NTRIPLES) + log.info("Ingested record ${recordPair.first}.") ingestInstantiations(rdfHandler.getInstantiations(), transaction) val sftpLocators = rdfHandler.getSftpLocators() if (sftpLocators.isNotEmpty()) { ingestBinaries(sftpLocators, rdfHandler, transaction) } transaction.commit() - log.info("Ingested record ${recordPair.first}.") } + log.info("End ingest of message with id $id.") } private fun ingestInstantiations(instantiations: List>, transaction: FedoraTransactionClient) { diff --git a/src/main/kotlin/RdfHandler.kt b/src/main/kotlin/RdfHandler.kt index c6c7f98370d018480bb5972c47582b0c7f1563e6..4f23a57df340584f7b7f1beaa7fda3b235482158 100644 --- a/src/main/kotlin/RdfHandler.kt +++ b/src/main/kotlin/RdfHandler.kt @@ -3,6 +3,7 @@ package org.memobase import ch.memobase.rdf.EBUCORE import ch.memobase.rdf.RDF import ch.memobase.rdf.RICO +import java.io.ByteArrayInputStream import org.apache.jena.rdf.model.Model import org.apache.jena.rdf.model.ModelFactory import org.apache.jena.rdf.model.Statement @@ -12,7 +13,6 @@ import org.apache.jena.riot.Lang import org.apache.jena.riot.RDFDataMgr import org.apache.log4j.LogManager import org.memobase.exceptions.MissingMimeTypeException -import java.io.ByteArrayInputStream class RdfHandler(data: String, private val externalBaseUrl: String) { private val log = LogManager.getLogger("IngestRdfHandler") diff --git a/src/main/kotlin/Values.kt b/src/main/kotlin/ReportMessages.kt similarity index 100% rename from src/main/kotlin/Values.kt rename to src/main/kotlin/ReportMessages.kt diff --git a/src/main/kotlin/Service.kt b/src/main/kotlin/Service.kt index 3f8e819291697c87fc62c30c3eaaa01a9890d274..e694bce54c51c9693ef60dd0b4cc930ac2f6f799 100644 --- a/src/main/kotlin/Service.kt +++ b/src/main/kotlin/Service.kt @@ -22,6 +22,8 @@ import ch.memobase.exceptions.SftpClientException import ch.memobase.reporting.ReportStatus import ch.memobase.settings.SettingsLoader import ch.memobase.sftp.SftpClient +import java.io.Closeable +import java.util.Properties import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger @@ -29,8 +31,6 @@ import org.fcrepo.client.FcrepoOperationFailedException import org.memobase.exceptions.MissingMimeTypeException import org.memobase.fedora.FedoraClient import org.memobase.fedora.FedoraClientImpl -import java.io.Closeable -import java.util.Properties class Service(fileName: String = "app.yml") : Closeable { diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 6db29085d513a446bb9cf9cb787a3d55a1913494..c9c017ec1229ebbc0f4ffa84f99134d6c529dbca 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -20,7 +20,7 @@ - + diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml index 0d593ac00a4ad9731b0c6115a80aa1944a1f48b0..97143d766c9fa432da3d935dc690fd17fc46f7ca 100644 --- a/src/test/resources/log4j2.xml +++ b/src/test/resources/log4j2.xml @@ -20,11 +20,11 @@ - + - +