redesign/cleanup of Usage Statistics service: moved UsagesCollector.EP

This commit is contained in:
sergey.vasiliev
2017-07-24 13:44:50 +02:00
parent f8d31ac2b0
commit 73bceffa7b
3 changed files with 5 additions and 4 deletions
@@ -205,7 +205,7 @@ public class ApplicationStatisticsPersistenceComponent extends ApplicationStatis
return;
}
for (UsagesCollector usagesCollector : StatisticsUploadAssistant.EP_NAME.getExtensions()) {
for (UsagesCollector usagesCollector : UsagesCollector.EP_NAME.getExtensions()) {
if (usagesCollector instanceof AbstractProjectsUsagesCollector) {
((AbstractProjectsUsagesCollector)usagesCollector).persistProjectUsages(project);
}
@@ -17,12 +17,15 @@ package com.intellij.internal.statistic;
import com.intellij.internal.statistic.beans.GroupDescriptor;
import com.intellij.internal.statistic.beans.UsageDescriptor;
import com.intellij.openapi.extensions.ExtensionPointName;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
public abstract class UsagesCollector {
public static final ExtensionPointName<UsagesCollector> EP_NAME = ExtensionPointName.create("com.intellij.statistics.usagesCollector");
@NotNull
public abstract Set<UsageDescriptor> getUsages() throws CollectUsagesException;
@@ -30,7 +30,6 @@ import com.intellij.internal.statistic.persistence.SentUsagesPersistence;
import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
import com.intellij.openapi.application.impl.ApplicationInfoImpl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.util.KeyedExtensionCollector;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.Time;
@@ -43,7 +42,6 @@ import java.util.Map;
import java.util.Set;
public class StatisticsUploadAssistant {
public static final ExtensionPointName<UsagesCollector> EP_NAME = ExtensionPointName.create("com.intellij.statistics.usagesCollector");
private static final Logger LOG = Logger.getInstance(UsagesCollector.class);
public static final Object LOCK = new Object();
@@ -124,7 +122,7 @@ public class StatisticsUploadAssistant {
public static Map<GroupDescriptor, Set<UsageDescriptor>> getAllUsages(@NotNull Set<String> disabledGroups) {
synchronized (LOCK) {
Map<GroupDescriptor, Set<UsageDescriptor>> usageDescriptors = new LinkedHashMap<>();
for (UsagesCollector usagesCollector : EP_NAME.getExtensions()) {
for (UsagesCollector usagesCollector : UsagesCollector.EP_NAME.getExtensions()) {
GroupDescriptor groupDescriptor = usagesCollector.getGroupId();
if (!disabledGroups.contains(groupDescriptor.getId())) {
try {