Skip to content

Commit

Permalink
fix: Fix precedence of endpoints so that /v2/resources/info is routed…
Browse files Browse the repository at this point in the history
… to the ResourceInfoEndpointHandler (#3409)
  • Loading branch information
seakayone authored Oct 30, 2024
1 parent 79e7194 commit af0388e
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ final case class ApiRoutes(
.withAllowedMethods(List(GET, PUT, POST, DELETE, PATCH, HEAD, OPTIONS)),
) {
DSPApiDirectives.handleErrors(routeData.appConfig) {
OntologiesRouteV2().makeRoute ~
ResourcesRouteV2(routeData.appConfig).makeRoute ~
StandoffRouteV2().makeRoute ~
ValuesRouteV2().makeRoute ~
val tapirRoutes =
(adminApiRoutes.routes ++ authenticationApiRoutes.routes ++ resourceInfoRoutes.routes ++ searchApiRoutes.routes ++ managementRoutes.routes ++ listsApiV2Routes.routes ++ shaclApiRoutes.routes)
.reduce(_ ~ _)
val pekkoRoutes =
OntologiesRouteV2().makeRoute ~
ResourcesRouteV2(routeData.appConfig).makeRoute ~
StandoffRouteV2().makeRoute ~
ValuesRouteV2().makeRoute
tapirRoutes ~ pekkoRoutes
}
}
}
Expand Down

0 comments on commit af0388e

Please sign in to comment.