From 5fb92df7442be42bb6bc2ece9360ea311b807920 Mon Sep 17 00:00:00 2001 From: Jonas Waeber Date: Mon, 7 Dec 2020 13:26:54 +0100 Subject: [PATCH] Update dependency --- build.gradle | 2 +- src/test/kotlin/Test.kt | 2 +- src/test/kotlin/TestRecordSets.kt | 4 +- src/test/resources/data/institution/output.nt | 114 +++++++++--------- .../data/institution/turtle-output.ttl | 4 +- .../data/recordSets/integration-turtle.ttl | 4 +- src/test/resources/data/recordSets/output.nt | 2 +- 7 files changed, 65 insertions(+), 67 deletions(-) diff --git a/build.gradle b/build.gradle index 386078e..4a956c5 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ dependencies { // https://mvnrepository.com/artifact/org.elasticsearch.client/elasticsearch-rest-high-level-client //compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: '7.1.0' - implementation 'org.memobase:memobase-service-utilities:2.0.0' + implementation 'org.memobase:memobase-service-utilities:2.0.2' // Logging Framework implementation "org.apache.logging.log4j:log4j-api:${log4jV}" diff --git a/src/test/kotlin/Test.kt b/src/test/kotlin/Test.kt index 681700e..54b0409 100644 --- a/src/test/kotlin/Test.kt +++ b/src/test/kotlin/Test.kt @@ -33,7 +33,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.assertAll -import org.memobase.rdf.NS +import ch.memobase.rdf.NS @TestInstance(TestInstance.Lifecycle.PER_CLASS) class Test { diff --git a/src/test/kotlin/TestRecordSets.kt b/src/test/kotlin/TestRecordSets.kt index 2249296..e7cb758 100644 --- a/src/test/kotlin/TestRecordSets.kt +++ b/src/test/kotlin/TestRecordSets.kt @@ -17,10 +17,10 @@ */ package org.memobase +import ch.memobase.rdf.NS import java.io.File import java.io.FileOutputStream import java.nio.charset.Charset -import java.util.Properties import org.apache.jena.rdf.model.ModelFactory import org.apache.jena.riot.Lang import org.apache.jena.riot.RDFDataMgr @@ -30,13 +30,11 @@ import org.apache.kafka.common.serialization.StringSerializer import org.apache.kafka.streams.TopologyTestDriver import org.apache.kafka.streams.test.ConsumerRecordFactory import org.apache.logging.log4j.LogManager -import org.assertj.core.api.Assertions import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.assertAll import org.memobase.model.RecordSet -import org.memobase.rdf.NS @TestInstance(TestInstance.Lifecycle.PER_CLASS) class TestRecordSets { diff --git a/src/test/resources/data/institution/output.nt b/src/test/resources/data/institution/output.nt index 41e78eb..5149e10 100644 --- a/src/test/resources/data/institution/output.nt +++ b/src/test/resources/data/institution/output.nt @@ -1,65 +1,65 @@ -_:B43792edeX2D6d3dX2D4544X2D97b4X2Dc63b0885018e "municipality" . -_:B43792edeX2D6d3dX2D4544X2D97b4X2Dc63b0885018e "Bern" . -_:B43792edeX2D6d3dX2D4544X2D97b4X2Dc63b0885018e . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 _:B43792edeX2D6d3dX2D4544X2D97b4X2Dc63b0885018e . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 _:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 "46.9531243, 7.434256" . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 "3005" . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 "Helvetiapl. 5" . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 "5" . -_:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 "Helvetiapl." . -_:Ba00402c1X2Db62bX2D4d40X2Da8b7X2D43a7e4038f0e "RadioX" . -_:Ba00402c1X2Db62bX2D4d40X2Da8b7X2D43a7e4038f0e "main" . -_:Ba00402c1X2Db62bX2D4d40X2Da8b7X2D43a7e4038f0e . -_:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 "canton" . -_:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 "http://www.wikidata.org/entity/Q12172" . -_:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 "Basilea Città"@it . -_:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 "Bâle-Ville"@fr . -_:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 "Basel-Stadt"@de . -_:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b _:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b _:Baddb9fc2X2D3871X2D4b34X2Dbbd9X2D60c6bbac6153 . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b "47.5602571, 7.5804113" . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b "4142" . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b "Oslo-Strasse 8" . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b "8" . -_:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b "Oslo-Strasse" . -_:B4b5598f0X2D2c15X2D4896X2D83a9X2Dd8587585e09b "test_radio_x" . -_:B4b5598f0X2D2c15X2D4896X2D83a9X2Dd8587585e09b "oldMemobase" . -_:B4b5598f0X2D2c15X2D4896X2D83a9X2Dd8587585e09b . -_:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d "municipality" . -_:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d "http://www.wikidata.org/entity/Q69030" . -_:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d "Münchenstein"@it . -_:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d "Münchenstein"@fr . -_:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d "Münchenstein"@de . -_:Be6ae0ab7X2D0bb2X2D4eabX2Db01dX2Df435a6a70a5d . -_:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 "canton" . -_:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 "http://www.wikidata.org/entity/Q11911" . -_:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 "Berna"@it . -_:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 "Berne"@fr . -_:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 "Bern"@de . -_:B197f2b61X2Dfb43X2D4352X2D9de2X2Dbd5f47e67319 . + . + "https://mb-wf1.memobase.unibas.ch/sites/default/files/styles/teaser/public/2020-10/1.jpg?itok=5ncVBnVQ" . "http://online-archiv-radiox.com" . - "

Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.

"@de . - _:Bae3f452eX2D9336X2D4df4X2Dbc09X2D1d0de401467b . + . . - _:Bc783c850X2D22a4X2D42f0X2D8331X2D6d76e97bf7a5 . - . + "https://radiox.ch/" . "radiox@test.com" . + "true"^^ . + "

Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.

"@de . "

test_description  (IT)

"@it . - . + "

test_description (FR)

"@fr . + _:B . + _:B . + _:B . + _:B . + "https://memobase.ch/recordSet/RadioX-Kampagnen" . "RadioX"@de . - _:Ba00402c1X2Db62bX2D4d40X2Da8b7X2D43a7e4038f0e . - "https://radiox.ch/" . - _:B4b5598f0X2D2c15X2D4896X2D83a9X2Dd8587585e09b . "Test institution Oana (FR)"@fr . "Test institution Oana (IT)"@it . "memobaseInstitution" . - "true"^^ . - "https://memobase.ch/recordSet/RadioX-Kampagnen" . - "

test_description (FR)

"@fr . - "https://mb-wf1.memobase.unibas.ch/sites/default/files/styles/teaser/public/2020-10/1.jpg?itok=5ncVBnVQ" . \ No newline at end of file +_:B "http://www.wikidata.org/entity/Q11911" . +_:B "http://www.wikidata.org/entity/Q12172" . +_:B "http://www.wikidata.org/entity/Q69030" . +_:B . +_:B . +_:B . +_:B . +_:B . +_:B . +_:B . +_:B . +_:B _:B . +_:B _:B . +_:B _:B . +_:B _:B . +_:B . +_:B . +_:B "3005" . +_:B "4142" . +_:B "46.9531243, 7.434256" . +_:B "47.5602571, 7.5804113" . +_:B "Helvetiapl. 5" . +_:B "Oslo-Strasse 8" . +_:B "Helvetiapl." . +_:B "Oslo-Strasse" . +_:B "5" . +_:B "8" . +_:B "RadioX" . +_:B "test_radio_x" . +_:B "Basel-Stadt"@de . +_:B "Basilea Città"@it . +_:B "Bern" . +_:B "Bern"@de . +_:B "Berna"@it . +_:B "Berne"@fr . +_:B "Bâle-Ville"@fr . +_:B "Münchenstein"@de . +_:B "Münchenstein"@fr . +_:B "Münchenstein"@it . +_:B "canton" . +_:B "canton" . +_:B "main" . +_:B "municipality" . +_:B "municipality" . +_:B "oldMemobase" . \ No newline at end of file diff --git a/src/test/resources/data/institution/turtle-output.ttl b/src/test/resources/data/institution/turtle-output.ttl index 433c332..dad93aa 100644 --- a/src/test/resources/data/institution/turtle-output.ttl +++ b/src/test/resources/data/institution/turtle-output.ttl @@ -1,5 +1,5 @@ @prefix schema: . -@prefix internal: . +@prefix internal: . @prefix mbrs: . @prefix owl: . @prefix wdt: . @@ -23,12 +23,12 @@ @prefix dc: . mbcb:RadioX a rico:CorporateBody ; - internal:isPublished true ; wdt:P18 "https://mb-wf1.memobase.unibas.ch/sites/default/files/styles/teaser/public/2020-10/1.jpg?itok=5ncVBnVQ" ; wdt:P2699 "http://online-archiv-radiox.com" ; wdt:P31 wd:Q327333 , wd:Q166118 ; wdt:P856 "https://radiox.ch/" ; wdt:P968 "radiox@test.com" ; + internal:isPublished true ; rico:descriptiveNote "

Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.

"@de , "

test_description  (IT)

"@it , "

test_description (FR)

"@fr ; rico:hasLocation [ a rico:Place ; wdt:P131 [ a rico:Place ; diff --git a/src/test/resources/data/recordSets/integration-turtle.ttl b/src/test/resources/data/recordSets/integration-turtle.ttl index 9c2d8d5..bac7ae4 100644 --- a/src/test/resources/data/recordSets/integration-turtle.ttl +++ b/src/test/resources/data/recordSets/integration-turtle.ttl @@ -1,5 +1,5 @@ @prefix schema: . -@prefix internal: . +@prefix internal: . @prefix mbrs: . @prefix owl: . @prefix wdt: . @@ -23,9 +23,9 @@ @prefix dc: . mbrs:SNM-Arbeit a rico:RecordSet ; - internal:isPublished true ; rdau:P60451 mbcb:mrv ; wdt:P18 "https://mb-wf1.memobase.unibas.ch/sites/default/files/styles/teaser/public/2020-11/04223.jpg?itok=EfV8jyJQ" ; + internal:isPublished true ; rico:descriptiveNote "Beschreibung test field value"@it , "Beschreibung test field value"@de , "Beschreibung test field value"@fr ; rico:hasLanguage [ a rico:Language ; schema:sameAs "http://www.wikidata.org/entity/Q188" ; diff --git a/src/test/resources/data/recordSets/output.nt b/src/test/resources/data/recordSets/output.nt index 0db402f..3c434c3 100644 --- a/src/test/resources/data/recordSets/output.nt +++ b/src/test/resources/data/recordSets/output.nt @@ -1,7 +1,7 @@ - "true"^^ . . . "https://mb-wf1.memobase.unibas.ch/sites/default/files/styles/teaser/public/2020-11/04223.jpg?itok=EfV8jyJQ" . + "true"^^ . "Beschreibung test field value"@de . "Beschreibung test field value"@fr . "Beschreibung test field value"@it . -- GitLab