fix: ktlint upgrade

.editorconfig

@@ -0,0 +1,2 @@
+[{*.kts,*.kt}]
+ktlint_standard_no-wildcard-imports = disabled

build.gradle.kts

@@ -12,10 +12,11 @@ plugins {
     kotlin("plugin.allopen") version kotlinVersion
     kotlin("kapt") version kotlinVersion
     id("com.github.node-gradle.node") version "3.5.1"
-    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
+    id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
 }
 
 configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
+    version.set("0.50.0")
     outputToConsole.set(true)
     coloredOutput.set(true)
     disabledRules.set(setOf("no-wildcard-imports", "parameter-list-wrapping"))
@@ -101,7 +102,7 @@ tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf(
             "-Xjsr305=strict",
-            "-opt-in=kotlin.time.ExperimentalTime"
+            "-opt-in=kotlin.time.ExperimentalTime",
         )
         jvmTarget = "11"
     }

src/main/kotlin/io/github/bayang/jelu/config/AuthHeaderFilter.kt

@@ -21,13 +21,13 @@ private val LOGGER = KotlinLogging.logger {}
 @ConditionalOnProperty(name = ["jelu.auth.proxy.enabled"], havingValue = "true", matchIfMissing = false)
 class AuthHeaderFilter(
     private val userService: UserService,
-    private val properties: JeluProperties
+    private val properties: JeluProperties,
 ) : OncePerRequestFilter() {
 
     override fun doFilterInternal(
         request: HttpServletRequest,
         response: HttpServletResponse,
-        filterChain: FilterChain
+        filterChain: FilterChain,
     ) {
         val headerName = properties.auth.proxy.header
         val headerAuth: String? = request.getHeader(headerName)
@@ -44,7 +44,7 @@ class AuthHeaderFilter(
             val authentication = UsernamePasswordAuthenticationToken(
                 user,
                 null,
-                user.authorities
+                user.authorities,
             )
             authentication.details = WebAuthenticationDetailsSource().buildDetails(request)
             SecurityContextHolder.getContext().authentication = authentication

src/main/kotlin/io/github/bayang/jelu/config/GlobalConfig.kt

@@ -26,8 +26,8 @@ class GlobalConfig {
         }.build()
         return WebClient.builder().exchangeStrategies(exchange).clientConnector(
             ReactorClientHttpConnector(
-                HttpClient.create().compress(true).followRedirect(true)
-            )
+                HttpClient.create().compress(true).followRedirect(true),
+            ),
         ).build()
     }
 
@@ -45,7 +45,7 @@ class GlobalConfig {
                     allowCredentials = true
                     addExposedHeader(HttpHeaders.CONTENT_DISPOSITION)
                     addExposedHeader(sessionHeaderName)
-                }
+                },
             )
         }
 }

src/main/kotlin/io/github/bayang/jelu/config/JeluLdapUserDetailsContextMapper.kt

@@ -21,14 +21,14 @@ private val logger = KotlinLogging.logger {}
 @Component
 @ConditionalOnProperty(name = ["jelu.auth.ldap.enabled"], havingValue = "true", matchIfMissing = false)
 class JeluLdapUserDetailsContextMapper(
-    private val userRepository: UserRepository
+    private val userRepository: UserRepository,
 ) : UserDetailsContextMapper {
 
     @Transactional
     override fun mapUserFromContext(
         ctx: DirContextOperations?,
         username: String?,
-        authorities: MutableCollection<out GrantedAuthority>?
+        authorities: MutableCollection<out GrantedAuthority>?,
     ): UserDetails {
         dumpAttributesForDebug(ctx?.attributes)
         val isAdmin = findAdminMembership(ctx?.attributes)

src/main/kotlin/io/github/bayang/jelu/config/JeluProperties.kt

@@ -17,49 +17,49 @@ data class JeluProperties(
     val metadata: Metadata = Metadata(Calibre(null)),
     val auth: Auth = Auth(
         Ldap(),
-        Proxy()
+        Proxy(),
     ),
     val metadataProviders: List<MetaDataProvider>?,
-    val lucene: Lucene = Lucene(indexAnalyzer = IndexAnalyzer())
+    val lucene: Lucene = Lucene(indexAnalyzer = IndexAnalyzer()),
 ) {
 
     data class MetaDataProvider(
         var name: String,
         var isEnabled: Boolean = false,
         var apiKey: String?,
-        var order: Int = -1000
+        var order: Int = -1000,
     )
 
     data class Database(
-        @get:NotBlank var path: String
+        @get:NotBlank var path: String,
     )
 
     data class Files(
         @get:NotBlank var images: String,
         @get:NotBlank var imports: String,
-        var resizeImages: Boolean = true
+        var resizeImages: Boolean = true,
     )
 
     data class Session(
-        @get:Positive var duration: Int
+        @get:Positive var duration: Int,
     )
 
     data class Cors(
-        var allowedOrigins: List<String> = emptyList()
+        var allowedOrigins: List<String> = emptyList(),
     )
 
     data class Calibre(
         var path: String?,
-        var order: Int = 1000
+        var order: Int = 1000,
     )
 
     data class Metadata(
-        var calibre: Calibre
+        var calibre: Calibre,
     )
 
     data class Auth(
         var ldap: Ldap,
-        var proxy: Proxy
+        var proxy: Proxy,
     )
 
     data class Ldap(
@@ -69,28 +69,28 @@ data class JeluProperties(
         val userSearchFilter: String = "",
         val userSearchBase: String = "",
         val userDn: String = "",
-        val password: String = ""
+        val password: String = "",
     )
 
     data class Proxy(
         var enabled: Boolean = false,
         val adminName: String = "",
-        val header: String = "X-Authenticated-User"
+        val header: String = "X-Authenticated-User",
     )
 
     data class IndexAnalyzer(
         @get:Positive
         var minGram: Int = 3,
         @get:Positive
         var maxGram: Int = 10,
-        var preserveOriginal: Boolean = true
+        var preserveOriginal: Boolean = true,
     )
 
     data class Lucene(
         @get:NotBlank
         var dataDirectory: String = "",
 
-        var indexAnalyzer: IndexAnalyzer
+        var indexAnalyzer: IndexAnalyzer,
 
     )
 }

src/main/kotlin/io/github/bayang/jelu/config/LdapConfig.kt

@@ -16,7 +16,7 @@ import org.springframework.security.ldap.userdetails.UserDetailsContextMapper
 @ConditionalOnProperty(name = ["jelu.auth.ldap.enabled"], havingValue = "true", matchIfMissing = false)
 class LdapConfig(
     private val userDetailsContextMapper: UserDetailsContextMapper,
-    private val properties: JeluProperties
+    private val properties: JeluProperties,
 ) {
 
     @Bean
@@ -41,7 +41,7 @@ class LdapConfig(
         if (!properties.auth.ldap.userSearchFilter.isNullOrBlank()) {
             val userSearchBase = if (properties.auth.ldap.userSearchBase.isNullOrBlank()) "" else properties.auth.ldap.userSearchBase
             authenticator.setUserSearch(
-                FilterBasedLdapUserSearch(userSearchBase, properties.auth.ldap.userSearchFilter, contextSource)
+                FilterBasedLdapUserSearch(userSearchBase, properties.auth.ldap.userSearchFilter, contextSource),
             )
         }
         authenticator.afterPropertiesSet()

src/main/kotlin/io/github/bayang/jelu/config/LuceneConfiguration.kt

@@ -12,7 +12,7 @@ import java.nio.file.Paths
 
 @Configuration
 class LuceneConfiguration(
-    private val jeluProperties: JeluProperties
+    private val jeluProperties: JeluProperties,
 ) {
 
     @Bean

src/main/kotlin/io/github/bayang/jelu/config/OpenApiConfig.kt

@@ -22,19 +22,19 @@ class OpenApiConfig {
                 Info()
                     .title("Jelu API")
                     .version("v1.0")
-                    .license(License().name("MIT").url("https://github.com/bayang/jelu/blob/main/LICENSE"))
+                    .license(License().name("MIT").url("https://github.com/bayang/jelu/blob/main/LICENSE")),
             )
             .externalDocs(
                 ExternalDocumentation()
                     .description("jelu documentation")
-                    .url("https://github.com/bayang/jelu")
+                    .url("https://github.com/bayang/jelu"),
             )
             .components(
                 Components()
                     .addSecuritySchemes(
                         "basicAuth",
-                        SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("basic")
-                    )
+                        SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("basic"),
+                    ),
             )
             .servers(mutableListOf(server))
     }

src/main/kotlin/io/github/bayang/jelu/config/SecurityConfig.kt

@@ -19,7 +19,7 @@ class SecurityConfig(
     private val properties: JeluProperties,
     private val userDetailsService: UserDetailsService,
     private val passwordEncoder: PasswordEncoder,
-    private val authHeaderFilter: AuthHeaderFilter?
+    private val authHeaderFilter: AuthHeaderFilter?,
 ) {
 
     @Bean
@@ -37,7 +37,7 @@ class SecurityConfig(
                     "/api/v1/token",
                     "/api/v1/setup/status",
                     "/api/v1/server-settings",
-                    "/api/v1/reviews/**"
+                    "/api/v1/reviews/**",
                 ).permitAll()
                 it.mvcMatchers(HttpMethod.GET, "/api/v1/reviews/**").permitAll()
                 it.mvcMatchers(HttpMethod.GET, "/api/v1/books/**").permitAll()
@@ -46,20 +46,20 @@ class SecurityConfig(
                 it.mvcMatchers(HttpMethod.PUT, "/api/v1/users/**").hasAnyRole("USER")
                 it.mvcMatchers(
                     HttpMethod.GET,
-                    "/api/v1/users/me"
+                    "/api/v1/users/me",
                 ).hasRole("USER")
                 it.antMatchers(
-                    "/api/v1/users/**"
+                    "/api/v1/users/**",
                 ).hasRole("USER")
                 it.antMatchers(
-                    "/api/v1/users"
+                    "/api/v1/users",
                 ).hasRole("USER")
                 it.mvcMatchers(
                     HttpMethod.POST,
-                    "/api/v1/user-messages"
+                    "/api/v1/user-messages",
                 ).hasRole("ADMIN")
                 it.antMatchers(
-                    "/api/**"
+                    "/api/**",
                 ).hasRole("USER")
             }
             .httpBasic()

src/main/kotlin/io/github/bayang/jelu/config/WebMvcConfig.kt

@@ -41,7 +41,7 @@ class WebMvcConfig(private val properties: JeluProperties) : WebMvcConfigurer {
                 "/android-chrome-192x192.png",
                 "/android-chrome-512x512.png",
                 "/manifest.json",
-                "/site.webmanifest"
+                "/site.webmanifest",
             )
             .addResourceLocations(
                 "classpath:public/index.html",
@@ -54,7 +54,7 @@ class WebMvcConfig(private val properties: JeluProperties) : WebMvcConfigurer {
                 "classpath:public/android-chrome-192x192.png",
                 "classpath:public/android-chrome-512x512.png",
                 "classpath:public/manifest.json",
-                "classpath:public/site.webmanifest"
+                "classpath:public/site.webmanifest",
             )
             .setCacheControl(CacheControl.noStore())
     }