From 44f1bc9a407add6bb93e652f4889098a3726dd6d Mon Sep 17 00:00:00 2001 From: mikrise2 Date: Wed, 6 Dec 2023 16:42:22 +0100 Subject: [PATCH] [ML4SE-168] Fixed detekt. --- .../jetbrains/research/tasktracker/requests/FileRequests.kt | 4 ++-- .../jetbrains/research/tasktracker/requests/IdRequests.kt | 6 +++--- .../research/tasktracker/plugins/requests/FileRequests.kt | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/FileRequests.kt b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/FileRequests.kt index 6bf6a2ed..cbbe9cff 100644 --- a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/FileRequests.kt +++ b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/FileRequests.kt @@ -39,10 +39,10 @@ object FileRequests { ) true } catch (e: IllegalStateException) { - logger.error(e.localizedMessage) + logger.warn(e.localizedMessage) false } catch (e: Exception) { - logger.error("Server interaction error! File to send: ${file.path}", e) + logger.warn("Server interaction error! File to send: ${file.path}", e) false } } diff --git a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/IdRequests.kt b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/IdRequests.kt index 92f76460..bb5598a0 100644 --- a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/IdRequests.kt +++ b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/requests/IdRequests.kt @@ -28,7 +28,7 @@ object IdRequests { } ).body() } catch (e: Exception) { - logger.error("Server interaction error while getting user id! Url: $url", e) + logger.warn("Server interaction error while getting user id! Url: $url", e) } return@runBlocking null } @@ -50,9 +50,9 @@ object IdRequests { } ).body() } catch (e: IllegalArgumentException) { - logger.error(e.localizedMessage) + logger.warn(e.localizedMessage) } catch (e: Exception) { - logger.error("Server interaction error while getting user id! Url: $url", e) + logger.warn("Server interaction error while getting user id! Url: $url", e) } return@runBlocking null } diff --git a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/FileRequests.kt b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/FileRequests.kt index 64c3a903..87bcec32 100644 --- a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/FileRequests.kt +++ b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/FileRequests.kt @@ -11,11 +11,12 @@ import org.jetbrains.research.tasktracker.util.logFile.parseLogFile private const val DEFAULT_FOLDER = "default" +@Suppress("TooGenericExceptionCaught") fun Routing.uploadLogFile() { post("/upload-log-file") { try { val parameters = call.parameters - val logFileType = parameters["logFileType"]?: DEFAULT_FOLDER + val logFileType = parameters["logFileType"] ?: DEFAULT_FOLDER val researchId = parameters.getOrFail("id") val logFile = createLogFile(logFileType, researchId) logFile.parseLogFile(logFileType, researchId) @@ -24,7 +25,7 @@ fun Routing.uploadLogFile() { call.respond(HttpStatusCode.BadRequest, e.localizedMessage) } catch (e: ParameterConversionException) { call.respond(HttpStatusCode.BadRequest, e.localizedMessage) - } catch (e: Exception){ + } catch (e: Exception) { call.respond(HttpStatusCode.BadRequest, e.localizedMessage) } }