Fixed problems from linter and detekt

xwillq · May 18, 2020 · 1f1c346 · 1f1c346
1 parent b5cf860
commit 1f1c346
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 35 deletions.
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/config/ServletConfig.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/config/ServletConfig.kt
@@ -5,13 +5,12 @@ import com.google.inject.Injector
 import com.google.inject.matcher.Matchers
 import com.google.inject.servlet.GuiceServletContextListener
 import com.google.inject.servlet.ServletModule
-import com.kafedra.aaapp.filter.CharsetFilter
 import com.kafedra.aaapp.di.injector.Log4JTypeListener
+import com.kafedra.aaapp.filter.CharsetFilter
 import com.kafedra.aaapp.servlet.*
 import org.flywaydb.core.Flyway
 
-
-class ServletConfig() : GuiceServletContextListener() {
+class ServletConfig : GuiceServletContextListener() {
     override fun getInjector(): Injector = Guice.createInjector(object : ServletModule() {
         override fun configureServlets() {
             super.configureServlets()
@@ -32,4 +31,4 @@ class ServletConfig() : GuiceServletContextListener() {
             Flyway.configure().dataSource(url, login, pass).locations("classpath:db").load().migrate()
         }
     })
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/di/GSONProvider.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/di/GSONProvider.kt
@@ -5,8 +5,8 @@ import com.google.gson.GsonBuilder
 import com.google.inject.Provider
 
 class GSONProvider : Provider<Gson> {
-    override fun get() : Gson = GsonBuilder()
+    override fun get(): Gson = GsonBuilder()
             .excludeFieldsWithoutExposeAnnotation()
             .setPrettyPrinting()
             .create()
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/di/injector/InjectLogger.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/di/injector/InjectLogger.kt
@@ -2,4 +2,4 @@ package com.kafedra.aaapp.di.injector
 
 @Target(AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class InjectLogger
+annotation class InjectLogger
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/di/injector/Log4JMembersInjector.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/di/injector/Log4JMembersInjector.kt
@@ -1,22 +1,21 @@
 package com.kafedra.aaapp.di.injector
 
 import com.google.inject.MembersInjector
+import java.lang.reflect.Field
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import java.lang.reflect.Field
-
 
 internal class Log4JMembersInjector<T>(private val field: Field) : MembersInjector<T> {
     private val logger: Logger = LogManager.getLogger(field.declaringClass)
     override fun injectMembers(t: T) {
         try {
             field.set(t, logger)
         } catch (e: IllegalAccessException) {
-            throw RuntimeException(e)
+            throw e
         }
     }
 
     init {
         field.isAccessible = true
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/di/injector/Log4JTypeListener.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/di/injector/Log4JTypeListener.kt
@@ -5,7 +5,6 @@ import com.google.inject.spi.TypeEncounter
 import com.google.inject.spi.TypeListener
 import org.apache.logging.log4j.Logger
 
-
 internal class Log4JTypeListener : TypeListener {
     override fun <T> hear(typeLiteral: TypeLiteral<T>, typeEncounter: TypeEncounter<T>) {
         var clazz = typeLiteral.rawType
@@ -19,4 +18,4 @@ internal class Log4JTypeListener : TypeListener {
             clazz = clazz.superclass
         }
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/filter/CharsetFilter.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/filter/CharsetFilter.kt
@@ -2,14 +2,15 @@ package com.kafedra.aaapp.filter
 
 import com.google.inject.Singleton
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import javax.servlet.*
+import org.apache.logging.log4j.Logger
 
 @Singleton
 class CharsetFilter : Filter {
     @InjectLogger
     lateinit var logger: Logger
 
+    @Suppress("EmptyFunctionBlock")
     override fun init(config: FilterConfig) {}
 
     override fun doFilter(request: ServletRequest, response: ServletResponse, next: FilterChain) {
@@ -20,5 +21,6 @@ class CharsetFilter : Filter {
         next.doFilter(request, response)
     }
 
+    @Suppress("EmptyFunctionBlock")
     override fun destroy() {}
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/ActivityServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/ActivityServlet.kt
@@ -7,13 +7,13 @@ import com.kafedra.aaapp.App
 import com.kafedra.aaapp.dao.ActivityDao
 import com.kafedra.aaapp.di.GSONProvider
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import javax.servlet.http.HttpServlet
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
+import org.apache.logging.log4j.Logger
 
 @Singleton
-class ActivityServlet: HttpServlet() {
+class ActivityServlet : HttpServlet() {
     @InjectLogger
     lateinit var logger: Logger
     @Inject
@@ -84,4 +84,4 @@ class ActivityServlet: HttpServlet() {
         response.contentType = "text/plain"
         response.writer.print(json)
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/AuthorityServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/AuthorityServlet.kt
@@ -5,13 +5,13 @@ import com.google.inject.Singleton
 import com.kafedra.aaapp.dao.AuthorityDao
 import com.kafedra.aaapp.di.GSONProvider
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import javax.servlet.http.HttpServlet
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
+import org.apache.logging.log4j.Logger
 
 @Singleton
-class AuthorityServlet: HttpServlet() {
+class AuthorityServlet : HttpServlet() {
     @InjectLogger
     lateinit var logger: Logger
     @Inject
@@ -50,4 +50,4 @@ class AuthorityServlet: HttpServlet() {
         response.contentType = "text/plain"
         response.writer.print(json)
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/EchoListener.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/EchoListener.kt
@@ -2,13 +2,13 @@ package com.kafedra.aaapp.servlet
 
 import com.google.inject.Singleton
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import javax.servlet.http.HttpServlet
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
+import org.apache.logging.log4j.Logger
 
 @Singleton
-class EchoListener: HttpServlet() {
+class EchoListener : HttpServlet() {
     @InjectLogger
     lateinit var logger: Logger
 
@@ -21,4 +21,4 @@ class EchoListener: HttpServlet() {
         logger.warn("Got post request to not existing page ${request.requestURL}, printing 404")
         response.writer.print("404 not found")
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/GetListener.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/GetListener.kt
@@ -2,14 +2,14 @@ package com.kafedra.aaapp.servlet
 
 import com.google.inject.Singleton
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import java.net.URLDecoder
 import javax.servlet.http.HttpServlet
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
+import org.apache.logging.log4j.Logger
 
 @Singleton
-class GetListener: HttpServlet() {
+class GetListener : HttpServlet() {
     @InjectLogger
     lateinit var logger: Logger
 
@@ -24,4 +24,4 @@ class GetListener: HttpServlet() {
         logger.info("Redirecting to response page")
         request.getRequestDispatcher("../response.jsp").forward(request, response)
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/PostListener.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/PostListener.kt
@@ -2,14 +2,14 @@ package com.kafedra.aaapp.servlet
 
 import com.google.inject.Singleton
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import java.net.URLEncoder
 import javax.servlet.http.HttpServlet
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
+import org.apache.logging.log4j.Logger
 
 @Singleton
-class PostListener: HttpServlet() {
+class PostListener : HttpServlet() {
     @InjectLogger
     lateinit var logger: Logger
 
@@ -28,4 +28,4 @@ class PostListener: HttpServlet() {
         logger.info("Redirecting to /echo/get?id=$input")
         response.sendRedirect("/echo/get?id=$input")
     }
-}
+}
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/UserServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/UserServlet.kt
@@ -5,13 +5,13 @@ import com.google.inject.Singleton
 import com.kafedra.aaapp.dao.UserDao
 import com.kafedra.aaapp.di.GSONProvider
 import com.kafedra.aaapp.di.injector.InjectLogger
-import org.apache.logging.log4j.Logger
 import javax.servlet.http.HttpServlet
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
+import org.apache.logging.log4j.Logger
 
 @Singleton
-class UserServlet: HttpServlet() {
+class UserServlet : HttpServlet() {
     @InjectLogger
     lateinit var logger: Logger
     @Inject
@@ -26,8 +26,7 @@ class UserServlet: HttpServlet() {
         if (id == null) {
             logger.info("id is not specified, returning all users")
             id = 0
-        }
-        else logger.info("id = $id")
+        } else logger.info("id = $id")
 
         logger.info("Getting users from database")
         val userList = dao.getUser(id)
@@ -39,4 +38,4 @@ class UserServlet: HttpServlet() {
         response.contentType = "text/plain"
         response.writer.print(json)
     }
-}
+}