diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/Vocabulary.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/Vocabulary.scala deleted file mode 100644 index 386f31b707..0000000000 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/Vocabulary.scala +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright © 2021 - 2024 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors. - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.knora.webapi.slice.admin.repo.rdf - -import org.eclipse.rdf4j.model.Namespace -import org.eclipse.rdf4j.model.impl.SimpleNamespace -import org.eclipse.rdf4j.sparqlbuilder.rdf.Iri -import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf - -import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixExpansion -import org.knora.webapi.messages.OntologyConstants.KnoraBase.KnoraBasePrefixExpansion -import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph -import org.knora.webapi.slice.admin.AdminConstants.permissionsDataNamedGraph - -object Vocabulary { - object KnoraAdmin { - val NS: Namespace = new SimpleNamespace("knora-admin", KnoraAdminPrefixExpansion) - - // resource class IRIs - val User: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "User") - val UserGroup: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "UserGroup") - val KnoraProject: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "knoraProject") - - // property IRIs - val username: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "username") - val email: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "email") - val givenName: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "givenName") - val familyName: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "familyName") - val status: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "status") - val preferredLanguage: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "preferredLanguage") - val password: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "password") - val isInProject: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "isInProject") - val isInGroup: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "isInGroup") - val isInSystemAdminGroup: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "isInSystemAdminGroup") - val isInProjectAdminGroup: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "isInProjectAdminGroup") - val hasSelfJoinEnabled: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "hasSelfJoinEnabled") - - // user group properties - val belongsToProject: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "belongsToProject") - val groupName: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "groupName") - val groupDescriptions: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "groupDescriptions") - - // project properties - val projectRestrictedViewSize: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectRestrictedViewSize") - val projectRestrictedViewWatermark: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectRestrictedViewWatermark") - val projectDescription: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectDescription") - val projectKeyword: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectKeyword") - val projectLogo: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectLogo") - val projectLongname: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectLongname") - val projectShortcode: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectShortcode") - val projectShortname: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "projectShortname") - - // permission properties - val AdministrativePermission: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "AdministrativePermission") - val DefaultObjectAccessPermission: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "DefaultObjectAccessPermission") - val forProject: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "forProject") - val forGroup: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "forGroup") - val forProperty: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "forProperty") - val forResourceClass: Iri = Rdf.iri(KnoraAdminPrefixExpansion, "forResourceClass") - } - - object KnoraBase { - val NS: Namespace = new SimpleNamespace("knora-base", KnoraBasePrefixExpansion) - - val hasPermissions: Iri = Rdf.iri(KnoraBasePrefixExpansion, "hasPermissions") - } - - object NamedGraphs { - val dataAdmin: Iri = Rdf.iri(adminDataNamedGraph.value) - val dataPermissions: Iri = Rdf.iri(permissionsDataNamedGraph.value) - } -} diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala index a5c7628875..7bf21ce72d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AbstractEntityRepo.scala @@ -23,10 +23,10 @@ import zio.Task import zio.ZIO import zio.stream.ZStream -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.common.Value.StringValue import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.slice.common.repo.service.CrudRepository import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Construct diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala index 3300ac4075..c3c09c6a46 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLive.scala @@ -30,10 +30,10 @@ import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.model.Permission.Administrative import org.knora.webapi.slice.admin.domain.model.PermissionIri import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.errors.TriplestoreResponseException diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLive.scala index df5fdab531..f2cbc42e0f 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLive.scala @@ -33,10 +33,10 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.Permission import org.knora.webapi.slice.admin.domain.model.PermissionIri import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.api.TriplestoreService diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala index 6ad88ae66e..986e69f0fc 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala @@ -27,11 +27,11 @@ import org.knora.webapi.slice.admin.domain.model.KnoraGroup.Conversions.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.service.KnoraGroupRepo import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.projectIriConverter -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary.KnoraAdmin.* import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource +import org.knora.webapi.slice.common.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary.KnoraAdmin.* import org.knora.webapi.store.triplestore.api.TriplestoreService final case class KnoraGroupRepoLive( diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala index 7b7a162f2a..045cc486a4 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraProjectRepoLive.scala @@ -19,9 +19,9 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView import org.knora.webapi.slice.admin.domain.service.KnoraProjectRepo import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.store.triplestore.api.TriplestoreService final case class KnoraProjectRepoLive( diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala index 36935a5c17..7bfb37fa74 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLive.scala @@ -32,10 +32,10 @@ import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username import org.knora.webapi.slice.admin.domain.service.KnoraUserRepo import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.* -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary.KnoraAdmin.* import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError import org.knora.webapi.slice.common.repo.rdf.RdfResource +import org.knora.webapi.slice.common.repo.rdf.Vocabulary.KnoraAdmin.* import org.knora.webapi.store.triplestore.api.TriplestoreService final case class KnoraUserRepoLive( diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/Vocabulary.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/Vocabulary.scala index 26bcaea090..759a8bc58d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/Vocabulary.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/Vocabulary.scala @@ -7,68 +7,125 @@ package org.knora.webapi.slice.common.repo.rdf import org.eclipse.rdf4j.model.Namespace import org.eclipse.rdf4j.model.impl.SimpleNamespace +import org.eclipse.rdf4j.sparqlbuilder.rdf.Iri +import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf.iri +import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixExpansion +import org.knora.webapi.messages.OntologyConstants.KnoraBase.KnoraBasePrefixExpansion +import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph +import org.knora.webapi.slice.admin.AdminConstants.permissionsDataNamedGraph + object Vocabulary { + object KnoraAdmin { + private val ka = KnoraAdminPrefixExpansion + val NS: Namespace = new SimpleNamespace("knora-admin", KnoraAdminPrefixExpansion) + + // resource class IRIs + val User: Iri = Rdf.iri(ka, "User") + val UserGroup: Iri = Rdf.iri(ka, "UserGroup") + val KnoraProject: Iri = Rdf.iri(ka, "knoraProject") + + // property IRIs + val username: Iri = Rdf.iri(ka, "username") + val email: Iri = Rdf.iri(ka, "email") + val givenName: Iri = Rdf.iri(ka, "givenName") + val familyName: Iri = Rdf.iri(ka, "familyName") + val status: Iri = Rdf.iri(ka, "status") + val preferredLanguage: Iri = Rdf.iri(ka, "preferredLanguage") + val password: Iri = Rdf.iri(ka, "password") + val isInProject: Iri = Rdf.iri(ka, "isInProject") + val isInGroup: Iri = Rdf.iri(ka, "isInGroup") + val isInSystemAdminGroup: Iri = Rdf.iri(ka, "isInSystemAdminGroup") + val isInProjectAdminGroup: Iri = Rdf.iri(ka, "isInProjectAdminGroup") + val hasSelfJoinEnabled: Iri = Rdf.iri(ka, "hasSelfJoinEnabled") + + // user group properties + val belongsToProject: Iri = Rdf.iri(ka, "belongsToProject") + val groupName: Iri = Rdf.iri(ka, "groupName") + val groupDescriptions: Iri = Rdf.iri(ka, "groupDescriptions") + + // project properties + val projectRestrictedViewSize: Iri = Rdf.iri(ka, "projectRestrictedViewSize") + val projectRestrictedViewWatermark: Iri = Rdf.iri(ka, "projectRestrictedViewWatermark") + val projectDescription: Iri = Rdf.iri(ka, "projectDescription") + val projectKeyword: Iri = Rdf.iri(ka, "projectKeyword") + val projectLogo: Iri = Rdf.iri(ka, "projectLogo") + val projectLongname: Iri = Rdf.iri(ka, "projectLongname") + val projectShortcode: Iri = Rdf.iri(ka, "projectShortcode") + val projectShortname: Iri = Rdf.iri(ka, "projectShortname") + + // permission properties + val AdministrativePermission: Iri = Rdf.iri(ka, "AdministrativePermission") + val DefaultObjectAccessPermission: Iri = Rdf.iri(ka, "DefaultObjectAccessPermission") + val forProject: Iri = Rdf.iri(ka, "forProject") + val forGroup: Iri = Rdf.iri(ka, "forGroup") + val forProperty: Iri = Rdf.iri(ka, "forProperty") + val forResourceClass: Iri = Rdf.iri(ka, "forResourceClass") + } object KnoraBase { - private val kb = "http://www.knora.org/ontology/knora-base#" + private val kb = KnoraBasePrefixExpansion val NS: Namespace = new SimpleNamespace("knora-base", kb) - val linkValue = iri(kb + "LinkValue") - - val isDeleted = iri(kb + "isDeleted") - val attachedToUser = iri(kb + "attachedToUser") - val attachedToProject = iri(kb + "attachedToProject") - val hasPermissions = iri(kb + "hasPermissions") - val creationDate = iri(kb + "creationDate") - - val valueHasString = iri(kb + "valueHasString") - val valueHasUUID = iri(kb + "valueHasUUID") - val valueHasComment = iri(kb + "valueHasComment") - val valueHasOrder = iri(kb + "valueHasOrder") - val valueCreationDate = iri(kb + "valueCreationDate") - - val valueHasInteger = iri(kb + "valueHasInteger") - val valueHasBoolean = iri(kb + "valueHasBoolean") - val valueHasDecimal = iri(kb + "valueHasDecimal") - val valueHasUri = iri(kb + "valueHasUri") - val valueHasStartJDN = iri(kb + "valueHasStartJDN") - val valueHasEndJDN = iri(kb + "valueHasEndJDN") - val valueHasStartPrecision = iri(kb + "valueHasStartPrecision") - val valueHasEndPrecision = iri(kb + "valueHasEndPrecision") - val valueHasCalendar = iri(kb + "valueHasCalendar") - val valueHasColor = iri(kb + "valueHasColor") - val valueHasGeometry = iri(kb + "valueHasGeometry") - val valueHasListNode = iri(kb + "valueHasListNode") - val valueHasIntervalStart = iri(kb + "valueHasIntervalStart") - val valueHasIntervalEnd = iri(kb + "valueHasIntervalEnd") - val valueHasTimeStamp = iri(kb + "valueHasTimeStamp") - val valueHasGeonameCode = iri(kb + "valueHasGeonameCode") - val valueHasRefCount = iri(kb + "valueHasRefCount") - val valueHasLanguage = iri(kb + "valueHasLanguage") - val valueHasMapping = iri(kb + "valueHasMapping") - val valueHasMaxStandoffStartIndex = iri(kb + "valueHasMaxStandoffStartIndex") - val valueHasStandoff = iri(kb + "valueHasStandoff") - - val internalFilename = iri(kb + "internalFilename") - val internalMimeType = iri(kb + "internalMimeType") - val originalFilename = iri(kb + "originalFilename") - val originalMimeType = iri(kb + "originalMimeType") - val dimX = iri(kb + "dimX") - val dimY = iri(kb + "dimY") - val externalUrl = iri(kb + "externalUrl") - val pageCount = iri(kb + "pageCount") - - val standoffTagHasStartIndex = iri(kb + "standoffTagHasStartIndex") - val standoffTagHasEndIndex = iri(kb + "standoffTagHasEndIndex") - val standoffTagHasStartParent = iri(kb + "standoffTagHasStartParent") - val standoffTagHasEndParent = iri(kb + "standoffTagHasEndParent") - val standoffTagHasOriginalXMLID = iri(kb + "standoffTagHasOriginalXMLID") - val standoffTagHasUUID = iri(kb + "standoffTagHasUUID") - val standoffTagHasStart = iri(kb + "standoffTagHasStart") - val standoffTagHasEnd = iri(kb + "standoffTagHasEnd") + val linkValue: Iri = iri(kb + "LinkValue") + + val isDeleted: Iri = iri(kb + "isDeleted") + val attachedToUser: Iri = iri(kb + "attachedToUser") + val attachedToProject: Iri = iri(kb + "attachedToProject") + val hasPermissions: Iri = iri(kb + "hasPermissions") + val creationDate: Iri = iri(kb + "creationDate") + + val valueHasString: Iri = iri(kb + "valueHasString") + val valueHasUUID: Iri = iri(kb + "valueHasUUID") + val valueHasComment: Iri = iri(kb + "valueHasComment") + val valueHasOrder: Iri = iri(kb + "valueHasOrder") + val valueCreationDate: Iri = iri(kb + "valueCreationDate") + + val valueHasInteger: Iri = iri(kb + "valueHasInteger") + val valueHasBoolean: Iri = iri(kb + "valueHasBoolean") + val valueHasDecimal: Iri = iri(kb + "valueHasDecimal") + val valueHasUri: Iri = iri(kb + "valueHasUri") + val valueHasStartJDN: Iri = iri(kb + "valueHasStartJDN") + val valueHasEndJDN: Iri = iri(kb + "valueHasEndJDN") + val valueHasStartPrecision: Iri = iri(kb + "valueHasStartPrecision") + val valueHasEndPrecision: Iri = iri(kb + "valueHasEndPrecision") + val valueHasCalendar: Iri = iri(kb + "valueHasCalendar") + val valueHasColor: Iri = iri(kb + "valueHasColor") + val valueHasGeometry: Iri = iri(kb + "valueHasGeometry") + val valueHasListNode: Iri = iri(kb + "valueHasListNode") + val valueHasIntervalStart: Iri = iri(kb + "valueHasIntervalStart") + val valueHasIntervalEnd: Iri = iri(kb + "valueHasIntervalEnd") + val valueHasTimeStamp: Iri = iri(kb + "valueHasTimeStamp") + val valueHasGeonameCode: Iri = iri(kb + "valueHasGeonameCode") + val valueHasRefCount: Iri = iri(kb + "valueHasRefCount") + val valueHasLanguage: Iri = iri(kb + "valueHasLanguage") + val valueHasMapping: Iri = iri(kb + "valueHasMapping") + val valueHasMaxStandoffStartIndex: Iri = iri(kb + "valueHasMaxStandoffStartIndex") + val valueHasStandoff: Iri = iri(kb + "valueHasStandoff") + + val internalFilename: Iri = iri(kb + "internalFilename") + val internalMimeType: Iri = iri(kb + "internalMimeType") + val originalFilename: Iri = iri(kb + "originalFilename") + val originalMimeType: Iri = iri(kb + "originalMimeType") + val dimX: Iri = iri(kb + "dimX") + val dimY: Iri = iri(kb + "dimY") + val externalUrl: Iri = iri(kb + "externalUrl") + val pageCount: Iri = iri(kb + "pageCount") + + val standoffTagHasStartIndex: Iri = iri(kb + "standoffTagHasStartIndex") + val standoffTagHasEndIndex: Iri = iri(kb + "standoffTagHasEndIndex") + val standoffTagHasStartParent: Iri = iri(kb + "standoffTagHasStartParent") + val standoffTagHasEndParent: Iri = iri(kb + "standoffTagHasEndParent") + val standoffTagHasOriginalXMLID: Iri = iri(kb + "standoffTagHasOriginalXMLID") + val standoffTagHasUUID: Iri = iri(kb + "standoffTagHasUUID") + val standoffTagHasStart: Iri = iri(kb + "standoffTagHasStart") + val standoffTagHasEnd: Iri = iri(kb + "standoffTagHasEnd") + } + object NamedGraphs { + val dataAdmin: Iri = Rdf.iri(adminDataNamedGraph.value) + val dataPermissions: Iri = Rdf.iri(permissionsDataNamedGraph.value) } } diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala index a94dc1dd56..181eb79aa1 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3110.scala @@ -13,7 +13,7 @@ import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixExpansion import org.knora.webapi.slice.admin.AdminConstants -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.store.triplestore.upgrade.GraphsForMigration import org.knora.webapi.store.triplestore.upgrade.MigrateSpecificGraphs diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala index d746ca1f7b..63a2b80100 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3111.scala @@ -11,7 +11,7 @@ import org.eclipse.rdf4j.sparqlbuilder.core.query.ModifyQuery import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.slice.admin.AdminConstants -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.store.triplestore.upgrade.GraphsForMigration import org.knora.webapi.store.triplestore.upgrade.MigrateSpecificGraphs diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala index a15ec073e7..1ed6999456 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR3112.scala @@ -12,7 +12,7 @@ import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf import org.knora.webapi.slice.admin.AdminConstants import org.knora.webapi.slice.admin.domain.model.RestrictedView.Size -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.store.triplestore.upgrade.GraphsForMigration import org.knora.webapi.store.triplestore.upgrade.MigrateSpecificGraphs diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLiveSpec.scala index fed05be65f..82e93e9a96 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/AdministrativePermissionRepoLiveSpec.scala @@ -23,7 +23,7 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode import org.knora.webapi.slice.admin.domain.model.Permission.Administrative.* import org.knora.webapi.slice.admin.domain.model.PermissionIri -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreServiceInMemory diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLiveSpec.scala index cbe5e1a1e1..49a52b3edf 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLiveSpec.scala @@ -25,7 +25,7 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode import org.knora.webapi.slice.admin.domain.model.Permission.ObjectAccess.* import org.knora.webapi.slice.admin.domain.model.PermissionIri -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.slice.resourceinfo.domain.InternalIri import org.knora.webapi.store.triplestore.api.TriplestoreService import org.knora.webapi.store.triplestore.api.TriplestoreServiceInMemory diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala index c87e4afca8..2ec6065775 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/repo/service/KnoraUserRepoLiveSpec.scala @@ -37,7 +37,7 @@ import org.knora.webapi.slice.admin.domain.model.UserIri import org.knora.webapi.slice.admin.domain.model.UserStatus import org.knora.webapi.slice.admin.domain.model.Username import org.knora.webapi.slice.admin.domain.service.* -import org.knora.webapi.slice.admin.repo.rdf.Vocabulary +import org.knora.webapi.slice.common.repo.rdf.Vocabulary import org.knora.webapi.slice.infrastructure.CacheManager import org.knora.webapi.store.triplestore.api.TestTripleStore import org.knora.webapi.store.triplestore.api.TriplestoreService