From 1eee11a68bc608eab67da463238e3f1d0ec87986 Mon Sep 17 00:00:00 2001 From: Gunnar Velle Date: Wed, 5 Mar 2025 12:21:53 +0100 Subject: [PATCH] fmt --- .../main/scala/no/ndla/network/tapir/TapirErrorHandling.scala | 2 +- .../src/main/scala/no/ndla/searchapi/model/api/Error.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network/src/main/scala/no/ndla/network/tapir/TapirErrorHandling.scala b/network/src/main/scala/no/ndla/network/tapir/TapirErrorHandling.scala index 9ede42c5f..282249f04 100644 --- a/network/src/main/scala/no/ndla/network/tapir/TapirErrorHandling.scala +++ b/network/src/main/scala/no/ndla/network/tapir/TapirErrorHandling.scala @@ -120,7 +120,7 @@ trait TapirErrorHandling extends StrictLogging { def invalidSearchContext: ErrorBody = ErrorBody(INVALID_SEARCH_CONTEXT, INVALID_SEARCH_CONTEXT_DESCRIPTION, clock.now(), 400) def methodNotAllowed: ErrorBody = ErrorBody(METHOD_NOT_ALLOWED, METHOD_NOT_ALLOWED_DESCRIPTION, clock.now(), 405) - def indexConflict: ErrorBody = ErrorBody(CONFLICT, INDEX_CONFLICT_DESCRIPTION, clock.now(), 409) + def indexConflict: ErrorBody = ErrorBody(CONFLICT, INDEX_CONFLICT_DESCRIPTION, clock.now(), 409) def validationError(ve: ValidationException): ValidationErrorBody = ValidationErrorBody(VALIDATION, VALIDATION_DESCRIPTION, clock.now(), messages = ve.errors.some, 400) def errorBody(code: String, description: String, statusCode: Int): ErrorBody = diff --git a/search-api/src/main/scala/no/ndla/searchapi/model/api/Error.scala b/search-api/src/main/scala/no/ndla/searchapi/model/api/Error.scala index f1e3292f7..cbcc42a1d 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/model/api/Error.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/model/api/Error.scala @@ -29,8 +29,8 @@ trait ErrorHandling extends TapirErrorHandling { case te: TaxonomyException => errorBody(TAXONOMY_FAILURE, te.getMessage, 500) case v: ValidationException => ValidationErrorBody(VALIDATION, VALIDATION_DESCRIPTION, clock.now(), messages = v.errors.some, 400) - case ade: AccessDeniedException => forbiddenMsg(ade.getMessage) - case _: DocumentConflictException => indexConflict + case ade: AccessDeniedException => forbiddenMsg(ade.getMessage) + case _: DocumentConflictException => indexConflict case NdlaSearchException(_, Some(rf), _, _) if rf.error.rootCause .exists(x => x.`type` == "search_context_missing_exception" || x.reason == "Cannot parse scroll id") =>