diff --git a/plugins/stats-collector/intellij.statsCollector.iml b/plugins/stats-collector/intellij.statsCollector.iml
index 10832c387bb9..8153318e80f8 100644
--- a/plugins/stats-collector/intellij.statsCollector.iml
+++ b/plugins/stats-collector/intellij.statsCollector.iml
@@ -17,13 +17,13 @@
-
+
-
+
-
+
diff --git a/plugins/stats-collector/intellij.statsCollector.tests.iml b/plugins/stats-collector/intellij.statsCollector.tests.iml
index fd39240121de..548f72559ee9 100644
--- a/plugins/stats-collector/intellij.statsCollector.tests.iml
+++ b/plugins/stats-collector/intellij.statsCollector.tests.iml
@@ -16,13 +16,13 @@
-
+
-
+
-
+
diff --git a/plugins/stats-collector/src/com/intellij/stats/completion/logger/ClientSessionValidator.kt b/plugins/stats-collector/src/com/intellij/stats/completion/logger/ClientSessionValidator.kt
index 1b600f2ee40b..dc8100b378a9 100644
--- a/plugins/stats-collector/src/com/intellij/stats/completion/logger/ClientSessionValidator.kt
+++ b/plugins/stats-collector/src/com/intellij/stats/completion/logger/ClientSessionValidator.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2018 JetBrains s.r.o.
+ * Copyright 2000-2020 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,20 +17,18 @@
package com.intellij.stats.completion.logger
import com.intellij.stats.completion.LogEventSerializer
-import com.intellij.stats.completion.ValidationStatus
import com.intellij.stats.completion.events.LogEvent
import com.intellij.stats.validation.InputSessionValidator
-import com.intellij.stats.validation.SimpleSessionValidationResult
/**
* @author Vitaliy.Bibaev
*/
class ClientSessionValidator : SessionValidator {
+ private val validator: InputSessionValidator = InputSessionValidator()
+
override fun validate(session: List) {
- val validationResult = SimpleSessionValidationResult()
- val line2event = session.associateTo(linkedMapOf(), { LogEventSerializer.toString(it) to it })
- InputSessionValidator(validationResult).validate(line2event.keys.toList())
- validationResult.errorLines.forEach { line2event[it]!!.validationStatus = ValidationStatus.INVALID }
- validationResult.validLines.forEach { line2event[it]!!.validationStatus = ValidationStatus.VALID }
+ val lines = session.map { LogEventSerializer.toString(it) }
+ val result = validator.validate(lines)
+ session.forEach { it.validationStatus = result.validationStatus }
}
}
\ No newline at end of file