[formatting] Auto format project

nixxcode · Sep 15, 2019 · d6fd1e8 · d6fd1e8
1 parent 19968ad
commit d6fd1e8
Show file tree

Hide file tree

Showing 28 changed files with 217 additions and 140 deletions.
diff --git a/src/main/java/io/javalin/core/JavalinServer.kt b/src/main/java/io/javalin/core/JavalinServer.kt
@@ -10,7 +10,11 @@ import io.javalin.Javalin
 import io.javalin.http.JavalinServlet
 import io.javalin.websocket.JavalinWsServlet
 import io.javalin.websocket.isWebSocket
-import org.eclipse.jetty.server.*
+import org.eclipse.jetty.server.Handler
+import org.eclipse.jetty.server.LowResourceMonitor
+import org.eclipse.jetty.server.Request
+import org.eclipse.jetty.server.Server
+import org.eclipse.jetty.server.ServerConnector
 import org.eclipse.jetty.server.handler.HandlerCollection
 import org.eclipse.jetty.server.handler.HandlerList
 import org.eclipse.jetty.server.handler.HandlerWrapper

diff --git a/src/main/java/io/javalin/core/compression/CompressionStrategy.kt b/src/main/java/io/javalin/core/compression/CompressionStrategy.kt
@@ -37,7 +37,7 @@ class CompressionStrategy(brotli: Brotli? = null, gzip: Gzip? = null) {
      * When enabling Brotli, we try loading the jvm-brotli native library first.
      * If this fails, we keep Brotli disabled and warn the user.
      */
-    private fun tryLoadBrotli(brotli: Brotli) : Brotli? {
+    private fun tryLoadBrotli(brotli: Brotli): Brotli? {
         Util.ensureDependencyPresent(OptionalDependency.JVMBROTLI, startupCheck = true)
         val brotliAvailable = BrotliLoader.isBrotliAvailable()
         if (brotliAvailable) {

diff --git a/src/main/java/io/javalin/core/util/RouteOverviewUtil.kt b/src/main/java/io/javalin/core/util/RouteOverviewUtil.kt
@@ -189,7 +189,7 @@ object RouteOverviewUtil {
             {
                 "handlers": [
                 ${handlerInfo.map { (handlerType, path, handler, roles) ->
-                    """
+            """
                     {
                         "path": "$path",
                         "handlerType": "$handlerType",
@@ -201,7 +201,7 @@ object RouteOverviewUtil {
                 ],
                 "wsHandlers": [
                 ${wsHandlerInfo.map { (wsHandlerType, path, handler, roles) ->
-                    """
+            """
                     {
                         "path": "$path",
                         "handlerType": "$wsHandlerType",

diff --git a/src/main/java/io/javalin/http/Context.kt b/src/main/java/io/javalin/http/Context.kt
@@ -228,7 +228,7 @@ open class Context(@JvmField val req: HttpServletRequest, @JvmField val res: Htt
     fun <T> header(header: String, clazz: Class<T>): Validator<T> = Validator.create(clazz, header(header), "Request header '$header' with value '${header(header)}'")
 
     /** Reified version of [header] (Kotlin only) */
-    inline fun <reified T: Any> header(header: String) = header(header, T::class.java)
+    inline fun <reified T : Any> header(header: String) = header(header, T::class.java)
 
     /** Gets a map with all the header keys and values on the request. */
     fun headerMap(): Map<String, String> = req.headerNames.asSequence().associate { it to header(it)!! }

diff --git a/src/main/java/io/javalin/plugin/openapi/JavalinOpenApi.kt b/src/main/java/io/javalin/plugin/openapi/JavalinOpenApi.kt
@@ -14,21 +14,21 @@ import io.swagger.v3.core.converter.ModelConverters
 import io.swagger.v3.oas.models.OpenAPI
 
 class CreateSchemaOptions(
-    val handlerMetaInfoList: List<HandlerMetaInfo>,
+        val handlerMetaInfoList: List<HandlerMetaInfo>,
 
-    /**
-     * Create the base open api configuration.
-     * This function will be called before the creation of every schema.
-     */
-    val initialConfigurationCreator: InitialConfigurationCreator,
+        /**
+         * Create the base open api configuration.
+         * This function will be called before the creation of every schema.
+         */
+        val initialConfigurationCreator: InitialConfigurationCreator,
 
-    val default: DefaultDocumentation?,
+        val default: DefaultDocumentation?,
 
-    val modelConverterFactory: ModelConverterFactory = JacksonModelConverterFactory,
+        val modelConverterFactory: ModelConverterFactory = JacksonModelConverterFactory,
 
-    val packagePrefixesToScan: Set<String>,
+        val packagePrefixesToScan: Set<String>,
 
-    val overridenPaths: List<HandlerMetaInfo> = emptyList()
+        val overridenPaths: List<HandlerMetaInfo> = emptyList()
 )
 
 object JavalinOpenApi {

diff --git a/src/main/java/io/javalin/plugin/openapi/OpenApiHandler.kt b/src/main/java/io/javalin/plugin/openapi/OpenApiHandler.kt
@@ -34,21 +34,21 @@ class OpenApiHandler(app: Javalin, val options: OpenApiOptions) : Handler {
 
     fun createOpenAPISchema(): OpenAPI {
         val schema = JavalinOpenApi.createSchema(
-            CreateSchemaOptions(
-                handlerMetaInfoList = handlerMetaInfoList.filter { handler ->
-                    options.ignoredPaths.none { (path, methods) ->
-                        PathParser(path).matches(handler.path) && methods.any { method ->
-                            // HttpMethod is implemented two times :(
-                            method.name == handler.httpMethod.name
-                        }
-                    }
-                },
-                initialConfigurationCreator = options.initialConfigurationCreator,
-                default = options.default,
-                modelConverterFactory = options.modelConverterFactory,
-                packagePrefixesToScan = options.packagePrefixesToScan,
-                overridenPaths = options.overriddenDocumentation
-            )
+                CreateSchemaOptions(
+                        handlerMetaInfoList = handlerMetaInfoList.filter { handler ->
+                            options.ignoredPaths.none { (path, methods) ->
+                                PathParser(path).matches(handler.path) && methods.any { method ->
+                                    // HttpMethod is implemented two times :(
+                                    method.name == handler.httpMethod.name
+                                }
+                            }
+                        },
+                        initialConfigurationCreator = options.initialConfigurationCreator,
+                        default = options.default,
+                        modelConverterFactory = options.modelConverterFactory,
+                        packagePrefixesToScan = options.packagePrefixesToScan,
+                        overridenPaths = options.overriddenDocumentation
+                )
         )
 
         if (options.validateSchema) {

diff --git a/src/main/java/io/javalin/plugin/openapi/annotations/AnnotationApiMapping.kt b/src/main/java/io/javalin/plugin/openapi/annotations/AnnotationApiMapping.kt
@@ -1,6 +1,10 @@
 package io.javalin.plugin.openapi.annotations
 
-import io.javalin.plugin.openapi.dsl.*
+import io.javalin.plugin.openapi.dsl.DocumentedContent
+import io.javalin.plugin.openapi.dsl.DocumentedParameter
+import io.javalin.plugin.openapi.dsl.DocumentedResponse
+import io.javalin.plugin.openapi.dsl.OpenApiDocumentation
+import io.javalin.plugin.openapi.dsl.createUpdater
 import io.swagger.v3.oas.models.Operation
 import io.swagger.v3.oas.models.parameters.RequestBody
 import kotlin.reflect.KClass

diff --git a/src/main/java/io/javalin/plugin/openapi/dsl/DocumentedContent.kt b/src/main/java/io/javalin/plugin/openapi/dsl/DocumentedContent.kt
@@ -1,7 +1,11 @@
 package io.javalin.plugin.openapi.dsl
 
 import io.javalin.plugin.openapi.annotations.ContentType
-import io.javalin.plugin.openapi.external.*
+import io.javalin.plugin.openapi.external.mediaType
+import io.javalin.plugin.openapi.external.mediaTypeArrayOf
+import io.javalin.plugin.openapi.external.mediaTypeArrayOfRef
+import io.javalin.plugin.openapi.external.mediaTypeRef
+import io.javalin.plugin.openapi.external.schema
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.media.Content
 import io.swagger.v3.oas.models.media.MediaType

diff --git a/src/main/java/io/javalin/plugin/openapi/dsl/openApiBuilderDsl.kt b/src/main/java/io/javalin/plugin/openapi/dsl/openApiBuilderDsl.kt
@@ -22,8 +22,8 @@ import org.slf4j.LoggerFactory
 private val logger = LoggerFactory.getLogger(JavalinOpenApi::class.java)
 
 fun overridePaths(
-    handlerMetaInfoList: List<HandlerMetaInfo>,
-    overridenPaths: List<HandlerMetaInfo>
+        handlerMetaInfoList: List<HandlerMetaInfo>,
+        overridenPaths: List<HandlerMetaInfo>
 ): List<HandlerMetaInfo> {
     return overridenPaths.plus(handlerMetaInfoList.filter { handler ->
         overridenPaths.none { overridenHandler ->
@@ -34,52 +34,52 @@ fun overridePaths(
 
 fun Components.applyMetaInfoList(handlerMetaInfoList: List<HandlerMetaInfo>, options: CreateSchemaOptions) {
     handlerMetaInfoList
-        .map { it.extractDocumentation(options) }
-        .filter { it.isIgnored != true }
-        .flatMap { it.componentsUpdaterList }
-        .applyAllUpdates(this)
+            .map { it.extractDocumentation(options) }
+            .filter { it.isIgnored != true }
+            .flatMap { it.componentsUpdaterList }
+            .applyAllUpdates(this)
 }
 
 fun Paths.applyMetaInfoList(handlerMetaInfoList: List<HandlerMetaInfo>, options: CreateSchemaOptions) {
     handlerMetaInfoList
-        .filter { it.extractDocumentation(options).isIgnored != true }
-        .groupBy { it.path }
-        .forEach { (url, metaInfos) ->
-            val pathParser = PathParser(url)
-            updatePath(pathParser.getOpenApiUrl()) {
-                applyMetaInfoList(options, pathParser, metaInfos)
+            .filter { it.extractDocumentation(options).isIgnored != true }
+            .groupBy { it.path }
+            .forEach { (url, metaInfos) ->
+                val pathParser = PathParser(url)
+                updatePath(pathParser.getOpenApiUrl()) {
+                    applyMetaInfoList(options, pathParser, metaInfos)
+                }
             }
-        }
 }
 
 fun PathParser.getOpenApiUrl(): String {
     val segmentsString = segments
-        .joinToString("/") {
-            when (it) {
-                is PathSegment.Normal -> it.content
-                /*
-                 * At the moment, OpenApi does not support wildcards. So we just leave it as it is.
-                 * Once it is implemented we can change this.
-                 */
-                is PathSegment.Wildcard -> "*"
-                is PathSegment.Parameter -> "{${it.name}}"
+            .joinToString("/") {
+                when (it) {
+                    is PathSegment.Normal -> it.content
+                    /*
+                     * At the moment, OpenApi does not support wildcards. So we just leave it as it is.
+                     * Once it is implemented we can change this.
+                     */
+                    is PathSegment.Wildcard -> "*"
+                    is PathSegment.Parameter -> "{${it.name}}"
+                }
             }
-        }
     return "/$segmentsString"
 }
 
 fun PathItem.applyMetaInfoList(
-    options: CreateSchemaOptions,
-    path: PathParser,
-    handlerMetaInfoList: List<HandlerMetaInfo>
+        options: CreateSchemaOptions,
+        path: PathParser,
+        handlerMetaInfoList: List<HandlerMetaInfo>
 ) {
     handlerMetaInfoList
-        .forEach { metaInfo ->
-            val pathItemHttpMethod = metaInfo.httpMethod.asPathItemHttpMethod() ?: return@forEach
-            operation(pathItemHttpMethod, Operation().apply {
-                applyMetaInfo(options, path, metaInfo)
-            })
-        }
+            .forEach { metaInfo ->
+                val pathItemHttpMethod = metaInfo.httpMethod.asPathItemHttpMethod() ?: return@forEach
+                operation(pathItemHttpMethod, Operation().apply {
+                    applyMetaInfo(options, path, metaInfo)
+                })
+            }
 }
 
 fun Operation.applyMetaInfo(options: CreateSchemaOptions, path: PathParser, metaInfo: HandlerMetaInfo) {
@@ -99,10 +99,10 @@ fun Operation.applyMetaInfo(options: CreateSchemaOptions, path: PathParser, meta
     }
 
     documentation.parameterUpdaterListMapping
-        .values
-        .forEach { updaters ->
-            updateParameter { updaters.applyAllUpdates(this) }
-        }
+            .values
+            .forEach { updaters ->
+                updateParameter { updaters.applyAllUpdates(this) }
+            }
 
     if (documentation.hasRequestBodies()) {
         updateRequestBody {
@@ -113,11 +113,11 @@ fun Operation.applyMetaInfo(options: CreateSchemaOptions, path: PathParser, meta
     if (documentation.hasResponses()) {
         updateResponses {
             documentation.responseUpdaterListMapping
-                .forEach { (name, updater) ->
-                    updateResponse(name) {
-                        updater.applyAllUpdates(this)
+                    .forEach { (name, updater) ->
+                        updateResponse(name) {
+                            updater.applyAllUpdates(this)
+                        }
                     }
-                }
         }
     }
 
@@ -127,20 +127,20 @@ fun Operation.applyMetaInfo(options: CreateSchemaOptions, path: PathParser, meta
 fun Paths.ensureDefaultResponse() {
     forEach { url, path ->
         path.readOperationsMap()
-            .filter { (_, operation) ->
-                operation.responses.isNullOrEmpty()
-            }
-            .forEach { (method, operation) ->
-                operation.updateResponses {
-                    updateResponse("200") {
-                        this.description("Default response")
-                    }
+                .filter { (_, operation) ->
+                    operation.responses.isNullOrEmpty()
                 }
+                .forEach { (method, operation) ->
+                    operation.updateResponses {
+                        updateResponse("200") {
+                            this.description("Default response")
+                        }
+                    }
 
-                logger.warn(
-                    "A default response was added to the documentation of $method $url"
-                )
-            }
+                    logger.warn(
+                            "A default response was added to the documentation of $method $url"
+                    )
+                }
     }
 }
 
@@ -202,6 +202,6 @@ private fun PathParser.asReadableWords(): List<String> {
 }
 
 private fun String.dashCaseToCamelCase() = split("-")
-    .map { it.toLowerCase() }
-    .mapIndexed { index, s -> if (index > 0) s.capitalize() else s }
-    .joinToString("")
+        .map { it.toLowerCase() }
+        .mapIndexed { index, s -> if (index > 0) s.capitalize() else s }
+        .joinToString("")
diff --git a/src/main/java/io/javalin/plugin/openapi/dsl/openApiUpdaterDsl.kt b/src/main/java/io/javalin/plugin/openapi/dsl/openApiUpdaterDsl.kt
@@ -3,7 +3,11 @@
  */
 package io.javalin.plugin.openapi.dsl
 
-import io.swagger.v3.oas.models.*
+import io.swagger.v3.oas.models.Components
+import io.swagger.v3.oas.models.OpenAPI
+import io.swagger.v3.oas.models.Operation
+import io.swagger.v3.oas.models.PathItem
+import io.swagger.v3.oas.models.Paths
 import io.swagger.v3.oas.models.media.Content
 import io.swagger.v3.oas.models.parameters.Parameter
 import io.swagger.v3.oas.models.parameters.RequestBody

diff --git a/src/main/java/io/javalin/plugin/openapi/external/KotlinOpenApiDsl.kt b/src/main/java/io/javalin/plugin/openapi/external/KotlinOpenApiDsl.kt
@@ -3,7 +3,16 @@ package io.javalin.plugin.openapi.external
 import io.swagger.v3.core.converter.ModelConverters
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.examples.Example
-import io.swagger.v3.oas.models.media.*
+import io.swagger.v3.oas.models.media.ArraySchema
+import io.swagger.v3.oas.models.media.BooleanSchema
+import io.swagger.v3.oas.models.media.Content
+import io.swagger.v3.oas.models.media.DateSchema
+import io.swagger.v3.oas.models.media.DateTimeSchema
+import io.swagger.v3.oas.models.media.IntegerSchema
+import io.swagger.v3.oas.models.media.MapSchema
+import io.swagger.v3.oas.models.media.MediaType
+import io.swagger.v3.oas.models.media.Schema
+import io.swagger.v3.oas.models.media.StringSchema
 import io.swagger.v3.oas.models.parameters.Parameter
 import java.math.BigDecimal
 import java.time.LocalDate

diff --git a/src/main/java/io/javalin/plugin/rendering/JavalinRenderer.kt b/src/main/java/io/javalin/plugin/rendering/JavalinRenderer.kt
@@ -9,7 +9,12 @@ package io.javalin.plugin.rendering
 import io.javalin.Javalin
 import io.javalin.http.Context
 import io.javalin.plugin.rendering.markdown.JavalinCommonmark
-import io.javalin.plugin.rendering.template.*
+import io.javalin.plugin.rendering.template.JavalinFreemarker
+import io.javalin.plugin.rendering.template.JavalinJtwig
+import io.javalin.plugin.rendering.template.JavalinMustache
+import io.javalin.plugin.rendering.template.JavalinPebble
+import io.javalin.plugin.rendering.template.JavalinThymeleaf
+import io.javalin.plugin.rendering.template.JavalinVelocity
 
 object JavalinRenderer {
 

diff --git a/src/main/java/io/javalin/plugin/rendering/vue/JavalinVue.kt b/src/main/java/io/javalin/plugin/rendering/vue/JavalinVue.kt
@@ -16,7 +16,6 @@ import java.nio.file.FileSystems
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
-import java.util.*
 import java.util.stream.Collectors
 
 object JavalinVue {

diff --git a/src/main/java/io/javalin/websocket/WsHandlerController.kt b/src/main/java/io/javalin/websocket/WsHandlerController.kt
@@ -7,7 +7,11 @@
 package io.javalin.websocket
 
 import org.eclipse.jetty.websocket.api.Session
-import org.eclipse.jetty.websocket.api.annotations.*
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage
+import org.eclipse.jetty.websocket.api.annotations.WebSocket
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap

diff --git a/src/test/java/io/javalin/TestApiBuilder.kt b/src/test/java/io/javalin/TestApiBuilder.kt
@@ -11,7 +11,15 @@ import com.mashape.unirest.http.HttpMethod
 import com.mashape.unirest.http.Unirest
 import io.javalin.TestUtil.okHandler
 import io.javalin.apibuilder.ApiBuilder
-import io.javalin.apibuilder.ApiBuilder.*
+import io.javalin.apibuilder.ApiBuilder.after
+import io.javalin.apibuilder.ApiBuilder.before
+import io.javalin.apibuilder.ApiBuilder.crud
+import io.javalin.apibuilder.ApiBuilder.delete
+import io.javalin.apibuilder.ApiBuilder.get
+import io.javalin.apibuilder.ApiBuilder.patch
+import io.javalin.apibuilder.ApiBuilder.path
+import io.javalin.apibuilder.ApiBuilder.post
+import io.javalin.apibuilder.ApiBuilder.put
 import io.javalin.apibuilder.CrudHandler
 import io.javalin.http.Context
 import io.javalin.http.Handler