diff --git a/build.sbt b/build.sbt index 1d9db6bc83..29b6c5f596 100644 --- a/build.sbt +++ b/build.sbt @@ -201,7 +201,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) ), buildInfoPackage := "org.knora.webapi.http.version" ) - .dependsOn(valueObjects) + .dependsOn(shared) lazy val webapiJavaRunOptions = Seq( // "-showversion", @@ -284,10 +284,10 @@ lazy val schemaRepoSearchService = project ) .dependsOn(schemaRepo) -lazy val valueObjects = project - .in(file("dsp-value-objects")) +lazy val shared = project + .in(file("dsp-shared")) .settings( - name := "valueObjects", - libraryDependencies ++= Dependencies.valueObjectsLibraryDependencies, + name := "shared", + libraryDependencies ++= Dependencies.sharedLibraryDependencies, testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")) ) diff --git a/webapi/src/main/scala/org/knora/webapi/exceptions/Exceptions.scala b/dsp-shared/src/main/scala/dsp/errors/Errors.scala similarity index 99% rename from webapi/src/main/scala/org/knora/webapi/exceptions/Exceptions.scala rename to dsp-shared/src/main/scala/dsp/errors/Errors.scala index 7eb129937f..202d0202e6 100644 --- a/webapi/src/main/scala/org/knora/webapi/exceptions/Exceptions.scala +++ b/dsp-shared/src/main/scala/dsp/errors/Errors.scala @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.knora.webapi.exceptions +package dsp.errors import akka.event.LoggingAdapter import org.apache.commons.lang3.SerializationException diff --git a/dsp-value-objects/src/main/scala/dsp/valueobjects/Group.scala b/dsp-shared/src/main/scala/dsp/valueobjects/Group.scala similarity index 89% rename from dsp-value-objects/src/main/scala/dsp/valueobjects/Group.scala rename to dsp-shared/src/main/scala/dsp/valueobjects/Group.scala index d0672b6705..c6a0336df7 100644 --- a/dsp-value-objects/src/main/scala/dsp/valueobjects/Group.scala +++ b/dsp-shared/src/main/scala/dsp/valueobjects/Group.scala @@ -6,6 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation +import dsp.errors.BadRequestException object Group { @@ -16,12 +17,12 @@ object Group { object GroupName { self => def make(value: String): Validation[Throwable, GroupName] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(GroupErrorMessages.GroupNameMissing)) + Validation.fail(BadRequestException(GroupErrorMessages.GroupNameMissing)) } else { val validatedValue = Validation( V2IriValidation.toSparqlEncodedString( value, - throw V2.BadRequestException(GroupErrorMessages.GroupNameInvalid) + throw BadRequestException(GroupErrorMessages.GroupNameInvalid) ) ) @@ -42,13 +43,13 @@ object Group { object GroupDescriptions { self => def make(value: Seq[V2.StringLiteralV2]): Validation[Throwable, GroupDescriptions] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(GroupErrorMessages.GroupDescriptionsMissing)) + Validation.fail(BadRequestException(GroupErrorMessages.GroupDescriptionsMissing)) } else { val validatedDescriptions = Validation(value.map { description => val validatedDescription = V2IriValidation.toSparqlEncodedString( description.value, - throw V2.BadRequestException(GroupErrorMessages.GroupDescriptionsInvalid) + throw BadRequestException(GroupErrorMessages.GroupDescriptionsInvalid) ) V2.StringLiteralV2(value = validatedDescription, language = description.language) }) diff --git a/dsp-value-objects/src/main/scala/dsp/valueobjects/Iri.scala b/dsp-shared/src/main/scala/dsp/valueobjects/Iri.scala similarity index 76% rename from dsp-value-objects/src/main/scala/dsp/valueobjects/Iri.scala rename to dsp-shared/src/main/scala/dsp/valueobjects/Iri.scala index 88c9d0fe0c..60323c1c59 100644 --- a/dsp-value-objects/src/main/scala/dsp/valueobjects/Iri.scala +++ b/dsp-shared/src/main/scala/dsp/valueobjects/Iri.scala @@ -6,6 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation +import dsp.errors.BadRequestException sealed trait Iri object Iri { @@ -17,17 +18,17 @@ object Iri { object GroupIri { self => def make(value: String): Validation[Throwable, GroupIri] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(IriErrorMessages.GroupIriMissing)) + Validation.fail(BadRequestException(IriErrorMessages.GroupIriMissing)) } else { val isUuid: Boolean = V2UuidValidation.hasUuidLength(value.split("/").last) if (!V2IriValidation.isKnoraGroupIriStr(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.GroupIriInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.GroupIriInvalid)) } else if (isUuid && !V2UuidValidation.isUuidVersion4Or5(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.UuidVersionInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.UuidVersionInvalid)) } else { val validatedValue = Validation( - V2IriValidation.validateAndEscapeIri(value, throw V2.BadRequestException(IriErrorMessages.GroupIriInvalid)) + V2IriValidation.validateAndEscapeIri(value, throw BadRequestException(IriErrorMessages.GroupIriInvalid)) ) validatedValue.map(new GroupIri(_) {}) @@ -48,19 +49,19 @@ object Iri { object ListIri { self => def make(value: String): Validation[Throwable, ListIri] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(IriErrorMessages.ListIriMissing)) + Validation.fail(BadRequestException(IriErrorMessages.ListIriMissing)) } else { val isUuid: Boolean = V2UuidValidation.hasUuidLength(value.split("/").last) if (!V2IriValidation.isKnoraListIriStr(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.ListIriInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.ListIriInvalid)) } else if (isUuid && !V2UuidValidation.isUuidVersion4Or5(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.UuidVersionInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.UuidVersionInvalid)) } else { val validatedValue = Validation( V2IriValidation.validateAndEscapeIri( value, - throw V2.BadRequestException(IriErrorMessages.ListIriInvalid) + throw BadRequestException(IriErrorMessages.ListIriInvalid) ) ) @@ -82,19 +83,19 @@ object Iri { object ProjectIri { self => def make(value: String): Validation[Throwable, ProjectIri] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(IriErrorMessages.ProjectIriMissing)) + Validation.fail(BadRequestException(IriErrorMessages.ProjectIriMissing)) } else { val isUuid: Boolean = V2UuidValidation.hasUuidLength(value.split("/").last) if (!V2IriValidation.isKnoraProjectIriStr(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.ProjectIriInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.ProjectIriInvalid)) } else if (isUuid && !V2UuidValidation.isUuidVersion4Or5(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.UuidVersionInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.UuidVersionInvalid)) } else { val validatedValue = Validation( V2IriValidation.validateAndEscapeProjectIri( value, - throw V2.BadRequestException(IriErrorMessages.ProjectIriInvalid) + throw BadRequestException(IriErrorMessages.ProjectIriInvalid) ) ) @@ -116,19 +117,19 @@ object Iri { object UserIri { self => def make(value: String): Validation[Throwable, UserIri] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(IriErrorMessages.UserIriMissing)) + Validation.fail(BadRequestException(IriErrorMessages.UserIriMissing)) } else { val isUuid: Boolean = V2UuidValidation.hasUuidLength(value.split("/").last) if (!V2IriValidation.isKnoraUserIriStr(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.UserIriInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.UserIriInvalid)) } else if (isUuid && !V2UuidValidation.isUuidVersion4Or5(value)) { - Validation.fail(V2.BadRequestException(IriErrorMessages.UuidVersionInvalid)) + Validation.fail(BadRequestException(IriErrorMessages.UuidVersionInvalid)) } else { val validatedValue = Validation( V2IriValidation.validateAndEscapeUserIri( value, - throw V2.BadRequestException(IriErrorMessages.UserIriInvalid) + throw BadRequestException(IriErrorMessages.UserIriInvalid) ) ) diff --git a/dsp-value-objects/src/main/scala/dsp/valueobjects/List.scala b/dsp-shared/src/main/scala/dsp/valueobjects/List.scala similarity index 86% rename from dsp-value-objects/src/main/scala/dsp/valueobjects/List.scala rename to dsp-shared/src/main/scala/dsp/valueobjects/List.scala index 6a666be84f..cd366b03f7 100644 --- a/dsp-value-objects/src/main/scala/dsp/valueobjects/List.scala +++ b/dsp-shared/src/main/scala/dsp/valueobjects/List.scala @@ -6,6 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation +import dsp.errors.BadRequestException object List { @@ -16,10 +17,10 @@ object List { object ListName { self => def make(value: String): Validation[Throwable, ListName] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ListErrorMessages.ListNameMissing)) + Validation.fail(BadRequestException(ListErrorMessages.ListNameMissing)) } else { val validatedValue = Validation( - V2IriValidation.toSparqlEncodedString(value, throw V2.BadRequestException(ListErrorMessages.ListNameInvalid)) + V2IriValidation.toSparqlEncodedString(value, throw BadRequestException(ListErrorMessages.ListNameInvalid)) ) validatedValue.map(new ListName(_) {}) @@ -39,7 +40,7 @@ object List { object Position { self => def make(value: Int): Validation[Throwable, Position] = if (value < -1) { - Validation.fail(V2.BadRequestException(ListErrorMessages.InvalidPosition)) + Validation.fail(BadRequestException(ListErrorMessages.InvalidPosition)) } else { Validation.succeed(new Position(value) {}) } @@ -58,13 +59,13 @@ object List { object Labels { self => def make(value: Seq[V2.StringLiteralV2]): Validation[Throwable, Labels] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ListErrorMessages.LabelsMissing)) + Validation.fail(BadRequestException(ListErrorMessages.LabelsMissing)) } else { val validatedLabels = Validation(value.map { label => val validatedLabel = V2IriValidation.toSparqlEncodedString( label.value, - throw V2.BadRequestException(ListErrorMessages.LabelsInvalid) + throw BadRequestException(ListErrorMessages.LabelsInvalid) ) V2.StringLiteralV2(value = validatedLabel, language = label.language) }) @@ -86,13 +87,13 @@ object List { object Comments { self => def make(value: Seq[V2.StringLiteralV2]): Validation[Throwable, Comments] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ListErrorMessages.CommentsMissing)) + Validation.fail(BadRequestException(ListErrorMessages.CommentsMissing)) } else { val validatedComments = Validation(value.map { comment => val validatedComment = V2IriValidation.toSparqlEncodedString( comment.value, - throw V2.BadRequestException(ListErrorMessages.CommentsInvalid) + throw BadRequestException(ListErrorMessages.CommentsInvalid) ) V2.StringLiteralV2(value = validatedComment, language = comment.language) }) diff --git a/dsp-value-objects/src/main/scala/dsp/valueobjects/Project.scala b/dsp-shared/src/main/scala/dsp/valueobjects/Project.scala similarity index 88% rename from dsp-value-objects/src/main/scala/dsp/valueobjects/Project.scala rename to dsp-shared/src/main/scala/dsp/valueobjects/Project.scala index 7cb062e608..61512ebbac 100644 --- a/dsp-value-objects/src/main/scala/dsp/valueobjects/Project.scala +++ b/dsp-shared/src/main/scala/dsp/valueobjects/Project.scala @@ -6,6 +6,7 @@ package dsp.valueobjects import zio.prelude.Validation +import dsp.errors.BadRequestException object Project { @@ -18,12 +19,12 @@ object Project { object Shortcode { self => def make(value: String): Validation[Throwable, Shortcode] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ProjectErrorMessages.ShortcodeMissing)) + Validation.fail(BadRequestException(ProjectErrorMessages.ShortcodeMissing)) } else { val validatedValue: Validation[Throwable, String] = Validation( V2ProjectIriValidation.validateProjectShortcode( value, - throw V2.BadRequestException(ProjectErrorMessages.ShortcodeInvalid) + throw BadRequestException(ProjectErrorMessages.ShortcodeInvalid) ) ) validatedValue.map(new Shortcode(_) {}) @@ -43,12 +44,12 @@ object Project { object Shortname { self => def make(value: String): Validation[Throwable, Shortname] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ProjectErrorMessages.ShortnameMissing)) + Validation.fail(BadRequestException(ProjectErrorMessages.ShortnameMissing)) } else { val validatedValue = Validation( V2ProjectIriValidation.validateAndEscapeProjectShortname( value, - throw V2.BadRequestException(ProjectErrorMessages.ShortnameInvalid) + throw BadRequestException(ProjectErrorMessages.ShortnameInvalid) ) ) validatedValue.map(new Shortname(_) {}) @@ -68,7 +69,7 @@ object Project { object Longname { self => def make(value: String): Validation[Throwable, Longname] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ProjectErrorMessages.LongnameMissing)) + Validation.fail(BadRequestException(ProjectErrorMessages.LongnameMissing)) } else { Validation.succeed(new Longname(value) {}) } @@ -87,7 +88,7 @@ object Project { object ProjectDescription { self => def make(value: Seq[V2.StringLiteralV2]): Validation[Throwable, ProjectDescription] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ProjectErrorMessages.ProjectDescriptionsMissing)) + Validation.fail(BadRequestException(ProjectErrorMessages.ProjectDescriptionsMissing)) } else { Validation.succeed(new ProjectDescription(value) {}) } @@ -106,7 +107,7 @@ object Project { object Keywords { self => def make(value: Seq[String]): Validation[Throwable, Keywords] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ProjectErrorMessages.KeywordsMissing)) + Validation.fail(BadRequestException(ProjectErrorMessages.KeywordsMissing)) } else { Validation.succeed(new Keywords(value) {}) } @@ -125,7 +126,7 @@ object Project { object Logo { self => def make(value: String): Validation[Throwable, Logo] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(ProjectErrorMessages.LogoMissing)) + Validation.fail(BadRequestException(ProjectErrorMessages.LogoMissing)) } else { Validation.succeed(new Logo(value) {}) } diff --git a/dsp-value-objects/src/main/scala/dsp/valueobjects/User.scala b/dsp-shared/src/main/scala/dsp/valueobjects/User.scala similarity index 85% rename from dsp-value-objects/src/main/scala/dsp/valueobjects/User.scala rename to dsp-shared/src/main/scala/dsp/valueobjects/User.scala index 344a59eb9c..1b97924f50 100644 --- a/dsp-value-objects/src/main/scala/dsp/valueobjects/User.scala +++ b/dsp-shared/src/main/scala/dsp/valueobjects/User.scala @@ -7,6 +7,7 @@ package dsp.valueobjects import zio.prelude.Validation import scala.util.matching.Regex +import dsp.errors.BadRequestException object User { @@ -31,11 +32,11 @@ object User { def make(value: String): Validation[Throwable, Username] = if (value.isEmpty) { // remove exception return just the error - Validation.fail(V2.BadRequestException(UserErrorMessages.UsernameMissing)) + Validation.fail(BadRequestException(UserErrorMessages.UsernameMissing)) } else { UsernameRegex.findFirstIn(value) match { case Some(value) => Validation.succeed(new Username(value) {}) - case None => Validation.fail(V2.BadRequestException(UserErrorMessages.UsernameInvalid)) + case None => Validation.fail(BadRequestException(UserErrorMessages.UsernameInvalid)) } } @@ -55,11 +56,11 @@ object User { def make(value: String): Validation[Throwable, Email] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(UserErrorMessages.EmailMissing)) + Validation.fail(BadRequestException(UserErrorMessages.EmailMissing)) } else { EmailRegex.findFirstIn(value) match { case Some(value) => Validation.succeed(new Email(value) {}) - case None => Validation.fail(V2.BadRequestException(UserErrorMessages.EmailInvalid)) + case None => Validation.fail(BadRequestException(UserErrorMessages.EmailInvalid)) } } @@ -77,7 +78,7 @@ object User { object GivenName { self => def make(value: String): Validation[Throwable, GivenName] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(UserErrorMessages.GivenNameMissing)) + Validation.fail(BadRequestException(UserErrorMessages.GivenNameMissing)) } else { Validation.succeed(new GivenName(value) {}) } @@ -96,7 +97,7 @@ object User { object FamilyName { self => def make(value: String): Validation[Throwable, FamilyName] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(UserErrorMessages.FamilyNameMissing)) + Validation.fail(BadRequestException(UserErrorMessages.FamilyNameMissing)) } else { Validation.succeed(new FamilyName(value) {}) } @@ -117,11 +118,11 @@ object User { def make(value: String): Validation[Throwable, Password] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(UserErrorMessages.PasswordMissing)) + Validation.fail(BadRequestException(UserErrorMessages.PasswordMissing)) } else { PasswordRegex.findFirstIn(value) match { case Some(value) => Validation.succeed(new Password(value) {}) - case None => Validation.fail(V2.BadRequestException(UserErrorMessages.PasswordInvalid)) + case None => Validation.fail(BadRequestException(UserErrorMessages.PasswordInvalid)) } } @@ -148,9 +149,9 @@ object User { object LanguageCode { self => def make(value: String): Validation[Throwable, LanguageCode] = if (value.isEmpty) { - Validation.fail(V2.BadRequestException(UserErrorMessages.LanguageCodeMissing)) + Validation.fail(BadRequestException(UserErrorMessages.LanguageCodeMissing)) } else if (!V2.SupportedLanguageCodes.contains(value)) { - Validation.fail(V2.BadRequestException(UserErrorMessages.LanguageCodeInvalid)) + Validation.fail(BadRequestException(UserErrorMessages.LanguageCodeInvalid)) } else { Validation.succeed(new LanguageCode(value) {}) } diff --git a/dsp-value-objects/src/main/scala/dsp/valueobjects/V2.scala b/dsp-shared/src/main/scala/dsp/valueobjects/V2.scala similarity index 97% rename from dsp-value-objects/src/main/scala/dsp/valueobjects/V2.scala rename to dsp-shared/src/main/scala/dsp/valueobjects/V2.scala index c14d4c7be2..1af68aeed8 100644 --- a/dsp-value-objects/src/main/scala/dsp/valueobjects/V2.scala +++ b/dsp-shared/src/main/scala/dsp/valueobjects/V2.scala @@ -12,6 +12,7 @@ import scala.util.matching.Regex import org.apache.commons.validator.routines.UrlValidator import org.apache.commons.lang3.StringUtils import com.google.gwt.safehtml.shared.UriUtils.encodeAllowEscapes +import dsp.errors.BadRequestException // TODO-mpro: don't forget to remove all occurances and additional "helper" // implementations in webapi project which needed to be added temporary in order @@ -38,13 +39,6 @@ object V2 { * @param language the language iso. */ case class StringLiteralV2(value: String, language: Option[String]) - - /** - * An exception indicating that the request parameters did not make sense. - * - * @param message a description of the error. - */ - case class BadRequestException(message: String, cause: Throwable = null) extends Exception(message, cause) } object V2IriValidation { @@ -266,7 +260,7 @@ object V2UuidValidation { * Calls `decodeUuidWithErr`, throwing [[InconsistentRepositoryDataException]] if the string cannot be parsed. */ def decodeUuid(uuidStr: String): UUID = - decodeUuidWithErr(uuidStr, throw V2.BadRequestException(s"Invalid UUID: $uuidStr")) + decodeUuidWithErr(uuidStr, throw BadRequestException(s"Invalid UUID: $uuidStr")) /** * Decodes a string representing a UUID in one of two formats: diff --git a/dsp-value-objects/src/test/scala/dsp/valueobjects/GroupSpec.scala b/dsp-shared/src/test/scala/dsp/valueobjects/GroupSpec.scala similarity index 83% rename from dsp-value-objects/src/test/scala/dsp/valueobjects/GroupSpec.scala rename to dsp-shared/src/test/scala/dsp/valueobjects/GroupSpec.scala index a35a15459f..4d11bf5cf7 100644 --- a/dsp-value-objects/src/test/scala/dsp/valueobjects/GroupSpec.scala +++ b/dsp-shared/src/test/scala/dsp/valueobjects/GroupSpec.scala @@ -8,6 +8,7 @@ package dsp.valueobjects import dsp.valueobjects.Group._ import zio.prelude.Validation import zio.test._ +import dsp.errors.BadRequestException /** * This spec is used to test the [[Group]] value objects creation. @@ -24,20 +25,20 @@ object GroupSpec extends ZIOSpecDefault { private val groupNameTest = suite("GroupSpec - GroupName")( test("pass an empty value and throw an error") { - assertTrue(GroupName.make("") == Validation.fail(V2.BadRequestException(GroupErrorMessages.GroupNameMissing))) && + assertTrue(GroupName.make("") == Validation.fail(BadRequestException(GroupErrorMessages.GroupNameMissing))) && assertTrue( - GroupName.make(Some("")) == Validation.fail(V2.BadRequestException(GroupErrorMessages.GroupNameMissing)) + GroupName.make(Some("")) == Validation.fail(BadRequestException(GroupErrorMessages.GroupNameMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( GroupName.make(invalidName) == Validation.fail( - V2.BadRequestException(GroupErrorMessages.GroupNameInvalid) + BadRequestException(GroupErrorMessages.GroupNameInvalid) ) ) && assertTrue( GroupName.make(Some(invalidName)) == Validation.fail( - V2.BadRequestException(GroupErrorMessages.GroupNameInvalid) + BadRequestException(GroupErrorMessages.GroupNameInvalid) ) ) }, @@ -56,24 +57,24 @@ object GroupSpec extends ZIOSpecDefault { test("pass an empty object and throw an error") { assertTrue( GroupDescriptions.make(Seq.empty) == Validation.fail( - V2.BadRequestException(GroupErrorMessages.GroupDescriptionsMissing) + BadRequestException(GroupErrorMessages.GroupDescriptionsMissing) ) ) && assertTrue( GroupDescriptions.make(Some(Seq.empty)) == Validation.fail( - V2.BadRequestException(GroupErrorMessages.GroupDescriptionsMissing) + BadRequestException(GroupErrorMessages.GroupDescriptionsMissing) ) ) }, test("pass an invalid object and throw an error") { assertTrue( GroupDescriptions.make(invalidDescription) == Validation.fail( - V2.BadRequestException(GroupErrorMessages.GroupDescriptionsInvalid) + BadRequestException(GroupErrorMessages.GroupDescriptionsInvalid) ) ) && assertTrue( GroupDescriptions.make(Some(invalidDescription)) == Validation.fail( - V2.BadRequestException(GroupErrorMessages.GroupDescriptionsInvalid) + BadRequestException(GroupErrorMessages.GroupDescriptionsInvalid) ) ) }, diff --git a/dsp-value-objects/src/test/scala/dsp/valueobjects/IriSpec.scala b/dsp-shared/src/test/scala/dsp/valueobjects/IriSpec.scala similarity index 73% rename from dsp-value-objects/src/test/scala/dsp/valueobjects/IriSpec.scala rename to dsp-shared/src/test/scala/dsp/valueobjects/IriSpec.scala index 640288282d..9bdac05a26 100644 --- a/dsp-value-objects/src/test/scala/dsp/valueobjects/IriSpec.scala +++ b/dsp-shared/src/test/scala/dsp/valueobjects/IriSpec.scala @@ -8,6 +8,7 @@ package dsp.valueobjects import dsp.valueobjects.Iri._ import zio.prelude.Validation import zio.test._ +import dsp.errors.BadRequestException /** * This spec is used to test the [[Iri]] value objects creation. @@ -27,32 +28,32 @@ object IriSpec extends ZIOSpecDefault { private val groupIriTest = suite("IriSpec - GroupIri")( test("pass an empty value and throw an error") { - assertTrue(GroupIri.make("") == Validation.fail(V2.BadRequestException(IriErrorMessages.GroupIriMissing))) && + assertTrue(GroupIri.make("") == Validation.fail(BadRequestException(IriErrorMessages.GroupIriMissing))) && assertTrue( - GroupIri.make(Some("")) == Validation.fail(V2.BadRequestException(IriErrorMessages.GroupIriMissing)) + GroupIri.make(Some("")) == Validation.fail(BadRequestException(IriErrorMessages.GroupIriMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( GroupIri.make(invalidIri) == Validation.fail( - V2.BadRequestException(IriErrorMessages.GroupIriInvalid) + BadRequestException(IriErrorMessages.GroupIriInvalid) ) ) && assertTrue( GroupIri.make(Some(invalidIri)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.GroupIriInvalid) + BadRequestException(IriErrorMessages.GroupIriInvalid) ) ) }, test("pass an invalid IRI containing unsupported UUID version and throw an error") { assertTrue( GroupIri.make(groupIriWithUUIDVersion3) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) && assertTrue( GroupIri.make(Some(groupIriWithUUIDVersion3)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) }, @@ -69,32 +70,32 @@ object IriSpec extends ZIOSpecDefault { private val listIriTest = suite("IriSpec - ListIri")( test("pass an empty value and throw an error") { - assertTrue(ListIri.make("") == Validation.fail(V2.BadRequestException(IriErrorMessages.ListIriMissing))) && + assertTrue(ListIri.make("") == Validation.fail(BadRequestException(IriErrorMessages.ListIriMissing))) && assertTrue( - ListIri.make(Some("")) == Validation.fail(V2.BadRequestException(IriErrorMessages.ListIriMissing)) + ListIri.make(Some("")) == Validation.fail(BadRequestException(IriErrorMessages.ListIriMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( ListIri.make(invalidIri) == Validation.fail( - V2.BadRequestException(IriErrorMessages.ListIriInvalid) + BadRequestException(IriErrorMessages.ListIriInvalid) ) ) && assertTrue( ListIri.make(Some(invalidIri)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.ListIriInvalid) + BadRequestException(IriErrorMessages.ListIriInvalid) ) ) }, test("pass an invalid IRI containing unsupported UUID version and throw an error") { assertTrue( ListIri.make(listIriWithUUIDVersion3) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) && assertTrue( ListIri.make(Some(listIriWithUUIDVersion3)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) }, @@ -111,32 +112,32 @@ object IriSpec extends ZIOSpecDefault { private val projectIriTest = suite("IriSpec - ProjectIri")( test("pass an empty value and throw an error") { - assertTrue(ProjectIri.make("") == Validation.fail(V2.BadRequestException(IriErrorMessages.ProjectIriMissing))) && + assertTrue(ProjectIri.make("") == Validation.fail(BadRequestException(IriErrorMessages.ProjectIriMissing))) && assertTrue( - ProjectIri.make(Some("")) == Validation.fail(V2.BadRequestException(IriErrorMessages.ProjectIriMissing)) + ProjectIri.make(Some("")) == Validation.fail(BadRequestException(IriErrorMessages.ProjectIriMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( ProjectIri.make(invalidIri) == Validation.fail( - V2.BadRequestException(IriErrorMessages.ProjectIriInvalid) + BadRequestException(IriErrorMessages.ProjectIriInvalid) ) ) && assertTrue( ProjectIri.make(Some(invalidIri)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.ProjectIriInvalid) + BadRequestException(IriErrorMessages.ProjectIriInvalid) ) ) }, test("pass an invalid IRI containing unsupported UUID version and throw an error") { assertTrue( ProjectIri.make(projectIriWithUUIDVersion3) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) && assertTrue( ProjectIri.make(Some(projectIriWithUUIDVersion3)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) }, @@ -153,32 +154,32 @@ object IriSpec extends ZIOSpecDefault { private val UserIriTest = suite("IriSpec - ProjectIri")( test("pass an empty value and throw an error") { - assertTrue(UserIri.make("") == Validation.fail(V2.BadRequestException(IriErrorMessages.UserIriMissing))) && + assertTrue(UserIri.make("") == Validation.fail(BadRequestException(IriErrorMessages.UserIriMissing))) && assertTrue( - UserIri.make(Some("")) == Validation.fail(V2.BadRequestException(IriErrorMessages.UserIriMissing)) + UserIri.make(Some("")) == Validation.fail(BadRequestException(IriErrorMessages.UserIriMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( UserIri.make(invalidIri) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UserIriInvalid) + BadRequestException(IriErrorMessages.UserIriInvalid) ) ) && assertTrue( UserIri.make(Some(invalidIri)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UserIriInvalid) + BadRequestException(IriErrorMessages.UserIriInvalid) ) ) }, test("pass an invalid IRI containing unsupported UUID version and throw an error") { assertTrue( UserIri.make(userIriWithUUIDVersion3) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) && assertTrue( UserIri.make(Some(userIriWithUUIDVersion3)) == Validation.fail( - V2.BadRequestException(IriErrorMessages.UuidVersionInvalid) + BadRequestException(IriErrorMessages.UuidVersionInvalid) ) ) }, diff --git a/dsp-value-objects/src/test/scala/dsp/valueobjects/ListSpec.scala b/dsp-shared/src/test/scala/dsp/valueobjects/ListSpec.scala similarity index 81% rename from dsp-value-objects/src/test/scala/dsp/valueobjects/ListSpec.scala rename to dsp-shared/src/test/scala/dsp/valueobjects/ListSpec.scala index c4956e7bc6..211b077406 100644 --- a/dsp-value-objects/src/test/scala/dsp/valueobjects/ListSpec.scala +++ b/dsp-shared/src/test/scala/dsp/valueobjects/ListSpec.scala @@ -8,6 +8,7 @@ package dsp.valueobjects import dsp.valueobjects.List._ import zio.prelude.Validation import zio.test._ +import dsp.errors.BadRequestException /** * This spec is used to test the [[List]] value objects creation. @@ -26,20 +27,20 @@ object ListSpec extends ZIOSpecDefault { private val listNameTest = suite("ListSpec - ListName")( test("pass an empty value and throw an error") { - assertTrue(ListName.make("") == Validation.fail(V2.BadRequestException(ListErrorMessages.ListNameMissing))) && + assertTrue(ListName.make("") == Validation.fail(BadRequestException(ListErrorMessages.ListNameMissing))) && assertTrue( - ListName.make(Some("")) == Validation.fail(V2.BadRequestException(ListErrorMessages.ListNameMissing)) + ListName.make(Some("")) == Validation.fail(BadRequestException(ListErrorMessages.ListNameMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( ListName.make(invalidName) == Validation.fail( - V2.BadRequestException(ListErrorMessages.ListNameInvalid) + BadRequestException(ListErrorMessages.ListNameInvalid) ) ) && assertTrue( ListName.make(Some(invalidName)) == Validation.fail( - V2.BadRequestException(ListErrorMessages.ListNameInvalid) + BadRequestException(ListErrorMessages.ListNameInvalid) ) ) }, @@ -58,12 +59,12 @@ object ListSpec extends ZIOSpecDefault { test("pass an invalid value and throw an error") { assertTrue( Position.make(invalidPosition) == Validation.fail( - V2.BadRequestException(ListErrorMessages.InvalidPosition) + BadRequestException(ListErrorMessages.InvalidPosition) ) ) && assertTrue( Position.make(Some(invalidPosition)) == Validation.fail( - V2.BadRequestException(ListErrorMessages.InvalidPosition) + BadRequestException(ListErrorMessages.InvalidPosition) ) ) }, @@ -82,24 +83,24 @@ object ListSpec extends ZIOSpecDefault { test("pass an empty object and throw an error") { assertTrue( Labels.make(Seq.empty) == Validation.fail( - V2.BadRequestException(ListErrorMessages.LabelsMissing) + BadRequestException(ListErrorMessages.LabelsMissing) ) ) && assertTrue( Labels.make(Some(Seq.empty)) == Validation.fail( - V2.BadRequestException(ListErrorMessages.LabelsMissing) + BadRequestException(ListErrorMessages.LabelsMissing) ) ) }, test("pass an invalid object and throw an error") { assertTrue( Labels.make(invalidLabel) == Validation.fail( - V2.BadRequestException(ListErrorMessages.LabelsInvalid) + BadRequestException(ListErrorMessages.LabelsInvalid) ) ) && assertTrue( Labels.make(Some(invalidLabel)) == Validation.fail( - V2.BadRequestException(ListErrorMessages.LabelsInvalid) + BadRequestException(ListErrorMessages.LabelsInvalid) ) ) }, @@ -118,24 +119,24 @@ object ListSpec extends ZIOSpecDefault { test("pass an empty object and throw an error") { assertTrue( Comments.make(Seq.empty) == Validation.fail( - V2.BadRequestException(ListErrorMessages.CommentsMissing) + BadRequestException(ListErrorMessages.CommentsMissing) ) ) && assertTrue( Comments.make(Some(Seq.empty)) == Validation.fail( - V2.BadRequestException(ListErrorMessages.CommentsMissing) + BadRequestException(ListErrorMessages.CommentsMissing) ) ) }, test("pass an invalid object and throw an error") { assertTrue( Comments.make(invalidComment) == Validation.fail( - V2.BadRequestException(ListErrorMessages.CommentsInvalid) + BadRequestException(ListErrorMessages.CommentsInvalid) ) ) && assertTrue( Comments.make(Some(invalidComment)) == Validation.fail( - V2.BadRequestException(ListErrorMessages.CommentsInvalid) + BadRequestException(ListErrorMessages.CommentsInvalid) ) ) }, diff --git a/dsp-value-objects/src/test/scala/dsp/valueobjects/ProjectSpec.scala b/dsp-shared/src/test/scala/dsp/valueobjects/ProjectSpec.scala similarity index 81% rename from dsp-value-objects/src/test/scala/dsp/valueobjects/ProjectSpec.scala rename to dsp-shared/src/test/scala/dsp/valueobjects/ProjectSpec.scala index d5914535c8..d73b6a6ea4 100644 --- a/dsp-value-objects/src/test/scala/dsp/valueobjects/ProjectSpec.scala +++ b/dsp-shared/src/test/scala/dsp/valueobjects/ProjectSpec.scala @@ -8,6 +8,7 @@ package dsp.valueobjects import dsp.valueobjects.Project._ import zio.prelude.Validation import zio.test._ +import dsp.errors.BadRequestException /** * This spec is used to test the [[Project]] value objects creation. @@ -30,21 +31,21 @@ object ProjectSpec extends ZIOSpecDefault { private val shortcodeTest = suite("ProjectSpec - Shortcode")( test("pass an empty value and throw an error") { assertTrue( - Shortcode.make("") == Validation.fail(V2.BadRequestException(ProjectErrorMessages.ShortcodeMissing)) + Shortcode.make("") == Validation.fail(BadRequestException(ProjectErrorMessages.ShortcodeMissing)) ) && assertTrue( - Shortcode.make(Some("")) == Validation.fail(V2.BadRequestException(ProjectErrorMessages.ShortcodeMissing)) + Shortcode.make(Some("")) == Validation.fail(BadRequestException(ProjectErrorMessages.ShortcodeMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( Shortcode.make(invalidShortcode) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.ShortcodeInvalid) + BadRequestException(ProjectErrorMessages.ShortcodeInvalid) ) ) && assertTrue( Shortcode.make(Some(invalidShortcode)) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.ShortcodeInvalid) + BadRequestException(ProjectErrorMessages.ShortcodeInvalid) ) ) }, @@ -62,21 +63,21 @@ object ProjectSpec extends ZIOSpecDefault { private val shortnameTest = suite("ProjectSpec - Shortname")( test("pass an empty value and throw an error") { assertTrue( - Shortname.make("") == Validation.fail(V2.BadRequestException(ProjectErrorMessages.ShortnameMissing)) + Shortname.make("") == Validation.fail(BadRequestException(ProjectErrorMessages.ShortnameMissing)) ) && assertTrue( - Shortname.make(Some("")) == Validation.fail(V2.BadRequestException(ProjectErrorMessages.ShortnameMissing)) + Shortname.make(Some("")) == Validation.fail(BadRequestException(ProjectErrorMessages.ShortnameMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( Shortname.make(invalidShortname) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.ShortnameInvalid) + BadRequestException(ProjectErrorMessages.ShortnameInvalid) ) ) && assertTrue( Shortname.make(Some(invalidShortname)) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.ShortnameInvalid) + BadRequestException(ProjectErrorMessages.ShortnameInvalid) ) ) }, @@ -93,9 +94,9 @@ object ProjectSpec extends ZIOSpecDefault { private val longnameTest = suite("ProjectSpec - Longname")( test("pass an empty value and throw an error") { - assertTrue(Longname.make("") == Validation.fail(V2.BadRequestException(ProjectErrorMessages.LongnameMissing))) && + assertTrue(Longname.make("") == Validation.fail(BadRequestException(ProjectErrorMessages.LongnameMissing))) && assertTrue( - Longname.make(Some("")) == Validation.fail(V2.BadRequestException(ProjectErrorMessages.LongnameMissing)) + Longname.make(Some("")) == Validation.fail(BadRequestException(ProjectErrorMessages.LongnameMissing)) ) }, test("pass a valid value and successfully create value object") { @@ -113,12 +114,12 @@ object ProjectSpec extends ZIOSpecDefault { test("pass an empty object and throw an error") { assertTrue( ProjectDescription.make(Seq.empty) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.ProjectDescriptionsMissing) + BadRequestException(ProjectErrorMessages.ProjectDescriptionsMissing) ) ) && assertTrue( ProjectDescription.make(Some(Seq.empty)) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.ProjectDescriptionsMissing) + BadRequestException(ProjectErrorMessages.ProjectDescriptionsMissing) ) ) }, @@ -137,12 +138,12 @@ object ProjectSpec extends ZIOSpecDefault { test("pass an empty object and throw an error") { assertTrue( Keywords.make(Seq.empty) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.KeywordsMissing) + BadRequestException(ProjectErrorMessages.KeywordsMissing) ) ) && assertTrue( Keywords.make(Some(Seq.empty)) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.KeywordsMissing) + BadRequestException(ProjectErrorMessages.KeywordsMissing) ) ) }, @@ -161,12 +162,12 @@ object ProjectSpec extends ZIOSpecDefault { test("pass an empty object and throw an error") { assertTrue( Logo.make("") == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.LogoMissing) + BadRequestException(ProjectErrorMessages.LogoMissing) ) ) && assertTrue( Logo.make(Some("")) == Validation.fail( - V2.BadRequestException(ProjectErrorMessages.LogoMissing) + BadRequestException(ProjectErrorMessages.LogoMissing) ) ) }, diff --git a/dsp-value-objects/src/test/scala/dsp/valueobjects/UserSpec.scala b/dsp-shared/src/test/scala/dsp/valueobjects/UserSpec.scala similarity index 75% rename from dsp-value-objects/src/test/scala/dsp/valueobjects/UserSpec.scala rename to dsp-shared/src/test/scala/dsp/valueobjects/UserSpec.scala index e1c2720770..0ba489cf9e 100644 --- a/dsp-value-objects/src/test/scala/dsp/valueobjects/UserSpec.scala +++ b/dsp-shared/src/test/scala/dsp/valueobjects/UserSpec.scala @@ -8,6 +8,7 @@ package dsp.valueobjects import dsp.valueobjects.User._ import zio.prelude.Validation import zio.test._ +import dsp.errors.BadRequestException /** * This spec is used to test the [[User]] value objects creation. @@ -36,116 +37,116 @@ object UserSpec extends ZIOSpecDefault { private val usernameTest = suite("UserSpec - Username")( test("pass an empty value and throw an error") { - assertTrue(Username.make("") == Validation.fail(V2.BadRequestException(UserErrorMessages.UsernameMissing))) && + assertTrue(Username.make("") == Validation.fail(BadRequestException(UserErrorMessages.UsernameMissing))) && assertTrue( - Username.make(Some("")) == Validation.fail(V2.BadRequestException(UserErrorMessages.UsernameMissing)) + Username.make(Some("")) == Validation.fail(BadRequestException(UserErrorMessages.UsernameMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( Username.make(invalidUsername) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsername)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass too short value and throw an error") { assertTrue( Username.make(tooShortUsername) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(tooShortUsername)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass too long value and throw an error") { assertTrue( Username.make(tooLongUsername) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(tooLongUsername)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass an invalid value with '_' as the first char and throw an error") { assertTrue( Username.make(invalidUsernameWithUnderscoreAsFirstChar) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsernameWithUnderscoreAsFirstChar)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass an invalid value with '_' as the last char and throw an error") { assertTrue( Username.make(invalidUsernameWithUnderscoreAsLastChar) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsernameWithUnderscoreAsLastChar)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass an invalid value with '_' used multiple times in a row and throw an error") { assertTrue( Username.make(invalidUsernameWithMultipleUnderscoresInRow) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsernameWithMultipleUnderscoresInRow)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass an invalid value with '.' as the first char and throw an error") { assertTrue( Username.make(invalidUsernameWithDotAsFirstChar) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsernameWithDotAsFirstChar)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass an invalid value with '.' as the last char and throw an error") { assertTrue( Username.make(invalidUsernameWithDotAsLastChar) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsernameWithDotAsLastChar)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, test("pass an invalid value with '.' used multiple times in a row and throw an error") { assertTrue( Username.make(invalidUsernameWithMultipleDotsInRow) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) && assertTrue( Username.make(Some(invalidUsernameWithMultipleDotsInRow)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.UsernameInvalid) + BadRequestException(UserErrorMessages.UsernameInvalid) ) ) }, @@ -162,20 +163,20 @@ object UserSpec extends ZIOSpecDefault { private val emailTest = suite("UserSpec - Email")( test("pass an empty value and throw an error") { - assertTrue(Email.make("") == Validation.fail(V2.BadRequestException(UserErrorMessages.EmailMissing))) && + assertTrue(Email.make("") == Validation.fail(BadRequestException(UserErrorMessages.EmailMissing))) && assertTrue( - Email.make(Some("")) == Validation.fail(V2.BadRequestException(UserErrorMessages.EmailMissing)) + Email.make(Some("")) == Validation.fail(BadRequestException(UserErrorMessages.EmailMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( Email.make(invalidEmailAddress) == Validation.fail( - V2.BadRequestException(UserErrorMessages.EmailInvalid) + BadRequestException(UserErrorMessages.EmailInvalid) ) ) && assertTrue( Email.make(Some(invalidEmailAddress)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.EmailInvalid) + BadRequestException(UserErrorMessages.EmailInvalid) ) ) }, @@ -192,9 +193,9 @@ object UserSpec extends ZIOSpecDefault { private val givenNameTest = suite("UserSpec - GivenName")( test("pass an empty value and throw an error") { - assertTrue(GivenName.make("") == Validation.fail(V2.BadRequestException(UserErrorMessages.GivenNameMissing))) && + assertTrue(GivenName.make("") == Validation.fail(BadRequestException(UserErrorMessages.GivenNameMissing))) && assertTrue( - GivenName.make(Some("")) == Validation.fail(V2.BadRequestException(UserErrorMessages.GivenNameMissing)) + GivenName.make(Some("")) == Validation.fail(BadRequestException(UserErrorMessages.GivenNameMissing)) ) }, test("pass a valid value and successfully create value object") { @@ -210,9 +211,9 @@ object UserSpec extends ZIOSpecDefault { private val familyNameTest = suite("UserSpec - FamilyName")( test("pass an empty value and throw an error") { - assertTrue(FamilyName.make("") == Validation.fail(V2.BadRequestException(UserErrorMessages.FamilyNameMissing))) && + assertTrue(FamilyName.make("") == Validation.fail(BadRequestException(UserErrorMessages.FamilyNameMissing))) && assertTrue( - FamilyName.make(Some("")) == Validation.fail(V2.BadRequestException(UserErrorMessages.FamilyNameMissing)) + FamilyName.make(Some("")) == Validation.fail(BadRequestException(UserErrorMessages.FamilyNameMissing)) ) }, test("pass a valid value and successfully create value object") { @@ -228,9 +229,9 @@ object UserSpec extends ZIOSpecDefault { private val passwordTest = suite("UserSpec - Password")( test("pass an empty value and throw an error") { - assertTrue(Password.make("") == Validation.fail(V2.BadRequestException(UserErrorMessages.PasswordMissing))) && + assertTrue(Password.make("") == Validation.fail(BadRequestException(UserErrorMessages.PasswordMissing))) && assertTrue( - Password.make(Some("")) == Validation.fail(V2.BadRequestException(UserErrorMessages.PasswordMissing)) + Password.make(Some("")) == Validation.fail(BadRequestException(UserErrorMessages.PasswordMissing)) ) }, test("pass a valid value and successfully create value object") { @@ -247,21 +248,21 @@ object UserSpec extends ZIOSpecDefault { private val languageCodeTest = suite("UserSpec - LanguageCode")( test("pass an empty value and throw an error") { assertTrue( - LanguageCode.make("") == Validation.fail(V2.BadRequestException(UserErrorMessages.LanguageCodeMissing)) + LanguageCode.make("") == Validation.fail(BadRequestException(UserErrorMessages.LanguageCodeMissing)) ) && assertTrue( - LanguageCode.make(Some("")) == Validation.fail(V2.BadRequestException(UserErrorMessages.LanguageCodeMissing)) + LanguageCode.make(Some("")) == Validation.fail(BadRequestException(UserErrorMessages.LanguageCodeMissing)) ) }, test("pass an invalid value and throw an error") { assertTrue( LanguageCode.make(invalidLanguageCode) == Validation.fail( - V2.BadRequestException(UserErrorMessages.LanguageCodeInvalid) + BadRequestException(UserErrorMessages.LanguageCodeInvalid) ) ) && assertTrue( LanguageCode.make(Some(invalidLanguageCode)) == Validation.fail( - V2.BadRequestException(UserErrorMessages.LanguageCodeInvalid) + BadRequestException(UserErrorMessages.LanguageCodeInvalid) ) ) }, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9fa5581d0c..ccf4bbd999 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -175,7 +175,8 @@ object Dependencies { val schemaRepoEventStoreServiceLibraryDependencies = Seq() val schemaRepoSearchServiceLibraryDependencies = Seq() - val valueObjectsLibraryDependencies = Seq( + val sharedLibraryDependencies = Seq( + akkaActor, commonsLang3, commonsValidator, gwtServlet, diff --git a/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala b/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala index 49e5d9124e..7172c11f0b 100644 --- a/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala +++ b/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala @@ -23,11 +23,7 @@ import ch.megard.akka.http.cors.scaladsl.settings.CorsSettings import com.typesafe.scalalogging.LazyLogging import org.knora.webapi.config.AppConfig import org.knora.webapi.core.LiveActorMaker -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.MissingLastModificationDateOntologyException -import org.knora.webapi.exceptions.SipiException -import org.knora.webapi.exceptions.UnexpectedMessageException -import org.knora.webapi.exceptions.UnsupportedValueException +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.feature.KnoraSettingsFeatureFactoryConfig import org.knora.webapi.http.directives.DSPApiDirectives diff --git a/webapi/src/main/scala/org/knora/webapi/contributors/GenerateContributorsFile.scala b/webapi/src/main/scala/org/knora/webapi/contributors/GenerateContributorsFile.scala index a447812306..c2a9176bee 100644 --- a/webapi/src/main/scala/org/knora/webapi/contributors/GenerateContributorsFile.scala +++ b/webapi/src/main/scala/org/knora/webapi/contributors/GenerateContributorsFile.scala @@ -5,7 +5,7 @@ package org.knora.webapi.contributors -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.twirl.Contributor import org.knora.webapi.util.FileUtil import org.rogach.scallop.ScallopConf diff --git a/webapi/src/main/scala/org/knora/webapi/exceptions/package.scala b/webapi/src/main/scala/org/knora/webapi/exceptions/package.scala deleted file mode 100644 index 60fcd18857..0000000000 --- a/webapi/src/main/scala/org/knora/webapi/exceptions/package.scala +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright © 2021 - 2022 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.exceptions - -package object exceptions { - def deserializationError(msg: String, cause: Throwable = null, fieldNames: List[String] = Nil) = - throw InvalidJsonLDException(msg, cause) -} diff --git a/webapi/src/main/scala/org/knora/webapi/feature/FeatureFactory.scala b/webapi/src/main/scala/org/knora/webapi/feature/FeatureFactory.scala index 25bd81710d..220a726a98 100644 --- a/webapi/src/main/scala/org/knora/webapi/feature/FeatureFactory.scala +++ b/webapi/src/main/scala/org/knora/webapi/feature/FeatureFactory.scala @@ -9,8 +9,8 @@ import akka.http.scaladsl.model.HttpHeader import akka.http.scaladsl.model.HttpResponse import akka.http.scaladsl.model.headers.RawHeader import akka.http.scaladsl.server.RequestContext -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.FeatureToggleException +import dsp.errors.BadRequestException +import dsp.errors.FeatureToggleException import org.knora.webapi.settings.KnoraSettings.FeatureToggleBaseConfig import org.knora.webapi.settings.KnoraSettingsImpl diff --git a/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala b/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala index 5162f57a1b..d54c37ad08 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/handler/KnoraExceptionHandler.scala @@ -10,8 +10,8 @@ import akka.http.scaladsl.server.Directives.complete import akka.http.scaladsl.server.Directives.extractRequest import akka.http.scaladsl.server.ExceptionHandler import com.typesafe.scalalogging.LazyLogging -import org.knora.webapi.exceptions.InternalServerException -import org.knora.webapi.exceptions.RequestRejectedException +import dsp.errors.InternalServerException +import dsp.errors.RequestRejectedException import org.knora.webapi.http.status.ApiStatusCodesV1 import org.knora.webapi.http.status.ApiStatusCodesV2 import org.knora.webapi.messages.OntologyConstants @@ -23,7 +23,7 @@ import spray.json.JsNumber import spray.json.JsObject import spray.json.JsString import spray.json.JsValue -import dsp.valueobjects.V2 +import dsp.errors.BadRequestException /** * The Knora exception handler is used by akka-http to convert any exceptions thrown during route processing @@ -43,8 +43,6 @@ object KnoraExceptionHandler extends LazyLogging { extractRequest { request => val url = request.uri.path.toString - // println(s"KnoraExceptionHandler - case: rre - url: $url") - if (url.startsWith("/v1")) { complete(exceptionToJsonHttpResponseV1(rre, settingsImpl)) } else if (url.startsWith("/v2")) { @@ -59,7 +57,6 @@ object KnoraExceptionHandler extends LazyLogging { val uri = request.uri val url = uri.path.toString - // println(s"KnoraExceptionHandler - case: ise - url: $url") logger.error(s"Unable to run route $url", ise) if (url.startsWith("/v1")) { @@ -71,19 +68,6 @@ object KnoraExceptionHandler extends LazyLogging { } } - case bre: V2.BadRequestException => - extractRequest { request => - val url = request.uri.path.toString - - if (url.startsWith("/v1")) { - complete(exceptionToJsonHttpResponseV1(bre, settingsImpl)) - } else if (url.startsWith("/v2")) { - complete(exceptionToJsonHttpResponseV2(bre, settingsImpl)) - } else { - complete(exceptionToJsonHttpResponseADM(bre, settingsImpl)) - } - } - case other => extractRequest { request => val uri = request.uri diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala index ac340a1175..835a65bc12 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesADM.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import akka.http.scaladsl.model.StatusCode import akka.http.scaladsl.model.StatusCodes -import org.knora.webapi.exceptions._ +import dsp.errors._ /** * The possible values for the HTTP status code that is returned as part of each Knora ADM response. diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV1.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV1.scala index 46d23c3873..2914973c62 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.http.status import akka.http.scaladsl.model.StatusCode import akka.http.scaladsl.model.StatusCodes -import org.knora.webapi.exceptions._ +import dsp.errors._ /** * The possible values for the status code that is returned as part of each Knora API v1 response. diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala index fc363aa3c5..b90f2a8c29 100644 --- a/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala @@ -7,8 +7,7 @@ package org.knora.webapi.http.status import akka.http.scaladsl.model.StatusCode import akka.http.scaladsl.model.StatusCodes -import org.knora.webapi.exceptions._ -import dsp.valueobjects.V2 +import dsp.errors._ /** * The possible values for the HTTP status code that is returned as part of each Knora API v2 response. @@ -31,7 +30,7 @@ object ApiStatusCodesV2 { case OntologyConstraintException(_) => StatusCodes.BadRequest case EditConflictException(_) => StatusCodes.Conflict case RequestRejectedException(_) => StatusCodes.BadRequest - case V2.BadRequestException(_, _) => StatusCodes.BadRequest + case BadRequestException(_) => StatusCodes.BadRequest // Subclasses of InternalServerException (which must be last in this group) case UpdateNotPerformedException(_) => StatusCodes.Conflict diff --git a/webapi/src/main/scala/org/knora/webapi/messages/OntologyConstants.scala b/webapi/src/main/scala/org/knora/webapi/messages/OntologyConstants.scala index ff0d3ee0fc..068136524e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/OntologyConstants.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/OntologyConstants.scala @@ -6,7 +6,7 @@ package org.knora.webapi package messages -import exceptions.InconsistentRepositoryDataException +import dsp.errors._ /** * Contains string constants for IRIs from ontologies used by the application. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala index 1f106a684d..fe06b9b007 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala @@ -14,7 +14,7 @@ import com.google.gwt.safehtml.shared.UriUtils._ import org.apache.commons.lang3.StringUtils import org.apache.commons.validator.routines.UrlValidator import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants.SalsahGui import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala index f73d785236..c7acd20901 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.admin.responder.groupsmessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.KnoraRequestADM import org.knora.webapi.messages.admin.responder.KnoraResponseADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala index 4d35d60f2a..8bcfe8bde5 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.admin.responder.listsmessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.KnoraRequestADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala index fe90e5ae36..2a403bfb9b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala @@ -7,8 +7,8 @@ package org.knora.webapi.messages.admin.responder.permissionsmessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.ForbiddenException +import dsp.errors.BadRequestException +import dsp.errors.ForbiddenException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala index fbf9d052e3..cae49b5f06 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesUtilADM.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.admin.responder.permissionsmessages import org.knora.webapi.IRI -import org.knora.webapi.exceptions.ApplicationCacheException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.ApplicationCacheException +import dsp.errors.BadRequestException import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.AdministrativePermissionAbbreviations import org.knora.webapi.messages.OntologyConstants.KnoraBase.ChangeRightsPermission import org.knora.webapi.messages.OntologyConstants.KnoraBase.DeletePermission diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala index 94fc143b07..d1088eaf2b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala @@ -10,9 +10,9 @@ import org.apache.commons.lang3.builder.HashCodeBuilder import org.knora.webapi.IRI import org.knora.webapi.annotation.ApiMayChange import org.knora.webapi.annotation.ServerUnique -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DataConversionException -import org.knora.webapi.exceptions.OntologyConstraintException +import dsp.errors.BadRequestException +import dsp.errors.DataConversionException +import dsp.errors.OntologyConstraintException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.KnoraRequestADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala index 7d9b2502d1..5ff38a2d50 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala @@ -7,8 +7,8 @@ package org.knora.webapi.messages.admin.responder.usersmessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DataConversionException +import dsp.errors.BadRequestException +import dsp.errors.DataConversionException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala index c7b96eb4f6..293407e185 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala @@ -9,7 +9,7 @@ import akka.event.LoggingAdapter import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.apache.commons.lang3.StringUtils import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala index 8cf5727222..23625290a3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/CalendarDateUtilV2.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util import com.ibm.icu.util._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException import org.knora.webapi.messages.StringFormatter import java.util.Date diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala index bba5f265f6..2da45bbf37 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2.scala @@ -10,9 +10,9 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern.ask import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotImplementedException +import dsp.errors.AssertionException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotImplementedException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/DateUtilV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/DateUtilV1.scala index 1e971453b7..526ce4069a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/DateUtilV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/DateUtilV1.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util import jodd.datetime.JDateTime -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v1.responder.valuemessages.DateValueV1 import org.knora.webapi.messages.v1.responder.valuemessages.JulianDayNumberValueV1 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/ErrorHandlingMap.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/ErrorHandlingMap.scala index 80e2a02419..ee109364a5 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/ErrorHandlingMap.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/ErrorHandlingMap.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException /** * A [[Map]] that facilitates error-handling, by wrapping an ordinary [[Map]] and overriding the `default` diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/OntologyUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/OntologyUtil.scala index 815873bc1e..a1e8ae1358 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/OntologyUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/OntologyUtil.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.messages.SmartIri /** diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/PermissionUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/PermissionUtilADM.scala index 724f5ae61f..bc274cb9d6 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/PermissionUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/PermissionUtilADM.scala @@ -10,8 +10,8 @@ import akka.pattern.ask import akka.util.Timeout import com.typesafe.scalalogging.LazyLogging import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala index 57cbdee1f3..83796e5ee2 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/UserUtilADM.scala @@ -10,7 +10,7 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern.ask import akka.util.Timeout import org.knora.webapi.IRI -import org.knora.webapi.exceptions.ForbiddenException +import dsp.errors.ForbiddenException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala index f78d626939..3a6ca83c8c 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala @@ -9,9 +9,9 @@ import akka.actor.ActorRef import akka.pattern._ import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotImplementedException -import org.knora.webapi.exceptions.OntologyConstraintException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotImplementedException +import dsp.errors.OntologyConstraintException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/AbstractShaclValidator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/AbstractShaclValidator.scala index 9c16f95ee4..d5e830527a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/AbstractShaclValidator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/AbstractShaclValidator.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.rdf -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import java.nio.file._ import java.nio.file.attribute.BasicFileAttributes diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala index bad2a6cef2..4ceebfa84a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala @@ -11,7 +11,7 @@ import jakarta.json._ import jakarta.json.stream.JsonGenerator import org.apache.commons.lang3.builder.HashCodeBuilder import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFeatureFactory.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFeatureFactory.scala index 548a44106c..414b65d6b2 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFeatureFactory.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFeatureFactory.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.rdf -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.feature.FeatureFactory import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.util.rdf.jenaimpl._ diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtil.scala index a35818386a..28bf1fbaaa 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtil.scala @@ -10,8 +10,8 @@ import org.knora.webapi.IRI import org.knora.webapi.RdfMediaTypes import org.knora.webapi.SchemaOption import org.knora.webapi.SchemaOptions -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InvalidRdfException +import dsp.errors.BadRequestException +import dsp.errors.InvalidRdfException import java.io.BufferedInputStream import java.io.BufferedOutputStream diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfModel.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfModel.scala index ed88fd17b8..568b4c7157 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/RdfModel.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.rdf import org.knora.webapi.IRI -import org.knora.webapi.exceptions.InvalidRdfException +import dsp.errors.InvalidRdfException import org.knora.webapi.messages.OntologyConstants import scala.util.control.Exception.allCatch diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/SparqlSelectResult.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/SparqlSelectResult.scala index a4c0835cd5..da1de1711c 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/SparqlSelectResult.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/SparqlSelectResult.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.rdf -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException /** * Represents the result of a SPARQL SELECT query. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/jenaimpl/JenaModel.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/jenaimpl/JenaModel.scala index d72b3e9d80..d70239217a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/jenaimpl/JenaModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/jenaimpl/JenaModel.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.util.rdf.jenaimpl import org.apache.jena import org.knora.webapi.IRI -import org.knora.webapi.exceptions.RdfProcessingException +import dsp.errors.RdfProcessingException import org.knora.webapi.feature.Feature import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.ErrorHandlingMap diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/RDF4JModel.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/RDF4JModel.scala index 9de7b6ad58..b296d17945 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/RDF4JModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/RDF4JModel.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.util.rdf.rdf4jimpl import org.eclipse.rdf4j import org.knora.webapi.IRI -import org.knora.webapi.exceptions.RdfProcessingException +import dsp.errors.RdfProcessingException import org.knora.webapi.feature.Feature import org.knora.webapi.messages.util.ErrorHandlingMap import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala index 4c2db7ee5f..eb6f6cb4aa 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/MainQueryResultProcessor.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.search import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala index d337168153..19b28b602f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlQuery.scala @@ -8,8 +8,8 @@ package org.knora.webapi.messages.util.search import akka.http.scaladsl.model.HttpCharsets import akka.http.scaladsl.model.MediaType import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlTransformer.scala index e941bd66e0..2d8973a857 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlTransformer.scala @@ -6,10 +6,10 @@ package org.knora.webapi.messages.util.search import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotFoundException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala index 60d2bc98e9..dfc311afda 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala @@ -11,7 +11,7 @@ import org.eclipse.rdf4j.query.algebra import org.eclipse.rdf4j.query.parser.QueryParser import org.eclipse.rdf4j.query.parser.sparql._ import org.knora.webapi._ -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala index 40e9f146e0..023d5f3e1a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchQueryChecker.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util.search.gravsearch import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.search._ import org.knora.webapi.messages.util.search.gravsearch.types.GravsearchEntityTypeInfo diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala index 5b55e87eb0..31afd8259f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/mainquery/GravsearchMainQueryGenerator.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.search.gravsearch.mainquery import org.knora.webapi._ -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala index 973d6f787f..14df6c3310 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/AbstractPrequeryGenerator.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.search.gravsearch.prequery import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformer.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformer.scala index 4e31c8c4ca..c5dfaf069b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformer.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformer.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util.search.gravsearch.prequery import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.util.search._ diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala index f3c3394a07..28822bcd0e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/AnnotationReadingGravsearchTypeInspector.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util.search.gravsearch.types import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala index 5e995e6880..442ed14a37 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionRunner.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.util.search.gravsearch.types -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.GravsearchException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala index c4664de2fe..0cf9037a78 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectionUtil.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages.util.search.gravsearch.types import org.knora.webapi.IRI -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.util.search._ diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala index 7ea04e50dd..6103f1761c 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/InferringGravsearchTypeInspector.scala @@ -9,8 +9,8 @@ import akka.event.LogSource import akka.event.LoggingAdapter import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.AssertionException +import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala index 6f73ad6cc7..e3e9642462 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.search.gravsearch.types import org.knora.webapi.IRI -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala index 55e635c527..b447b6c39e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2.scala @@ -10,7 +10,7 @@ import akka.event.LoggingAdapter import akka.pattern.ask import akka.util.Timeout import org.knora.webapi.IRI -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala index ff6d79f5ce..4e82ed3368 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala @@ -10,7 +10,7 @@ import com.sksamuel.diffpatch.DiffMatchPatch import com.sksamuel.diffpatch.DiffMatchPatch._ import org.apache.commons.text.StringEscapeUtils import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.ErrorHandlingMap diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLUtil.scala index c36c2f3b24..0665d41493 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLUtil.scala @@ -6,7 +6,7 @@ package org.knora.webapi.messages.util.standoff import net.sf.saxon.s9api.XsltExecutable -import org.knora.webapi.exceptions.StandoffConversionException +import dsp.errors.StandoffConversionException import java.io.StringReader import java.io.StringWriter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/resourcemessages/ResourceMessagesV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/resourcemessages/ResourceMessagesV1.scala index 298bc238a2..60b8ffe75c 100755 --- a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/resourcemessages/ResourceMessagesV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/resourcemessages/ResourceMessagesV1.scala @@ -7,10 +7,10 @@ package org.knora.webapi.messages.v1.responder.resourcemessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DataConversionException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.InvalidApiJsonException +import dsp.errors.BadRequestException +import dsp.errors.DataConversionException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.InvalidApiJsonException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/searchmessages/SearchMessagesV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/searchmessages/SearchMessagesV1.scala index 65bc6b1aa8..da314305f2 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/searchmessages/SearchMessagesV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/searchmessages/SearchMessagesV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.v1.responder.searchmessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.v1.responder.KnoraRequestV1 import org.knora.webapi.messages.v1.responder.KnoraResponseV1 diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala index 15b1d1191d..211412bc47 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala @@ -7,8 +7,8 @@ package org.knora.webapi.messages.v1.responder.usermessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsADMJsonProtocol import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsDataADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala index 4b6cacbfe8..35eb040240 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala @@ -7,8 +7,8 @@ package org.knora.webapi.messages.v1.responder.valuemessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala index d185b4eab4..ef3702e07f 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/KnoraResponseV2.scala @@ -12,8 +12,8 @@ import org.knora.webapi.InternalSchema import org.knora.webapi.OntologySchema import org.knora.webapi.SchemaOption import org.knora.webapi.SchemaOptions -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala index 5098489636..9113a6af4b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala @@ -16,12 +16,7 @@ import java.util.UUID import scala.concurrent.ExecutionContext import scala.concurrent.Future -import exceptions.{ - AssertionException, - BadRequestException, - DataConversionException, - InconsistentRepositoryDataException -} +import dsp.errors._ import feature.FeatureFactoryConfig import messages.IriConversions._ import messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala index 8b8a106fcb..13734dee9b 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/resourcemessages/ResourceMessagesV2.scala @@ -10,7 +10,7 @@ import akka.event.LoggingAdapter import akka.pattern._ import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala index bad8d91501..7aa9ca1364 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/standoffmessages/StandoffMessagesV2.scala @@ -9,7 +9,7 @@ import akka.actor.ActorRef import akka.event.LoggingAdapter import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala index ebc1fda650..177fcc33dd 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala @@ -11,10 +11,10 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.NotImplementedException -import org.knora.webapi.exceptions.SipiException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException +import dsp.errors.NotImplementedException +import dsp.errors.SipiException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala index 26b52355e4..75ae1b7dea 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.v2.routing.authenticationmessages import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM import spray.json._ diff --git a/webapi/src/main/scala/org/knora/webapi/responders/IriLocker.scala b/webapi/src/main/scala/org/knora/webapi/responders/IriLocker.scala index 42b1144b4c..a4a24745e0 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/IriLocker.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/IriLocker.scala @@ -6,7 +6,7 @@ package org.knora.webapi.responders import org.knora.webapi.IRI -import org.knora.webapi.exceptions.ApplicationLockException +import dsp.errors.ApplicationLockException import org.knora.webapi.util.JavaUtil import java.util.UUID diff --git a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala index fb057277ba..89a628fd8d 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/Responder.scala @@ -19,7 +19,7 @@ import org.knora.webapi.store.cacheservice.settings.CacheServiceSettings import scala.concurrent.ExecutionContext import scala.concurrent.Future -import exceptions.{BadRequestException, DuplicateValueException, UnexpectedMessageException} +import dsp.errors._ import messages.store.triplestoremessages.SparqlSelectRequest import messages.util.ResponderData import messages.util.rdf.SparqlSelectResult diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala index a4ecbd64f1..ebcc05574e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.admin import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala index e2eab92bb7..0244094a04 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.admin import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala index 42f45aaa7d..d01c87e242 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponderADM.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.admin import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala index a70b0e2548..2c84e2716f 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ import org.knora.webapi.annotation.ApiMayChange -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.instrumentation.InstrumentationSupport import org.knora.webapi.messages.IriConversions._ diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala index 2f67eca720..81edbc333e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/SipiResponderADM.scala @@ -7,8 +7,8 @@ package org.knora.webapi.responders.admin import akka.http.scaladsl.util.FastFuture import akka.pattern._ -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotFoundException import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectRestrictedViewSettingsADM diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala index 9535d9c0e7..6bd0c260bf 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala @@ -6,7 +6,7 @@ package org.knora.webapi.responders.admin import akka.pattern._ -import org.knora.webapi.exceptions.ForbiddenException +import dsp.errors.ForbiddenException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.storesmessages.ResetTriplestoreContentRequestADM import org.knora.webapi.messages.admin.responder.storesmessages.ResetTriplestoreContentResponseADM diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala index 3e8ca2ef8f..1ce2c6f670 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala @@ -8,9 +8,9 @@ package org.knora.webapi.responders.admin import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions._ +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.instrumentation.InstrumentationSupport import org.knora.webapi.messages.IriConversions._ diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala index da0c63e19d..583c91bf7c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.responders.v1 import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.NotFoundException import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest import org.knora.webapi.messages.util.ResponderData import org.knora.webapi.messages.util.rdf.SparqlSelectResult diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/OntologyResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/OntologyResponderV1.scala index ee316d7abd..836c8a166a 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/OntologyResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/OntologyResponderV1.scala @@ -7,8 +7,8 @@ package org.knora.webapi.responders.v1 import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotFoundException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala index 5ea34fd003..358f9a749f 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ProjectsResponderV1.scala @@ -8,8 +8,8 @@ package org.knora.webapi.responders.v1 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotFoundException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala index e87074d9ac..ccfaf66d7f 100755 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.v1 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala index 024d57955f..89dda68c3d 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/SearchResponderV1.scala @@ -7,8 +7,8 @@ package org.knora.webapi.responders.v1 import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.store.triplestoremessages.SparqlSelectRequest diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/StandoffResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/StandoffResponderV1.scala index 7ca62e883a..ac52bec9fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/StandoffResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/StandoffResponderV1.scala @@ -7,8 +7,8 @@ package org.knora.webapi.responders.v1 import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.NotFoundException -import org.knora.webapi.exceptions.SipiException +import dsp.errors.NotFoundException +import dsp.errors.SipiException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala index cbc07d3e6f..c7b9bcbc08 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/UsersResponderV1.scala @@ -8,9 +8,9 @@ package org.knora.webapi.responders.v1 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.ApplicationCacheException -import org.knora.webapi.exceptions.ForbiddenException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.ApplicationCacheException +import dsp.errors.ForbiddenException +import dsp.errors.NotFoundException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionDataGetADM diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala b/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala index 435fe34bba..c7400eb4e2 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.responders.v1 import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index 7905e5d359..f48eba91a3 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.v2 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala index 64f51d9528..360138adc1 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourceUtilV2.scala @@ -10,8 +10,8 @@ import akka.pattern._ import akka.util.Timeout import com.typesafe.scalalogging.Logger import org.knora.webapi.IRI -import org.knora.webapi.exceptions.ForbiddenException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.ForbiddenException +import dsp.errors.NotFoundException import org.knora.webapi.messages.SmartIri import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringForPropertyGetADM import org.knora.webapi.messages.admin.responder.permissionsmessages.DefaultObjectAccessPermissionsStringResponseADM diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala index 9dd42c5994..053397ee72 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.stream.Materializer import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResponderWithStandoffV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResponderWithStandoffV2.scala index 678efa1b5e..96c96ced8a 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResponderWithStandoffV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResponderWithStandoffV2.scala @@ -8,8 +8,8 @@ package org.knora.webapi.responders.v2 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi.IRI -import org.knora.webapi.exceptions.NotFoundException -import org.knora.webapi.exceptions.SipiException +import dsp.errors.NotFoundException +import dsp.errors.SipiException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.util.ConstructResponseUtilV2 diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala index c3cb8617b9..00d6d70c3c 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala @@ -8,11 +8,11 @@ package org.knora.webapi.responders.v2 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.GravsearchException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.TriplestoreTimeoutException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException +import dsp.errors.GravsearchException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.TriplestoreTimeoutException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala index 7c0fb5ee87..53822edf40 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/StandoffResponderV2.scala @@ -9,7 +9,7 @@ import akka.pattern._ import akka.stream.Materializer import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala index 4bc26fdbfb..aae168e8d0 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.v2 import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala index c4722df626..0d412413cb 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cache.scala @@ -15,11 +15,11 @@ import org.knora.webapi.ApiV2Complex import org.knora.webapi.InternalSchema import org.knora.webapi.KnoraBaseVersion import org.knora.webapi.OntologySchema -import org.knora.webapi.exceptions.ApplicationCacheException -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.ForbiddenException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.MissingLastModificationDateOntologyException +import dsp.errors.ApplicationCacheException +import dsp.errors.BadRequestException +import dsp.errors.ForbiddenException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.MissingLastModificationDateOntologyException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala index b8e5877924..98b0e4ebe1 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/Cardinalities.scala @@ -10,8 +10,8 @@ import akka.http.scaladsl.util.FastFuture import akka.pattern._ import akka.util.Timeout import org.knora.webapi.InternalSchema -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraBase diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala index c07617f661..92aebe3f34 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala @@ -15,7 +15,7 @@ import org.knora.webapi.ApiV2Simple import org.knora.webapi.IRI import org.knora.webapi.InternalSchema import org.knora.webapi.OntologySchema -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala index 25df4277af..1f3613fbaa 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala @@ -18,9 +18,9 @@ import akka.util.ByteString import akka.util.Timeout import com.typesafe.scalalogging.Logger import org.knora.webapi.IRI -import org.knora.webapi.exceptions.AuthenticationException -import org.knora.webapi.exceptions.BadCredentialsException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.AuthenticationException +import dsp.errors.BadCredentialsException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.instrumentation.InstrumentationSupport import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala index dd5711c2e7..40fa4d9e08 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/KnoraRoute.scala @@ -15,7 +15,7 @@ import akka.pattern._ import akka.stream.Materializer import akka.util.Timeout import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.feature.KnoraSettingsFeatureFactoryConfig import org.knora.webapi.feature.RequestContextFeatureFactoryConfig diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala index 4749f88503..e603bd6dd1 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilADM.scala @@ -12,7 +12,7 @@ import akka.http.scaladsl.server.RequestContext import akka.http.scaladsl.server.RouteResult import akka.pattern._ import akka.util.Timeout -import org.knora.webapi.exceptions.UnexpectedMessageException +import dsp.errors.UnexpectedMessageException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.KnoraRequestADM import org.knora.webapi.messages.admin.responder.KnoraResponseADM diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala index 571b17443d..cf9ed8a73e 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala @@ -13,9 +13,9 @@ import akka.http.scaladsl.server.RouteResult import akka.pattern._ import akka.util.Timeout import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.SipiException -import org.knora.webapi.exceptions.UnexpectedMessageException +import dsp.errors.BadRequestException +import dsp.errors.SipiException +import dsp.errors.UnexpectedMessageException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.http.status.ApiStatusCodesV1 import org.knora.webapi.messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala index dc8a79b237..030fbdd0e8 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV2.scala @@ -13,8 +13,8 @@ import akka.http.scaladsl.server.RouteResult import akka.pattern._ import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.UnexpectedMessageException +import dsp.errors.BadRequestException +import dsp.errors.UnexpectedMessageException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/GroupsRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/GroupsRouteADM.scala index e22dca4981..480435710a 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/GroupsRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/GroupsRouteADM.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import io.swagger.annotations._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.groupsmessages._ import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteADM.scala index e83e2947b9..ea00955026 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteADM.scala @@ -21,7 +21,7 @@ import akka.util.ByteString import io.swagger.annotations._ import org.knora.webapi.IRI import org.knora.webapi.annotation.ApiMayChange -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.projectsmessages._ import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/SipiRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/SipiRouteADM.scala index 8fb24ae115..ffbf9a7a0a 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/SipiRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/SipiRouteADM.scala @@ -7,7 +7,7 @@ package org.knora.webapi.routing.admin import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.sipimessages.SipiFileInfoGetRequestADM import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/UsersRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/UsersRouteADM.scala index 49265e5b3c..10997c9aee 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/UsersRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/UsersRouteADM.scala @@ -10,7 +10,7 @@ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import io.swagger.annotations._ import org.knora.webapi.annotation.ApiMayChange -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol._ import org.knora.webapi.messages.admin.responder.usersmessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/DeleteListItemsRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/DeleteListItemsRouteADM.scala index 7f6f03d169..364f659e8c 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/DeleteListItemsRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/DeleteListItemsRouteADM.scala @@ -8,7 +8,7 @@ package org.knora.webapi.routing.admin.lists import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.Feature import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.listsmessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/OldListsRouteADMFeature.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/OldListsRouteADMFeature.scala index 39574195f2..f957e8f06b 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/OldListsRouteADMFeature.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/OldListsRouteADMFeature.scala @@ -10,8 +10,8 @@ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import io.swagger.annotations._ import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.ForbiddenException +import dsp.errors.BadRequestException +import dsp.errors.ForbiddenException import org.knora.webapi.feature.Feature import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListChildNodeCreatePayloadADM diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/UpdateListItemsRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/UpdateListItemsRouteADM.scala index 97f1317bea..4cf08041d2 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/UpdateListItemsRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/lists/UpdateListItemsRouteADM.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import io.swagger.annotations._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.Feature import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.listsmessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/routing/admin/permissions/UpdatePermissionRouteADM.scala b/webapi/src/main/scala/org/knora/webapi/routing/admin/permissions/UpdatePermissionRouteADM.scala index 8ca1149827..1d4d4643dc 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/admin/permissions/UpdatePermissionRouteADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/admin/permissions/UpdatePermissionRouteADM.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import io.swagger.annotations._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.admin.responder.permissionsmessages._ import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/ListsRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/ListsRouteV1.scala index 2ca8723520..8c8855005b 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/ListsRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/ListsRouteV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.routing.v1 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v1.responder.listmessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/ProjectsRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/ProjectsRouteV1.scala index 3ad0837a15..3478dc3e3c 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/ProjectsRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/ProjectsRouteV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.routing.v1 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.v1.responder.projectmessages._ import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourceTypesRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourceTypesRouteV1.scala index f65957911f..00d8b23fb9 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourceTypesRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourceTypesRouteV1.scala @@ -7,7 +7,7 @@ package org.knora.webapi.routing.v1 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.v1.responder.ontologymessages._ import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourcesRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourcesRouteV1.scala index 4213feb352..ea6464954f 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourcesRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/ResourcesRouteV1.scala @@ -12,10 +12,10 @@ import akka.http.scaladsl.server.Route import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.ForbiddenException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException +import dsp.errors.ForbiddenException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/SearchRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/SearchRouteV1.scala index bd7c3ffcc3..20837308f0 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/SearchRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/SearchRouteV1.scala @@ -8,7 +8,7 @@ package org.knora.webapi.routing.v1 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import org.knora.webapi.IRI -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/StandoffRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/StandoffRouteV1.scala index c3d80b7aea..966ce4e7b0 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/StandoffRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/StandoffRouteV1.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.model.Multipart import akka.http.scaladsl.model.Multipart.BodyPart import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.v1.responder.standoffmessages.RepresentationV1JsonProtocol.createMappingApiRequestV1Format import org.knora.webapi.messages.v1.responder.standoffmessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/UsersRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/UsersRouteV1.scala index 38ec4472f3..9e20d75eb4 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/UsersRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/UsersRouteV1.scala @@ -8,7 +8,7 @@ package org.knora.webapi.routing.v1 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import org.apache.commons.validator.routines.UrlValidator -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.v1.responder.usermessages._ import org.knora.webapi.routing.Authenticator diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala index ead016e378..c297724d68 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala @@ -10,9 +10,9 @@ import akka.http.scaladsl.server.Route import akka.http.scaladsl.util.FastFuture import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.InconsistentRepositoryDataException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.BadRequestException +import dsp.errors.InconsistentRepositoryDataException +import dsp.errors.NotFoundException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.usersmessages.UserADM diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala index fa83ff440f..bce2372b9f 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ListsRouteV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.routing.v2 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.v2.responder.listsmessages.ListGetRequestV2 import org.knora.webapi.messages.v2.responder.listsmessages.NodeGetRequestV2 diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala index de4bd24f48..9d7e35f8ca 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/OntologiesRouteV2.scala @@ -13,7 +13,7 @@ import akka.http.scaladsl.server.Route import java.util.UUID import scala.concurrent.Future -import exceptions.BadRequestException +import dsp.errors.BadRequestException import feature.FeatureFactoryConfig import messages.IriConversions._ import messages.util.rdf.{JsonLDDocument, JsonLDUtil} diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala index 37bf742744..bd71dc9a84 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ResourcesRouteV2.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/SearchRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/SearchRouteV2.scala index ef251204d1..516d9b79b0 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/SearchRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/SearchRouteV2.scala @@ -8,7 +8,7 @@ package org.knora.webapi.routing.v2 import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala index c776cb6843..9747b75ad7 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala @@ -10,7 +10,7 @@ import akka.http.scaladsl.model.Multipart.BodyPart import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala index 7142d2b30b..d0107dead1 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/ValuesRouteV2.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.PathMatcher import akka.http.scaladsl.server.Route import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala index 7cb3042ef8..6c059f489e 100644 --- a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala +++ b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala @@ -15,8 +15,8 @@ import akka.event.LoggingAdapter import com.typesafe.config.Config import com.typesafe.config.ConfigObject import com.typesafe.config.ConfigValue -import org.knora.webapi.exceptions.FeatureToggleException -import org.knora.webapi.exceptions.FileWriteException +import dsp.errors.FeatureToggleException +import dsp.errors.FileWriteException import org.knora.webapi.util.cache.CacheUtil.KnoraCacheConfig import java.nio.file.Files diff --git a/webapi/src/main/scala/org/knora/webapi/store/StoreManager.scala b/webapi/src/main/scala/org/knora/webapi/store/StoreManager.scala index 10ff909dd3..bdf6fa6511 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/StoreManager.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/StoreManager.scala @@ -10,7 +10,7 @@ import akka.event.LoggingReceive import org.knora.webapi.config.AppConfig import org.knora.webapi.core.LiveActorMaker import org.knora.webapi.core._ -import org.knora.webapi.exceptions.UnexpectedMessageException +import dsp.errors.UnexpectedMessageException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.feature.KnoraSettingsFeatureFactoryConfig import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceRequest diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/api/CacheServiceExceptions.scala b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/api/CacheServiceExceptions.scala index 24e0ddbec2..3387841778 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/api/CacheServiceExceptions.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/api/CacheServiceExceptions.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.cacheservice.api -import org.knora.webapi.exceptions.CacheServiceException +import dsp.errors.CacheServiceException case class EmptyKey(message: String) extends CacheServiceException(message) diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/impl/CacheServiceRedisImpl.scala b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/impl/CacheServiceRedisImpl.scala index a2ec8f9962..0bfffa2cd7 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/impl/CacheServiceRedisImpl.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/impl/CacheServiceRedisImpl.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.cacheservice.impl -import org.knora.webapi.exceptions.ForbiddenException +import dsp.errors.ForbiddenException import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierType diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/CacheSerialization.scala b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/CacheSerialization.scala index fa09a2e801..83b5db0e68 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/CacheSerialization.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/CacheSerialization.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.cacheservice.serialization -import org.knora.webapi.exceptions.CacheServiceException +import dsp.errors.CacheServiceException import zio._ import java.io.ByteArrayInputStream diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/domain/SipiKnoraJsonResponse.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/domain/SipiKnoraJsonResponse.scala index 615e399862..f7ff331a6b 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/domain/SipiKnoraJsonResponse.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/domain/SipiKnoraJsonResponse.scala @@ -1,7 +1,7 @@ package org.knora.webapi.store.iiif.domain import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import org.knora.webapi.exceptions.SipiException +import dsp.errors.SipiException import spray.json.DefaultJsonProtocol import spray.json.RootJsonFormat diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/IIIFServiceSipiImpl.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/IIIFServiceSipiImpl.scala index fd960e9bbb..d48d70aaa7 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/IIIFServiceSipiImpl.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/IIIFServiceSipiImpl.scala @@ -24,9 +24,9 @@ import org.apache.http.message.BasicNameValuePair import org.apache.http.util.EntityUtils import org.knora.webapi.auth.JWTService import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.NotFoundException -import org.knora.webapi.exceptions.SipiException +import dsp.errors.BadRequestException +import dsp.errors.NotFoundException +import dsp.errors.SipiException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.sipimessages._ import org.knora.webapi.messages.v2.responder.SuccessResponseV2 @@ -37,7 +37,7 @@ import spray.json._ import zio._ import java.util -import org.knora.webapi.exceptions.KnoraException +import dsp.errors.KnoraException /** * Makes requests to Sipi. diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala index 49eab67cd0..cc83ca7770 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala @@ -38,7 +38,7 @@ import org.apache.http.impl.client.HttpClients import org.apache.http.message.BasicNameValuePair import org.apache.http.util.EntityUtils import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.instrumentation.InstrumentationSupport import org.knora.webapi.messages.store.triplestoremessages.SparqlResultProtocol._ diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala index 769a266dd6..5007fcff1e 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdater.scala @@ -8,7 +8,7 @@ import akka.util.Timeout import com.typesafe.scalalogging.LazyLogging import com.typesafe.scalalogging.Logger import org.knora.webapi.IRI -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages._ diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala index cc1c2e914f..e26b716ce6 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307.scala @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import org.knora.webapi.IRI -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala index e6ff4b18f6..0b54f73326 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala index be368cc518..4d4caf1880 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala index c3b77432d6..6cbebb5bd8 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018.scala @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.Logger -import org.knora.webapi.exceptions.InconsistentRepositoryDataException +import dsp.errors.InconsistentRepositoryDataException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.SystemProject import org.knora.webapi.messages.OntologyConstants.KnoraBase.AttachedToProject diff --git a/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala index 12be970f84..21b7b5d190 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/ActorUtil.scala @@ -11,9 +11,9 @@ import akka.http.scaladsl.util.FastFuture import akka.util.Timeout import org.knora.webapi.config.AppConfig import org.knora.webapi.core.Logging -import org.knora.webapi.exceptions.ExceptionUtil -import org.knora.webapi.exceptions.RequestRejectedException -import org.knora.webapi.exceptions.UnexpectedMessageException +import dsp.errors.ExceptionUtil +import dsp.errors.RequestRejectedException +import dsp.errors.UnexpectedMessageException import zio._ import scala.concurrent.ExecutionContext diff --git a/webapi/src/main/scala/org/knora/webapi/util/FileUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/FileUtil.scala index 50feee9b4a..fb75817034 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/FileUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/FileUtil.scala @@ -6,8 +6,8 @@ package org.knora.webapi.util import com.typesafe.scalalogging.Logger -import org.knora.webapi.exceptions.FileWriteException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.FileWriteException +import dsp.errors.NotFoundException import org.knora.webapi.settings.KnoraSettingsImpl import java.io.ByteArrayOutputStream diff --git a/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala index 8cddf04e54..046d6ad8fe 100644 --- a/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala @@ -11,7 +11,7 @@ import net.sf.ehcache.CacheManager import net.sf.ehcache.Ehcache import net.sf.ehcache.Element import net.sf.ehcache.event.CacheEventListener -import org.knora.webapi.exceptions.ApplicationCacheException +import dsp.errors.ApplicationCacheException import org.slf4j.LoggerFactory /** diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt index 83defc177a..2a6a7248c9 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt @@ -5,7 +5,7 @@ @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt index 79ba368215..9df8d7d272 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt @@ -5,7 +5,7 @@ @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt index 6c53ed1eb7..28d510315a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt index ba491286f8..68919b75bc 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt @@ -5,7 +5,7 @@ @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateLink.scala.txt index 6a3b06cf49..8a7f70ac00 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateLink.scala.txt @@ -6,7 +6,7 @@ @import java.time.Instant @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateValue.scala.txt index bb910ea17d..133bf00219 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateInsertStatementsForCreateValue.scala.txt @@ -6,7 +6,7 @@ @import java.time.Instant @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateLink.scala.txt index 880566ba74..f32d4a863b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateLink.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateValue.scala.txt index 6385a64ba3..adf1e24936 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForCreateValue.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt index 2352d2f5de..3d05668f9b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.util.ApacheLuceneSupport.MatchStringWhileTyping @* diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt index 5f7d699447..a0dbad7412 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SearchCriterion @import org.knora.webapi.messages.v1.responder.searchmessages.SearchComparisonOperatorV1 diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt index 9f10dc958e..b12c768b47 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.util.ApacheLuceneSupport.LuceneQueryString @* diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt index 8204e988ae..11ae22eb38 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 *@ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.SmartIri @import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt index 1a3fd4e531..70c510841f 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt @@ -5,7 +5,7 @@ @import java.time.Instant @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt index 40732cab86..70c5478988 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt @@ -6,7 +6,7 @@ @import java.time.Instant @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt index 39724dd496..c6cb57b684 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 *@ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.SmartIri @import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @import java.time.Instant diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt index 17e4faa63b..f8d359cb1f 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 *@ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.SmartIri @import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @import java.time.Instant diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt index 14d1e3b154..2402cab4e5 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt @@ -5,7 +5,7 @@ @import java.time.Instant @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt index 3a1ce314fd..64a30d1946 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt @@ -6,7 +6,7 @@ @import java.time.Instant @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.{SmartIri, StringFormatter} @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForCreateLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForCreateLink.scala.txt index dcc67fd01b..0134a25f42 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForCreateLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForCreateLink.scala.txt @@ -6,7 +6,7 @@ @import java.time.Instant @import java.util.UUID @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.StringFormatter @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForValueContent.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForValueContent.scala.txt index 5d555ba506..bd6b519aac 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForValueContent.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateInsertStatementsForValueContent.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.{StringFormatter, SmartIri} @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v2.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateLink.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateLink.scala.txt index 880566ba74..f32d4a863b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateLink.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateLink.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v1.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateValue.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateValue.scala.txt index 3b5fac9217..f84ef09202 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateValue.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/generateWhereStatementsForCreateValue.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.SmartIri @import org.knora.webapi.messages.twirl.SparqlTemplateLinkUpdate @import org.knora.webapi.messages.v2.responder.valuemessages._ diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt index 6e10230a82..2656b1a6ab 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt @@ -6,7 +6,7 @@ @import java.time.Instant @import java.util.UUID @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.messages.{SmartIri, StringFormatter} @* diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt index ac76258a78..a1df781dea 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.util.ApacheLuceneSupport.LuceneQueryString diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt index 0fbaef0923..5a7287934b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.util.ApacheLuceneSupport.MatchStringWhileTyping @* diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelSubQuery.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelSubQuery.scala.txt index 77a4e30ed2..15cb06e224 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelSubQuery.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelSubQuery.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import org.knora.webapi.exceptions.SparqlGenerationException +@import dsp.errors.SparqlGenerationException @import org.knora.webapi.util.ApacheLuceneSupport.MatchStringWhileTyping @* diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/xsd/v1/xmlImport.scala.xml b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/xsd/v1/xmlImport.scala.xml index 6f6f16dfad..a4213afe77 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/xsd/v1/xmlImport.scala.xml +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/xsd/v1/xmlImport.scala.xml @@ -4,7 +4,7 @@ *@ @import org.knora.webapi._ -@import org.knora.webapi.exceptions.{AssertionException, InconsistentRepositoryDataException, SparqlGenerationException} +@import dsp.errors.{AssertionException, InconsistentRepositoryDataException, SparqlGenerationException} @import org.knora.webapi.messages.v1.responder.ontologymessages._ @import org.knora.webapi.messages.v2.responder.ontologymessages.Cardinality @import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala index c0637666d4..6bd6823698 100644 --- a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala @@ -21,7 +21,7 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.config.AppConfigForTestContainers import org.knora.webapi.core.Core import org.knora.webapi.core.Logging -import org.knora.webapi.exceptions.FileWriteException +import dsp.errors.FileWriteException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.feature.KnoraSettingsFeatureFactoryConfig import org.knora.webapi.feature.TestFeatureFactoryConfig diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala index 93145b54b1..57fafb9e79 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala @@ -11,7 +11,7 @@ import akka.http.scaladsl.server.Directives.get import akka.http.scaladsl.server.Directives.path import akka.http.scaladsl.server.Route import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.http.handler /** @@ -85,7 +85,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.NotFound) responseAs[String] should be( - "{\"status\":9,\"error\":\"org.knora.webapi.exceptions.NotFoundException: not found\"}" + "{\"status\":9,\"error\":\"dsp.errors.NotFoundException: not found\"}" ) } @@ -94,7 +94,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.NotFound) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.NotFoundException: not found\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.NotFoundException: not found\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -102,7 +102,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.NotFound) - responseAs[String] should be("{\"error\":\"org.knora.webapi.exceptions.NotFoundException: not found\"}") + responseAs[String] should be("{\"error\":\"dsp.errors.NotFoundException: not found\"}") } } @@ -112,7 +112,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Forbidden) responseAs[String] should be( - "{\"status\":3,\"error\":\"org.knora.webapi.exceptions.ForbiddenException: forbidden\",\"access\":\"NO_ACCESS\"}" + "{\"status\":3,\"error\":\"dsp.errors.ForbiddenException: forbidden\",\"access\":\"NO_ACCESS\"}" ) } @@ -121,7 +121,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Forbidden) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.ForbiddenException: forbidden\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.ForbiddenException: forbidden\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -129,7 +129,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Forbidden) - responseAs[String] should be("{\"error\":\"org.knora.webapi.exceptions.ForbiddenException: forbidden\"}") + responseAs[String] should be("{\"error\":\"dsp.errors.ForbiddenException: forbidden\"}") } } @@ -139,7 +139,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"status\":28,\"error\":\"org.knora.webapi.exceptions.DuplicateValueException: duplicate value\"}" + "{\"status\":28,\"error\":\"dsp.errors.DuplicateValueException: duplicate value\"}" ) } @@ -148,7 +148,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.DuplicateValueException: duplicate value\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.DuplicateValueException: duplicate value\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -157,7 +157,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"error\":\"org.knora.webapi.exceptions.DuplicateValueException: duplicate value\"}" + "{\"error\":\"dsp.errors.DuplicateValueException: duplicate value\"}" ) } } @@ -168,7 +168,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"status\":29,\"error\":\"org.knora.webapi.exceptions.OntologyConstraintException: ontology constraint\"}" + "{\"status\":29,\"error\":\"dsp.errors.OntologyConstraintException: ontology constraint\"}" ) } @@ -177,7 +177,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.OntologyConstraintException: ontology constraint\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.OntologyConstraintException: ontology constraint\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -186,7 +186,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"error\":\"org.knora.webapi.exceptions.OntologyConstraintException: ontology constraint\"}" + "{\"error\":\"dsp.errors.OntologyConstraintException: ontology constraint\"}" ) } } @@ -197,7 +197,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Conflict) responseAs[String] should be( - "{\"status\":27,\"error\":\"org.knora.webapi.exceptions.EditConflictException: edit conflict\"}" + "{\"status\":27,\"error\":\"dsp.errors.EditConflictException: edit conflict\"}" ) } @@ -206,7 +206,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Conflict) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.EditConflictException: edit conflict\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.EditConflictException: edit conflict\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -214,7 +214,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Conflict) - responseAs[String] should be("{\"error\":\"org.knora.webapi.exceptions.EditConflictException: edit conflict\"}") + responseAs[String] should be("{\"error\":\"dsp.errors.EditConflictException: edit conflict\"}") } } @@ -224,7 +224,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"status\":11,\"error\":\"org.knora.webapi.exceptions.GravsearchException: sparql search\"}" + "{\"status\":11,\"error\":\"dsp.errors.GravsearchException: sparql search\"}" ) } @@ -233,7 +233,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.GravsearchException: sparql search\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.GravsearchException: sparql search\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -241,7 +241,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.BadRequest) - responseAs[String] should be("{\"error\":\"org.knora.webapi.exceptions.GravsearchException: sparql search\"}") + responseAs[String] should be("{\"error\":\"dsp.errors.GravsearchException: sparql search\"}") } } @@ -251,7 +251,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Conflict) responseAs[String] should be( - "{\"status\":27,\"error\":\"org.knora.webapi.exceptions.UpdateNotPerformedException: update not performed\"}" + "{\"status\":27,\"error\":\"dsp.errors.UpdateNotPerformedException: update not performed\"}" ) } @@ -260,7 +260,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Conflict) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.UpdateNotPerformedException: update not performed\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.UpdateNotPerformedException: update not performed\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -269,7 +269,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.Conflict) responseAs[String] should be( - "{\"error\":\"org.knora.webapi.exceptions.UpdateNotPerformedException: update not performed\"}" + "{\"error\":\"dsp.errors.UpdateNotPerformedException: update not performed\"}" ) } } @@ -280,7 +280,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.InternalServerError) responseAs[String] should be( - "{\"status\":4,\"error\":\"org.knora.webapi.exceptions.AuthenticationException: authentication exception\"}" + "{\"status\":4,\"error\":\"dsp.errors.AuthenticationException: authentication exception\"}" ) } @@ -289,7 +289,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.InternalServerError) responseAs[String] should be( - "{\"knora-api:error\":\"org.knora.webapi.exceptions.AuthenticationException: authentication exception\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" + "{\"knora-api:error\":\"dsp.errors.AuthenticationException: authentication exception\",\"@context\":{\"knora-api\":\"http://api.knora.org/ontology/knora-api/v2#\"}}" ) } @@ -298,7 +298,7 @@ class ExceptionHandlerR2RSpec extends R2RSpec { status should be(StatusCodes.InternalServerError) responseAs[String] should be( - "{\"error\":\"org.knora.webapi.exceptions.AuthenticationException: authentication exception\"}" + "{\"error\":\"dsp.errors.AuthenticationException: authentication exception\"}" ) } } diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala b/webapi/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala index a383f87973..25192890ea 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala @@ -7,7 +7,7 @@ package org.knora.webapi.e2e import com.typesafe.scalalogging.LazyLogging import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala index 76bbf65781..af17d39f0a 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala @@ -10,7 +10,7 @@ import akka.http.scaladsl.testkit.RouteTestTimeout import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi.E2ESpec -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.util.FileUtil diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala index dd589962c9..549598b5fb 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala @@ -11,10 +11,10 @@ import akka.http.scaladsl.model.headers.BasicHttpCredentials import akka.http.scaladsl.testkit.RouteTestTimeout import akka.pattern._ import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.InvalidApiJsonException -import org.knora.webapi.exceptions.NotFoundException -import org.knora.webapi.exceptions.TriplestoreResponseException +import dsp.errors.AssertionException +import dsp.errors.InvalidApiJsonException +import dsp.errors.NotFoundException +import dsp.errors.TriplestoreResponseException import org.knora.webapi.http.directives.DSPApiDirectives import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.store.triplestoremessages._ diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala index db364a3f96..1acf95986e 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala @@ -9,7 +9,7 @@ import akka.actor.ActorSystem import akka.http.javadsl.model.StatusCodes import akka.http.scaladsl.testkit.RouteTestTimeout import org.knora.webapi._ -import org.knora.webapi.exceptions.InvalidApiJsonException +import dsp.errors.InvalidApiJsonException import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.routing.v1.SearchRouteV1 import org.scalatest.Assertion diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala index 27a83ebbef..af3a6c9573 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala @@ -11,7 +11,7 @@ import akka.http.scaladsl.model.headers.BasicHttpCredentials import akka.http.scaladsl.testkit.RouteTestTimeout import org.knora.webapi._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions.FileWriteException +import dsp.errors.FileWriteException import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.v1.responder.resourcemessages.CreateResourceApiRequestV1 import org.knora.webapi.messages.v1.responder.resourcemessages.CreateResourceValueV1 diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala index ba4e61f6cf..ef41c7f953 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala @@ -11,7 +11,7 @@ import akka.http.scaladsl.model._ import akka.http.scaladsl.model.headers.BasicHttpCredentials import akka.http.scaladsl.testkit.RouteTestTimeout import org.knora.webapi._ -import org.knora.webapi.exceptions.InvalidApiJsonException +import dsp.errors.InvalidApiJsonException import org.knora.webapi.http.directives.DSPApiDirectives import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.store.triplestoremessages._ diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala index f8c9d21c0a..73b32d5ea4 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala @@ -9,7 +9,7 @@ import org.knora.webapi._ import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.http.directives.DSPApiDirectives import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala index abde33c856..4ff5003cc6 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala @@ -22,7 +22,7 @@ import org.knora.webapi.e2e.InstanceChecker import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath import org.knora.webapi.e2e.v2.ResponseCheckerV2._ -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.http.directives.DSPApiDirectives import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala index 51457113c2..9bf89181ec 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala @@ -6,7 +6,7 @@ package org.knora.webapi.e2e.v2 import org.knora.webapi.IRI -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala index feb3cfebcc..553dbfa329 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala @@ -15,7 +15,7 @@ import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath import org.knora.webapi.e2e.v2.ResponseCheckerV2.compareJSONLDForResourcesResponse -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala index 9c69076f1c..c3481d48cf 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala @@ -15,7 +15,7 @@ import org.knora.webapi.config.AppConfig import org.knora.webapi.e2e.ClientTestDataCollector import org.knora.webapi.e2e.TestDataFileContent import org.knora.webapi.e2e.TestDataFilePath -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala index ceea11100f..ebe68e2dac 100644 --- a/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala @@ -11,7 +11,7 @@ import akka.http.scaladsl.unmarshalling.Unmarshal import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi.ITKnoraLiveSpec -import org.knora.webapi.exceptions.InvalidApiJsonException +import dsp.errors.InvalidApiJsonException import org.knora.webapi.messages.store.sipimessages._ import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala index 8a6aedc058..0364975a96 100644 --- a/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala @@ -19,8 +19,8 @@ import akka.http.scaladsl.unmarshalling.Unmarshal import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.InvalidApiJsonException +import dsp.errors.AssertionException +import dsp.errors.InvalidApiJsonException import org.knora.webapi.messages.store.sipimessages._ import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol diff --git a/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala index f973958059..e725d0a562 100644 --- a/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala @@ -11,8 +11,8 @@ import akka.http.scaladsl.unmarshalling.Unmarshal import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala index a0fdb31285..754bd4a247 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala @@ -6,8 +6,8 @@ package org.knora.webapi.messages import org.knora.webapi._ -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter.SalsahGuiAttributeDefinition import org.knora.webapi.sharedtestdata.SharedOntologyTestDataADM diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala index 2267c8149a..579a0c1ccf 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala @@ -11,7 +11,7 @@ import dsp.valueobjects.List._ import dsp.valueobjects.ListErrorMessages import dsp.valueobjects.V2 import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListChildNodeCreatePayloadADM import org.knora.webapi.messages.store.triplestoremessages.StringLiteralSequenceV2 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @@ -129,7 +129,7 @@ class ListsMessagesADMSpec extends CoreSpec(ListsMessagesADMSpec.config) with Li } "throw 'BadRequestException' if invalid position given in payload of `createChildNodeRequest`" in { - val caught = intercept[V2.BadRequestException]( + val caught = intercept[BadRequestException]( ListChildNodeCreateRequestADM( createChildNodeRequest = ListChildNodeCreatePayloadADM( parentNodeIri = ListIri.make(exampleListIri).fold(e => throw e.head, v => v), diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala index 73d5931186..d1d6d30e6d 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala @@ -7,8 +7,8 @@ package org.knora.webapi.messages.admin.responder.permissionsmessages import dsp.valueobjects.IriErrorMessages import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.ForbiddenException +import dsp.errors.BadRequestException +import dsp.errors.ForbiddenException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.AdministrativePermissionAbbreviations import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbbreviations diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala index d55d8bcb2c..08d8ff456e 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.messages.admin.responder.projectsmessages import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.OntologyConstraintException +import dsp.errors.BadRequestException +import dsp.errors.OntologyConstraintException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.sharedtestdata.SharedTestDataADM diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala index caea9d5407..cb94c3633b 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala @@ -8,7 +8,7 @@ package org.knora.webapi.messages.admin.responder.usersmessages import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionProfileType import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsDataADM diff --git a/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala index c3ee581a9c..066b1c1fab 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.messages.store.triplestoremessages -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.admin.responder.listsmessages._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala index 989bc5b018..ee33e79832 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.util import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.util._ /** diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala index aee1a8a3fc..a7d852ab22 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.util -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.util.DateUtilV1 import org.knora.webapi.messages.util.DateUtilV1.DateRange import org.knora.webapi.messages.v1.responder.valuemessages.DateValueV1 diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala index 51064dd8a2..d3375daaef 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.util.rdf import org.knora.webapi.CoreSpec import org.knora.webapi.IRI -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.feature._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala index 5db6d9e71a..9ea737220b 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.util.rdf import com.typesafe.config.ConfigFactory import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.feature._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala index 863ca1f330..4da24f9008 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala @@ -8,7 +8,7 @@ package org.knora.webapi.util.search.gravsearch import org.knora.webapi.ApiV2Complex import org.knora.webapi.ApiV2Simple import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.search._ diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala index b6cf4ed71d..6e7982f641 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala @@ -2,7 +2,7 @@ package org.knora.webapi.util.search.gravsearch.prequery import akka.actor.ActorSystem import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala index fad150283c..aa6577a5a0 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala @@ -1,7 +1,7 @@ package org.knora.webapi.util.search.gravsearch.prequery import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.feature.FeatureFactoryConfig import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala index 3296e02f5f..5b9befd3e3 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.util.search.gravsearch.types import akka.testkit.ImplicitSender import org.knora.webapi._ -import org.knora.webapi.exceptions.GravsearchException +import dsp.errors.GravsearchException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.util.search._ diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala index 8c5a3fc312..00a50cb24f 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.util.standoff import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.StandoffConversionException +import dsp.errors.StandoffConversionException import org.knora.webapi.messages.util.standoff.XMLUtil import org.knora.webapi.util.FileUtil import org.xmlunit.builder.DiffBuilder diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala index 1cf26e7ca9..7c04c8f10d 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.messages.v2.responder.ontologymessages import org.knora.webapi.ApiV2Complex import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2 diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala index f6b45543a1..b941e7693a 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala @@ -1,7 +1,7 @@ package org.knora.webapi.messages.v2.responder.resourcesmessages import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadRequestException import org.knora.webapi.messages.v2.responder.resourcemessages._ import org.knora.webapi.sharedtestdata._ diff --git a/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala b/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala index beb65d61e5..691e10ade1 100644 --- a/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala @@ -2,7 +2,7 @@ package org.knora.webapi.models.filemodels import org.knora.webapi.ApiV2Complex import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.v2.responder.resourcemessages.CreateValueInNewResourceV2 diff --git a/webapi/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala index 6fef6002dd..f034adcd05 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala @@ -1,7 +1,7 @@ package org.knora.webapi.responders import org.knora.webapi.IRI -import org.knora.webapi.exceptions.ApplicationLockException +import dsp.errors.ApplicationLockException import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala index b0946947a3..8dc6c7adbb 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala @@ -17,9 +17,9 @@ import dsp.valueobjects.Group._ import dsp.valueobjects.Iri._ import dsp.valueobjects.V2 import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DuplicateValueException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.BadRequestException +import dsp.errors.DuplicateValueException +import dsp.errors.NotFoundException import org.knora.webapi.messages.admin.responder.groupsmessages._ import org.knora.webapi.messages.admin.responder.usersmessages.UserInformationTypeADM import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala index 395eb21078..7aec9cbe18 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala @@ -13,9 +13,9 @@ import dsp.valueobjects.Iri._ import dsp.valueobjects.List._ import dsp.valueobjects.V2 import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DuplicateValueException -import org.knora.webapi.exceptions.UpdateNotPerformedException +import dsp.errors.BadRequestException +import dsp.errors.DuplicateValueException +import dsp.errors.UpdateNotPerformedException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListChildNodeCreatePayloadADM import org.knora.webapi.messages.admin.responder.listsmessages.ListNodeCreatePayloadADM.ListRootNodeCreatePayloadADM diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala index f94e99538b..51a85eb30a 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala @@ -10,10 +10,10 @@ import akka.testkit.ImplicitSender import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DuplicateValueException -import org.knora.webapi.exceptions.ForbiddenException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.BadRequestException +import dsp.errors.DuplicateValueException +import dsp.errors.ForbiddenException +import dsp.errors.NotFoundException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.OntologyConstants.KnoraBase.EntityPermissionAbbreviations import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala index d4c34579ed..2a789ccdd8 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala @@ -17,9 +17,9 @@ import dsp.valueobjects.Iri.ProjectIri import dsp.valueobjects.Project._ import dsp.valueobjects.V2 import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DuplicateValueException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.BadRequestException +import dsp.errors.DuplicateValueException +import dsp.errors.NotFoundException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.permissionsmessages._ diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala index a5ee1dd022..1bbbcb8d12 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala @@ -12,10 +12,10 @@ import com.typesafe.config.ConfigFactory import dsp.valueobjects.User._ import dsp.valueobjects.V2 import org.knora.webapi._ -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.DuplicateValueException -import org.knora.webapi.exceptions.ForbiddenException -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.BadRequestException +import dsp.errors.DuplicateValueException +import dsp.errors.ForbiddenException +import dsp.errors.NotFoundException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.groupsmessages.GroupMembersGetRequestADM import org.knora.webapi.messages.admin.responder.groupsmessages.GroupMembersGetResponseADM diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala index 05c055730d..75b8f209ff 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.responders.v1 import akka.testkit._ import org.knora.webapi._ -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.NotFoundException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.MessageUtil import org.knora.webapi.messages.v1.responder.ontologymessages._ diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala index 6dd74a6e54..d8b1846db4 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala @@ -14,7 +14,7 @@ import akka.testkit.ImplicitSender import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.NotFoundException import org.knora.webapi.messages.v1.responder.projectmessages._ import org.knora.webapi.sharedtestdata.SharedTestDataV1 diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala index 03502017eb..988034f164 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala @@ -10,9 +10,9 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.NotFoundException -import org.knora.webapi.exceptions.OntologyConstraintException +import dsp.errors.BadRequestException +import dsp.errors.NotFoundException +import dsp.errors.OntologyConstraintException import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala index b3167ec0b0..1c0a20c348 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala @@ -14,7 +14,7 @@ import akka.testkit.ImplicitSender import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ -import org.knora.webapi.exceptions.NotFoundException +import dsp.errors.NotFoundException import org.knora.webapi.messages.v1.responder.usermessages._ import org.knora.webapi.sharedtestdata.SharedTestDataV1 diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala index b4e96b4a15..33f14e79ac 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala @@ -10,7 +10,7 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.knora.webapi._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.StringFormatter diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala index 3a1bab1022..bd608f4c0e 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.responders.v2 import akka.testkit.ImplicitSender import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala index c56ac7a4c6..0ab85747f7 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.v2 import akka.testkit.ImplicitSender import org.knora.webapi._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala index a10ba13f32..f7d662ae97 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala @@ -9,7 +9,7 @@ import akka.pattern.ask import akka.testkit.ImplicitSender import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.store.triplestoremessages._ import org.knora.webapi.messages.v2.responder.standoffmessages._ diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala index 2dd4829836..550029a7a2 100644 --- a/webapi/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala @@ -8,7 +8,7 @@ package org.knora.webapi.responders.v2 import akka.testkit.ImplicitSender import org.knora.webapi._ import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions._ +import dsp.errors._ import org.knora.webapi.messages.IriConversions._ import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.SmartIri diff --git a/webapi/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala b/webapi/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala index a0fa0c90f0..290ba26f50 100644 --- a/webapi/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala @@ -8,8 +8,8 @@ package org.knora.webapi.routing import akka.testkit.ImplicitSender import akka.util.Timeout import org.knora.webapi._ -import org.knora.webapi.exceptions.BadCredentialsException -import org.knora.webapi.exceptions.BadRequestException +import dsp.errors.BadCredentialsException +import dsp.errors.BadRequestException import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM diff --git a/webapi/src/test/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala b/webapi/src/test/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala index 39663efa66..5a6d3f6fb8 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.iiif.impl -import org.knora.webapi.exceptions.SipiException +import dsp.errors.SipiException import org.knora.webapi.messages.store.sipimessages._ import org.knora.webapi.messages.v2.responder.SuccessResponseV2 import org.knora.webapi.store.iiif.api.IIIFService diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/HttpTriplestoreConnectorSpec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/HttpTriplestoreConnectorSpec.scala index 9d47e81d36..70d7a325d8 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/HttpTriplestoreConnectorSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/HttpTriplestoreConnectorSpec.scala @@ -7,7 +7,7 @@ package org.knora.webapi.store.triplestore import akka.testkit.ImplicitSender import org.knora.webapi.CoreSpec -import org.knora.webapi.exceptions.TriplestoreTimeoutException +import dsp.errors.TriplestoreTimeoutException import org.knora.webapi.messages.store.triplestoremessages.SimulateTimeoutRequest import scala.concurrent.duration._ diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala index 28f4e12a32..83d3494cb4 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala @@ -5,7 +5,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala index a0e50b04ec..2d75505354 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.LazyLogging -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.util.rdf._ diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala index 3a9037ee7c..92156da8d7 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.store.triplestore.upgrade.plugins import com.typesafe.scalalogging.LazyLogging -import org.knora.webapi.exceptions.AssertionException +import dsp.errors.AssertionException import org.knora.webapi.messages.util.rdf._ class UpgradePluginPR1921Spec extends UpgradePluginSpec with LazyLogging { diff --git a/webapi/src/test/scala/org/knora/webapi/testservices/TestClientService.scala b/webapi/src/test/scala/org/knora/webapi/testservices/TestClientService.scala index f7e99dfb7c..cad780a025 100644 --- a/webapi/src/test/scala/org/knora/webapi/testservices/TestClientService.scala +++ b/webapi/src/test/scala/org/knora/webapi/testservices/TestClientService.scala @@ -17,10 +17,10 @@ import org.apache.http.impl.client.HttpClients import org.apache.http.impl.conn.PoolingHttpClientConnectionManager import org.apache.http.util.EntityUtils import org.knora.webapi.config.AppConfig -import org.knora.webapi.exceptions.AssertionException -import org.knora.webapi.exceptions.BadRequestException -import org.knora.webapi.exceptions.NotFoundException -import org.knora.webapi.exceptions.SipiException +import dsp.errors.AssertionException +import dsp.errors.BadRequestException +import dsp.errors.NotFoundException +import dsp.errors.SipiException import org.knora.webapi.messages.store.sipimessages.SipiUploadResponse import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol._ import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject diff --git a/webapi/src/test/scala/org/knora/webapi/util/TestExtractorMethods.scala b/webapi/src/test/scala/org/knora/webapi/util/TestExtractorMethods.scala index 8cea128a1c..dbc0342c62 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/TestExtractorMethods.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/TestExtractorMethods.scala @@ -7,7 +7,7 @@ package org.knora.webapi.util import akka.actor.ActorSystem import akka.http.scaladsl.model.HttpResponse -import org.knora.webapi.exceptions.InvalidApiJsonException +import dsp.errors.InvalidApiJsonException import spray.json.JsString import scala.concurrent.ExecutionContext