From e62cfa8bceee793ede722a84fc0493cccfeece44 Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Mon, 15 May 2017 15:19:50 +0300
Subject: [PATCH] [stats-collector] minor

---
 .../events/completion/EventStreamValidator.kt     | 15 +++++++--------
 .../stats/events/completion/LogEventSerializer.kt | 13 ++++++-------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/EventStreamValidator.kt b/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/EventStreamValidator.kt
index ddf7e3b7ef26..7d653a18a0f4 100644
--- a/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/EventStreamValidator.kt
+++ b/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/EventStreamValidator.kt
@@ -15,8 +15,7 @@
  */
 package com.intellij.stats.events.completion
 
-import java.io.InputStream
-import java.io.OutputStream
+import java.io.*
 
 data class EventLine(val event: LogEvent, val line: String)
 
@@ -24,11 +23,11 @@ open class SessionsInputSeparator(input: InputStream,
                                   output: OutputStream,
                                   error: OutputStream) {
     
-    private val inputReader = java.io.BufferedReader(java.io.InputStreamReader(input))
-    private val outputWriter = java.io.BufferedWriter(java.io.OutputStreamWriter(output))
-    private val errorWriter = java.io.BufferedWriter(java.io.OutputStreamWriter(error))
+    private val inputReader = BufferedReader(InputStreamReader(input))
+    private val outputWriter = BufferedWriter(OutputStreamWriter(output))
+    private val errorWriter = BufferedWriter(OutputStreamWriter(error))
 
-    var session = mutableListOf<com.intellij.stats.events.completion.EventLine>()
+    var session = mutableListOf<EventLine>()
     var currentSessionUid = ""
 
     fun processInput() {
@@ -57,7 +56,7 @@ open class SessionsInputSeparator(input: InputStream,
         errorWriter.flush()
     }
 
-    private fun processCompletionSession(session: List<com.intellij.stats.events.completion.EventLine>) {
+    private fun processCompletionSession(session: List<EventLine>) {
         if (session.isEmpty()) return
 
         var isValidSession = false
@@ -72,7 +71,7 @@ open class SessionsInputSeparator(input: InputStream,
         onSessionProcessingFinished(session, isValidSession)
     }
 
-    open protected fun onSessionProcessingFinished(session: List<com.intellij.stats.events.completion.EventLine>, isValidSession: Boolean) {
+    open protected fun onSessionProcessingFinished(session: List<EventLine>, isValidSession: Boolean) {
         val writer = if (isValidSession) outputWriter else errorWriter
         session.forEach {
             writer.write(it.line)
diff --git a/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/LogEventSerializer.kt b/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/LogEventSerializer.kt
index cd44f4751b5d..1e917feb6079 100644
--- a/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/LogEventSerializer.kt
+++ b/plugins/stats-collector/log-events/src/com/intellij/stats/events/completion/LogEventSerializer.kt
@@ -19,14 +19,14 @@ import com.google.gson.Gson
 
 object JsonSerializer {
     private val gson = Gson()
-    fun toJson(obj: Any) = com.intellij.stats.events.completion.JsonSerializer.gson.toJson(obj)
-    fun <T> fromJson(json: String, clazz: Class<T>) = com.intellij.stats.events.completion.JsonSerializer.gson.fromJson(json, clazz)
+    fun toJson(obj: Any) = gson.toJson(obj)
+    fun <T> fromJson(json: String, clazz: Class<T>) = gson.fromJson(json, clazz)
 }
 
 
 object LogEventSerializer {
 
-    val actionClassMap: Map<Action, Class<out LogEvent>> = mapOf(
+    private val actionClassMap: Map<Action, Class<out LogEvent>> = mapOf(
         Action.COMPLETION_STARTED to CompletionStartedEvent::class.java,
         Action.TYPE to TypeEvent::class.java,
         Action.DOWN to DownPressedEvent::class.java,
@@ -39,8 +39,7 @@ object LogEventSerializer {
     )
 
     fun toString(event: LogEvent): String {
-        return "${event.timestamp}\t${event.recorderId}\t${event.userUid}\t${event.sessionUid}\t${event.actionType}\t${com.intellij.stats.events.completion.JsonSerializer.toJson(
-          event)}"
+        return "${event.timestamp}\t${event.recorderId}\t${event.userUid}\t${event.sessionUid}\t${event.actionType}\t${JsonSerializer.toJson(event)}"
     }
 
     fun fromString(line: String): LogEvent? {
@@ -60,10 +59,10 @@ object LogEventSerializer {
         val sessionUid = items[3]
         val actionType = Action.valueOf(items[4])
 
-        val clazz = com.intellij.stats.events.completion.LogEventSerializer.actionClassMap[actionType] ?: return null
+        val clazz = actionClassMap[actionType] ?: return null
 
         val json = line.substring(start + 1)
-        val obj = com.intellij.stats.events.completion.JsonSerializer.fromJson(json, clazz)
+        val obj = JsonSerializer.fromJson(json, clazz)
 
         obj.userUid = userUid
         obj.timestamp = timestamp