From 16f4e6df51747351727c52881dafe0d08b73d8f3 Mon Sep 17 00:00:00 2001 From: Pauline Date: Thu, 28 Nov 2024 11:53:54 +0000 Subject: [PATCH] Revert formatting changes --- .../enhancer/AuthorizerResourceEnhancer.kt | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/enhancer/AuthorizerResourceEnhancer.kt b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/enhancer/AuthorizerResourceEnhancer.kt index 406076ba..556ed2b5 100644 --- a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/enhancer/AuthorizerResourceEnhancer.kt +++ b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/enhancer/AuthorizerResourceEnhancer.kt @@ -32,41 +32,36 @@ import org.radarbase.authorizer.service.DelegatedRestSourceAuthorizationService. import org.radarbase.authorizer.service.GarminSourceAuthorizationService import org.radarbase.authorizer.service.OAuth2RestSourceAuthorizationService import org.radarbase.authorizer.service.OuraAuthorizationService -import org.radarbase.jersey.service.managementportal.RadarProjectService import org.radarbase.authorizer.service.RegistrationService import org.radarbase.authorizer.service.RestSourceAuthorizationService import org.radarbase.authorizer.service.RestSourceClientService import org.radarbase.authorizer.service.RestSourceUserService import org.radarbase.jersey.enhancer.JerseyResourceEnhancer import org.radarbase.jersey.filter.Filters -import org.radarbase.jersey.service.ProjectService class AuthorizerResourceEnhancer( private val config: AuthorizerConfig, ) : JerseyResourceEnhancer { - private val restSourceClients = - RestSourceClients( - config.restSourceClients - .map { it.withEnv() } - .onEach { - requireNotNull(it.clientId) { "Client ID of ${it.sourceType} is missing" } - requireNotNull(it.clientSecret) { "Client secret of ${it.sourceType} is missing" } - }, - ) + private val restSourceClients = RestSourceClients( + config.restSourceClients + .map { it.withEnv() } + .onEach { + requireNotNull(it.clientId) { "Client ID of ${it.sourceType} is missing" } + requireNotNull(it.clientSecret) { "Client secret of ${it.sourceType} is missing" } + }, + ) override val classes: Array> - get() = - listOfNotNull( - Filters.cache, - Filters.logResponse, - if (config.service.enableCors == true) Filters.cors else null, - ).toTypedArray() - - override val packages: Array = - arrayOf( - "org.radarbase.authorizer.resources", - "org.radarbase.authorizer.lifecycle", - ) + get() = listOfNotNull( + Filters.cache, + Filters.logResponse, + if (config.service.enableCors == true) Filters.cors else null, + ).toTypedArray() + + override val packages: Array = arrayOf( + "org.radarbase.authorizer.resources", + "org.radarbase.authorizer.lifecycle", + ) override fun AbstractBinder.enhance() { // Bind instances. These cannot use any injects themselves