From 53b27e84fe10ff1ff6b00796c573611e59c3f068 Mon Sep 17 00:00:00 2001
From: Alexey Kalina <alexey.kalina@jetbrains.com>
Date: Wed, 16 Sep 2020 10:38:52 +0300
Subject: [PATCH] [stats-collector] update ClientSessionValidator to new api

GitOrigin-RevId: 1e152b01c0597483023cfbd47d5381cefe1b8439
---
 .../stats-collector/intellij.statsCollector.iml    |  6 +++---
 .../intellij.statsCollector.tests.iml              |  6 +++---
 .../completion/logger/ClientSessionValidator.kt    | 14 ++++++--------
 3 files changed, 12 insertions(+), 14 deletions(-)

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 @@
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module-library">
       <library name="completion-log-events" type="repository">
-        <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-log-events:0.0.2" />
+        <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-log-events:0.0.3" />
         <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.2/completion-log-events-0.0.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.2/completion-log-events-0.0.2-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
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 @@
     <orderEntry type="module" module-name="intellij.completionMlRanking" scope="TEST" />
     <orderEntry type="module-library" scope="TEST">
       <library name="completion-log-events" type="repository">
-        <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-log-events:0.0.2" />
+        <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-log-events:0.0.3" />
         <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.2/completion-log-events-0.0.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.2/completion-log-events-0.0.2-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
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<LogEvent>) {
-        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