From c9eefd16ec402ef3a702077d8eae7d178d734dbf Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sat, 1 Jan 2022 16:35:31 +0100 Subject: [PATCH] =?UTF-8?q?fix=20split=20package=20=E2=80=94=20in=20"confi?= =?UTF-8?q?g"=20module=20must=20be=20the=20only=20package=20"com.intellij.?= =?UTF-8?q?internal.statistic.config"=20be=20used?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitOrigin-RevId: 80f994d3a3db753215135ec6048bf4a9ebbff5bc --- .../statistics/config/EventLogConfigBaseParserTest.kt | 4 ++-- .../statistics/config/EventLogConfigBucketsTest.kt | 6 +++--- .../statistics/config/EventLogConfigOptionsParserTest.kt | 4 ++-- .../statistics/config/EventLogConfigParserTest.kt | 6 +++--- .../statistics/config/EventLogConfigVersionParserTest.kt | 8 ++++---- .../statistics/logger/FeatureEventLogFileTest.kt | 6 ++---- .../metadata/filter/EventLogConfigFilterTest.kt | 4 ++-- .../internal/statistics/uploader/EventLogUtilTest.kt | 4 ++-- .../statistic/config/EventLogExternalSendSettings.java | 4 ++-- .../statistic/config/EventLogExternalSettings.java | 4 ++-- .../internal/statistic/config/EventLogOptions.java | 3 +-- .../statistic/{ => config}/StatisticsStringUtil.java | 4 ++-- .../config/bean/EventLogMajorVersionBorders.java | 4 ++-- .../{ => config}/eventLog/EventLogBuildType.java | 8 ++++---- .../{ => config}/eventLog/EventLogMajorVersion.java | 6 +++--- .../com/intellij/internal/statistic/package-info.java | 5 ----- .../statistic/devkit/actions/SendEventLogAction.java | 1 + .../eventLog/StatisticsEventLogFileAppender.java | 3 ++- .../intellij/internal/statistic/eventLog/EventLogFile.kt | 3 ++- .../internal/statistic/eventLog/EventLogFilesProvider.kt | 4 ++-- .../eventLog/connection/EventLogSettingsService.java | 4 ++-- .../eventLog/connection/EventLogStatisticsService.java | 5 +++-- .../connection/EventLogUploadSettingsService.java | 4 ++-- .../eventLog/connection/SettingsConnectionService.java | 4 ++-- .../connection/metadata/EventLogMetadataUtils.java | 4 ++-- .../eventLog/connection/request/StatsRequestBuilder.java | 9 ++++++--- .../internal/statistic/uploader/EventLogUploader.java | 4 ++-- .../uploader/events/ExternalSystemEventSerializer.java | 4 ++-- .../uploader/events/ExternalSystemEventType.java | 4 ++-- 29 files changed, 66 insertions(+), 67 deletions(-) rename platform/statistics/config/src/com/intellij/internal/statistic/{ => config}/StatisticsStringUtil.java (90%) rename platform/statistics/config/src/com/intellij/internal/statistic/{ => config}/eventLog/EventLogBuildType.java (70%) rename platform/statistics/config/src/com/intellij/internal/statistic/{ => config}/eventLog/EventLogMajorVersion.java (90%) delete mode 100644 platform/statistics/config/src/com/intellij/internal/statistic/package-info.java diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBaseParserTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBaseParserTest.kt index 4867da418813..f1e9e49e57b3 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBaseParserTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBaseParserTest.kt @@ -1,11 +1,11 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.config import com.intellij.internal.statistic.config.EventLogConfigParserException import com.intellij.internal.statistic.config.EventLogExternalSettings import com.intellij.internal.statistic.config.bean.EventLogBucketRange import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration -import com.intellij.internal.statistic.eventLog.EventLogBuildType +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType import org.junit.Assert import java.io.BufferedReader import java.io.StringReader diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBucketsTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBucketsTest.kt index dd0f5eabc5c7..41b4c523f8fa 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBucketsTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigBucketsTest.kt @@ -1,10 +1,10 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.config import com.intellij.internal.statistic.config.bean.EventLogBucketRange import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration -import com.intellij.internal.statistic.eventLog.EventLogBuildType -import com.intellij.internal.statistic.eventLog.EventLogBuildType.* +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType.* import org.junit.Test class EventLogConfigBucketsTest : EventLogConfigBaseParserTest() { diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigOptionsParserTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigOptionsParserTest.kt index 8a0a24d513e7..dd82032f093e 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigOptionsParserTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigOptionsParserTest.kt @@ -1,9 +1,9 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.config import com.intellij.internal.statistic.config.bean.EventLogBucketRange import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration -import com.intellij.internal.statistic.eventLog.EventLogBuildType +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType import org.junit.Test class EventLogConfigOptionsParserTest : EventLogConfigBaseParserTest() { diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigParserTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigParserTest.kt index 627ecba50980..f2a27d589e3e 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigParserTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigParserTest.kt @@ -1,10 +1,10 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.config import com.intellij.internal.statistic.config.bean.EventLogBucketRange import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration -import com.intellij.internal.statistic.eventLog.EventLogBuildType -import com.intellij.internal.statistic.eventLog.EventLogBuildType.* +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType.* import org.junit.Test private val BUILD_TYPES = setOf(RELEASE, EAP, UNKNOWN) diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigVersionParserTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigVersionParserTest.kt index dca2a1a68dfe..4c62d6bad899 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigVersionParserTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/config/EventLogConfigVersionParserTest.kt @@ -1,11 +1,11 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.config import com.intellij.internal.statistic.config.bean.EventLogBucketRange import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration -import com.intellij.internal.statistic.eventLog.EventLogBuildType -import com.intellij.internal.statistic.eventLog.EventLogBuildType.EAP -import com.intellij.internal.statistic.eventLog.EventLogBuildType.RELEASE +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType.EAP +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType.RELEASE import org.junit.Test class EventLogConfigVersionParserTest : EventLogConfigBaseParserTest() { diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureEventLogFileTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureEventLogFileTest.kt index 3982ccc83771..cddc53e82650 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureEventLogFileTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/logger/FeatureEventLogFileTest.kt @@ -1,9 +1,7 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.logger -import com.intellij.internal.statistic.eventLog.EventLogBuildType.EAP -import com.intellij.internal.statistic.eventLog.EventLogBuildType.RELEASE -import com.intellij.internal.statistic.eventLog.EventLogBuildType.UNKNOWN +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType.* import com.intellij.internal.statistic.eventLog.EventLogFile import org.junit.Test import java.io.File diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/metadata/filter/EventLogConfigFilterTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/metadata/filter/EventLogConfigFilterTest.kt index 7f631e4a2171..4f96611bb578 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/metadata/filter/EventLogConfigFilterTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/metadata/filter/EventLogConfigFilterTest.kt @@ -1,8 +1,8 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.metadata.filter import com.intellij.internal.statistic.config.EventLogExternalSettings -import com.intellij.internal.statistic.eventLog.EventLogBuildType.RELEASE +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType.RELEASE import com.intellij.internal.statistic.eventLog.filters.LogEventBucketsFilter import com.intellij.internal.statistics.StatisticsTestEventFactory.newEvent import org.junit.Assert diff --git a/platform/platform-tests/testSrc/com/intellij/internal/statistics/uploader/EventLogUtilTest.kt b/platform/platform-tests/testSrc/com/intellij/internal/statistics/uploader/EventLogUtilTest.kt index 2aad5c1f3d27..dc7b1262cc0f 100644 --- a/platform/platform-tests/testSrc/com/intellij/internal/statistics/uploader/EventLogUtilTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/internal/statistics/uploader/EventLogUtilTest.kt @@ -1,7 +1,7 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistics.uploader -import com.intellij.internal.statistic.StatisticsStringUtil +import com.intellij.internal.statistic.config.StatisticsStringUtil import com.intellij.testFramework.UsefulTestCase diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSendSettings.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSendSettings.java index f1c3206789b8..dde73b6caab2 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSendSettings.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSendSettings.java @@ -1,8 +1,8 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.config; import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration; -import com.intellij.internal.statistic.eventLog.EventLogBuildType; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSettings.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSettings.java index 98963e18dc28..da1db9023a12 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSettings.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogExternalSettings.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.config; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import com.intellij.internal.statistic.config.bean.EventLogBucketRange; import com.intellij.internal.statistic.config.bean.EventLogConfigVersions; import com.intellij.internal.statistic.config.bean.EventLogConfigVersions.EventLogConfigFilterCondition; import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration; -import com.intellij.internal.statistic.eventLog.EventLogBuildType; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogOptions.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogOptions.java index 5041bd9155e0..04a1df3c479a 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogOptions.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/EventLogOptions.java @@ -1,7 +1,6 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.config; -import com.intellij.internal.statistic.StatisticsStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/StatisticsStringUtil.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/StatisticsStringUtil.java similarity index 90% rename from platform/statistics/config/src/com/intellij/internal/statistic/StatisticsStringUtil.java rename to platform/statistics/config/src/com/intellij/internal/statistic/config/StatisticsStringUtil.java index 31fba01d063d..cde2d69e850b 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/StatisticsStringUtil.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/StatisticsStringUtil.java @@ -1,5 +1,5 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.internal.statistic; +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.internal.statistic.config; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/config/bean/EventLogMajorVersionBorders.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/bean/EventLogMajorVersionBorders.java index 0745e57d2679..1891881fddad 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/config/bean/EventLogMajorVersionBorders.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/bean/EventLogMajorVersionBorders.java @@ -1,7 +1,7 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.config.bean; -import com.intellij.internal.statistic.eventLog.EventLogMajorVersion; +import com.intellij.internal.statistic.config.eventLog.EventLogMajorVersion; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/eventLog/EventLogBuildType.java similarity index 70% rename from platform/statistics/config/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.java rename to platform/statistics/config/src/com/intellij/internal/statistic/config/eventLog/EventLogBuildType.java index de6cc5ae8e76..e4d9fad851ff 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/eventLog/EventLogBuildType.java @@ -1,11 +1,11 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.internal.statistic.eventLog; +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.internal.statistic.config.eventLog; -import com.intellij.internal.statistic.StatisticsStringUtil; +import com.intellij.internal.statistic.config.StatisticsStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.intellij.internal.statistic.StatisticsStringUtil.isNotEmpty; +import static com.intellij.internal.statistic.config.StatisticsStringUtil.isNotEmpty; public enum EventLogBuildType { EAP("eap"), RELEASE("release"), UNKNOWN("unknown"); diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/eventLog/EventLogMajorVersion.java b/platform/statistics/config/src/com/intellij/internal/statistic/config/eventLog/EventLogMajorVersion.java similarity index 90% rename from platform/statistics/config/src/com/intellij/internal/statistic/eventLog/EventLogMajorVersion.java rename to platform/statistics/config/src/com/intellij/internal/statistic/config/eventLog/EventLogMajorVersion.java index 7d16996bf5de..c2453dc32287 100644 --- a/platform/statistics/config/src/com/intellij/internal/statistic/eventLog/EventLogMajorVersion.java +++ b/platform/statistics/config/src/com/intellij/internal/statistic/config/eventLog/EventLogMajorVersion.java @@ -1,7 +1,7 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.internal.statistic.eventLog; +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.internal.statistic.config.eventLog; -import com.intellij.internal.statistic.StatisticsStringUtil; +import com.intellij.internal.statistic.config.StatisticsStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/statistics/config/src/com/intellij/internal/statistic/package-info.java b/platform/statistics/config/src/com/intellij/internal/statistic/package-info.java deleted file mode 100644 index 50337a833657..000000000000 --- a/platform/statistics/config/src/com/intellij/internal/statistic/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -@Internal -package com.intellij.internal.statistic; - -import org.jetbrains.annotations.ApiStatus.Internal; \ No newline at end of file diff --git a/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/actions/SendEventLogAction.java b/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/actions/SendEventLogAction.java index 8b9c3d7605fa..fa379e4979f0 100644 --- a/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/actions/SendEventLogAction.java +++ b/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/actions/SendEventLogAction.java @@ -4,6 +4,7 @@ package com.intellij.internal.statistic.devkit.actions; import com.intellij.ide.scratch.RootType; import com.intellij.ide.scratch.ScratchFileService; import com.intellij.internal.statistic.StatisticsBundle; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.*; import com.intellij.internal.statistic.eventLog.connection.*; import com.intellij.internal.statistic.eventLog.filters.LogEventCompositeFilter; diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/StatisticsEventLogFileAppender.java b/platform/statistics/src/com/intellij/internal/statistic/eventLog/StatisticsEventLogFileAppender.java index 155b53c6c56d..d7a5e19aa374 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/StatisticsEventLogFileAppender.java +++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/StatisticsEventLogFileAppender.java @@ -1,6 +1,7 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt index ee71a970cdf5..bd0c040ac435 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt @@ -1,6 +1,7 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType import java.io.File import java.nio.file.Path import java.util.* diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt index 8037ef16731d..41a6191bb139 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt @@ -1,7 +1,7 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog -import com.intellij.internal.statistic.StatisticsStringUtil +import com.intellij.internal.statistic.config.StatisticsStringUtil import java.io.File import java.nio.file.Path diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsService.java index 358b635e7d89..9544abaf3214 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsService.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsService.java @@ -1,8 +1,8 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog.connection; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.EventLogApplicationInfo; -import com.intellij.internal.statistic.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.filters.LogEventFilter; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java index 553ee1c4f366..8cca25f5a0e6 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java @@ -1,7 +1,8 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog.connection; import com.intellij.internal.statistic.config.EventLogOptions; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.*; import com.intellij.internal.statistic.eventLog.connection.StatisticsResult.ResultCode; import com.intellij.internal.statistic.eventLog.connection.request.StatsHttpRequests; @@ -22,7 +23,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static com.intellij.internal.statistic.StatisticsStringUtil.isEmpty; +import static com.intellij.internal.statistic.config.StatisticsStringUtil.isEmpty; @ApiStatus.Internal public class EventLogStatisticsService implements StatisticsService { diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogUploadSettingsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogUploadSettingsService.java index d4fe04e7b8d4..ff89542095a9 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogUploadSettingsService.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogUploadSettingsService.java @@ -1,12 +1,12 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog.connection; import com.intellij.internal.statistic.config.EventLogExternalSendSettings; import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.DataCollectorDebugLogger; import com.intellij.internal.statistic.eventLog.EventLogApplicationInfo; import com.intellij.internal.statistic.eventLog.EventLogBuild; -import com.intellij.internal.statistic.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.connection.metadata.EventGroupsFilterRules; import com.intellij.internal.statistic.eventLog.connection.metadata.EventLogMetadataUtils; import com.intellij.internal.statistic.eventLog.filters.*; diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/SettingsConnectionService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/SettingsConnectionService.java index 41af0d406ab8..5c821eb05613 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/SettingsConnectionService.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/SettingsConnectionService.java @@ -1,12 +1,12 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog.connection; import com.intellij.internal.statistic.config.EventLogConfigParserException; import com.intellij.internal.statistic.config.EventLogExternalSendSettings; import com.intellij.internal.statistic.config.EventLogExternalSettings; import com.intellij.internal.statistic.config.bean.EventLogSendConfiguration; +import com.intellij.internal.statistic.config.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.EventLogApplicationInfo; -import com.intellij.internal.statistic.eventLog.EventLogBuildType; import com.intellij.internal.statistic.eventLog.connection.request.StatsHttpRequests; import com.intellij.internal.statistic.eventLog.connection.request.StatsResponseException; import org.jetbrains.annotations.NotNull; diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/metadata/EventLogMetadataUtils.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/metadata/EventLogMetadataUtils.java index 1600d9a1a429..3f0d483bb682 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/metadata/EventLogMetadataUtils.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/metadata/EventLogMetadataUtils.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog.connection.metadata; import com.google.gson.GsonBuilder; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; import java.io.IOException; -import static com.intellij.internal.statistic.StatisticsStringUtil.isEmptyOrSpaces; +import static com.intellij.internal.statistic.config.StatisticsStringUtil.isEmptyOrSpaces; /** *
    diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java index 0a7f19d39e5b..8f20b7d5646e 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/request/StatsRequestBuilder.java @@ -1,7 +1,7 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.eventLog.connection.request; -import com.intellij.internal.statistic.StatisticsStringUtil; +import com.intellij.internal.statistic.config.StatisticsStringUtil; import com.intellij.internal.statistic.eventLog.connection.EventLogConnectionSettings; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,10 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.charset.Charset; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.Objects; import java.util.zip.GZIPOutputStream; public class StatsRequestBuilder { diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/EventLogUploader.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/EventLogUploader.java index a15787d9dcec..7c03f86f5bc7 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/EventLogUploader.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/EventLogUploader.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.uploader; import com.intellij.internal.statistic.eventLog.*; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.intellij.internal.statistic.StatisticsStringUtil.split; +import static com.intellij.internal.statistic.config.StatisticsStringUtil.split; public final class EventLogUploader { private static final int WAIT_FOR_IDE_MS = 2000; diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java index d21a2874493b..f2caf0955c06 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventSerializer.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.uploader.events; import org.jetbrains.annotations.NotNull; @@ -12,7 +12,7 @@ import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; -import static com.intellij.internal.statistic.StatisticsStringUtil.isNotEmpty; +import static com.intellij.internal.statistic.config.StatisticsStringUtil.isNotEmpty; import static com.intellij.internal.statistic.eventLog.StatisticsEventEscaper.escape; public final class ExternalSystemEventSerializer { diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventType.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventType.java index 3800dc671366..e0c80274e5bc 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventType.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/uploader/events/ExternalSystemEventType.java @@ -1,7 +1,7 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.internal.statistic.uploader.events; -import com.intellij.internal.statistic.StatisticsStringUtil; +import com.intellij.internal.statistic.config.StatisticsStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;