diff --git a/build/tasks/resources/linux/class-report.txt b/build/tasks/resources/linux/class-report.txt index 5070a51a23c9..505549fbd1b2 100644 --- a/build/tasks/resources/linux/class-report.txt +++ b/build/tasks/resources/linux/class-report.txt @@ -4231,7 +4231,6 @@ io/netty/handler/codec/http/HttpObject.class:lib/util-8.jar io/netty/handler/codec/http/HttpMessage.class:lib/util-8.jar io/netty/handler/codec/http/HttpRequest.class:lib/util-8.jar com/intellij/ide/ui/laf/LafManagerImpl$settingsToolbar$1.class:lib/app.jar -com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.class:lib/stats.jar com/intellij/openapi/vfs/DiskQueryRelay.class:lib/app.jar com/intellij/openapi/vfs/newvfs/persistent/PersistentFSSynchronizedRecordsStorage.class:lib/app.jar it/unimi/dsi/fastutil/longs/LongIterable.class:lib/util-8.jar diff --git a/build/tasks/resources/mac/class-report.txt b/build/tasks/resources/mac/class-report.txt index 5070a51a23c9..505549fbd1b2 100644 --- a/build/tasks/resources/mac/class-report.txt +++ b/build/tasks/resources/mac/class-report.txt @@ -4231,7 +4231,6 @@ io/netty/handler/codec/http/HttpObject.class:lib/util-8.jar io/netty/handler/codec/http/HttpMessage.class:lib/util-8.jar io/netty/handler/codec/http/HttpRequest.class:lib/util-8.jar com/intellij/ide/ui/laf/LafManagerImpl$settingsToolbar$1.class:lib/app.jar -com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.class:lib/stats.jar com/intellij/openapi/vfs/DiskQueryRelay.class:lib/app.jar com/intellij/openapi/vfs/newvfs/persistent/PersistentFSSynchronizedRecordsStorage.class:lib/app.jar it/unimi/dsi/fastutil/longs/LongIterable.class:lib/util-8.jar diff --git a/build/tasks/resources/windows/class-report.txt b/build/tasks/resources/windows/class-report.txt index 5070a51a23c9..505549fbd1b2 100644 --- a/build/tasks/resources/windows/class-report.txt +++ b/build/tasks/resources/windows/class-report.txt @@ -4231,7 +4231,6 @@ io/netty/handler/codec/http/HttpObject.class:lib/util-8.jar io/netty/handler/codec/http/HttpMessage.class:lib/util-8.jar io/netty/handler/codec/http/HttpRequest.class:lib/util-8.jar com/intellij/ide/ui/laf/LafManagerImpl$settingsToolbar$1.class:lib/app.jar -com/intellij/internal/statistic/eventLog/EventLogEndpointSubstitutor.class:lib/stats.jar com/intellij/openapi/vfs/DiskQueryRelay.class:lib/app.jar com/intellij/openapi/vfs/newvfs/persistent/PersistentFSSynchronizedRecordsStorage.class:lib/app.jar it/unimi/dsi/fastutil/longs/LongIterable.class:lib/util-8.jar diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml index c81f5a21912d..be638be6b3a1 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml @@ -196,7 +196,6 @@ - EP_NAME = new ExtensionPointName<>("com.intellij.statistic.eventLog.eventLogEndpointSubstitutor"); - - /** - * @deprecated Endpoint shouldn't depend on recorder id. Use {@link #getTemplateUrl()} - */ - @Deprecated - @Nullable String getTemplateUrl(@NotNull String recorderId); - - /** - * Provides a custom endpoint for fetching configuration - * @return Remote endpoint URL or null if platform default should be used - */ - default @Nullable String getTemplateUrl() { - return getTemplateUrl("UNDEFINED"); - } -} diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogInternalApplicationInfo.java b/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogInternalApplicationInfo.java index 9eab2475bf49..d81d69094316 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogInternalApplicationInfo.java +++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogInternalApplicationInfo.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. +// Copyright 2000-2023 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.eventLog.connection.EventLogConnectionSettings; @@ -44,23 +44,6 @@ public class EventLogInternalApplicationInfo implements EventLogApplicationInfo @NotNull @Override public String getTemplateUrl() { - ExternalEventLogSettings externalEventLogSettings = StatisticsEventLogProviderUtil.getExternalEventLogSettings(); - if (externalEventLogSettings != null) { - String result = externalEventLogSettings.getTemplateUrl(); - return result == null ? getDefaultTemplateUrl() : result; - } - else if (ApplicationManager.getApplication().getExtensionArea().hasExtensionPoint(EventLogEndpointSubstitutor.EP_NAME.getName())) { - EventLogEndpointSubstitutor validSubstitutor = EventLogEndpointSubstitutor.EP_NAME.findFirstSafe(substitutor -> { - return PluginInfoDetectorKt.getPluginInfo(substitutor.getClass()).isAllowedToInjectIntoFUS(); - }); - - String result = validSubstitutor == null ? null : validSubstitutor.getTemplateUrl(); - return result == null ? getDefaultTemplateUrl() : result; - } - return getDefaultTemplateUrl(); - } - - private static String getDefaultTemplateUrl() { return ((ApplicationInfoImpl)ApplicationInfoImpl.getShadowInstance()).getEventLogSettingsUrl(); } diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/ExternalEventLogSettings.java b/platform/statistics/src/com/intellij/internal/statistic/eventLog/ExternalEventLogSettings.java index 06c7376cd93d..a4a180510ad9 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/ExternalEventLogSettings.java +++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/ExternalEventLogSettings.java @@ -25,13 +25,18 @@ public interface ExternalEventLogSettings { /** * @deprecated Endpoint shouldn't depend on recorder id. Use {@link #getTemplateUrl()} */ - @Deprecated - @Nullable String getTemplateUrl(@NotNull String recorderId); + @Deprecated(since = "2022.2") + default @Nullable String getTemplateUrl(@NotNull String recorderId) { + return null; + } /** * Provides a custom endpoint for fetching configuration + * * @return Remote endpoint URL or null if platform default should be used + * @deprecated functionality is disabled */ + @Deprecated(since = "2023.1") default @Nullable String getTemplateUrl() { return getTemplateUrl("UNDEFINED"); }