make TelemetryDataLoader an interface

this will easy later refactoring

server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java

@@ -169,7 +169,7 @@ public class TelemetryDaemon implements Startable {
       .orElseThrow(() -> new IllegalStateException(String.format("Setting '%s' must be provided.", SONAR_TELEMETRY_FREQUENCY_IN_SECONDS)));
   }
 
-  private int lockDuration(){
+  private int lockDuration() {
     return config.getInt(LOCK_DELAY_SEC).orElse(60);
   }
 }

server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java

@@ -19,111 +19,8 @@
  */
 package org.sonar.server.telemetry;
 
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-import org.sonar.api.platform.Server;
-import org.sonar.api.server.ServerSide;
-import org.sonar.core.platform.PlatformEditionProvider;
-import org.sonar.core.platform.PluginInfo;
-import org.sonar.core.platform.PluginRepository;
-import org.sonar.core.util.stream.MoreCollectors;
-import org.sonar.db.DbClient;
-import org.sonar.db.DbSession;
-import org.sonar.db.measure.SumNclocDbQuery;
-import org.sonar.server.es.SearchOptions;
-import org.sonar.server.measure.index.ProjectMeasuresIndex;
-import org.sonar.server.measure.index.ProjectMeasuresStatistics;
-import org.sonar.server.organization.DefaultOrganizationProvider;
-import org.sonar.server.property.InternalProperties;
-import org.sonar.server.telemetry.TelemetryData.Database;
-import org.sonar.server.user.index.UserIndex;
-import org.sonar.server.user.index.UserQuery;
+public interface TelemetryDataLoader {
+  TelemetryData load();
 
-import static java.util.Optional.ofNullable;
-
-@ServerSide
-public class TelemetryDataLoader {
-  private final Server server;
-  private final DbClient dbClient;
-  private final PluginRepository pluginRepository;
-  private final UserIndex userIndex;
-  private final ProjectMeasuresIndex projectMeasuresIndex;
-  private final PlatformEditionProvider editionProvider;
-  private final DefaultOrganizationProvider defaultOrganizationProvider;
-  private final InternalProperties internalProperties;
-  @CheckForNull
-  private final LicenseReader licenseReader;
-
-  public TelemetryDataLoader(Server server, DbClient dbClient, PluginRepository pluginRepository, UserIndex userIndex, ProjectMeasuresIndex projectMeasuresIndex,
-    PlatformEditionProvider editionProvider, DefaultOrganizationProvider defaultOrganizationProvider, InternalProperties internalProperties) {
-    this(server, dbClient, pluginRepository, userIndex, projectMeasuresIndex, editionProvider, defaultOrganizationProvider, internalProperties, null);
-  }
-
-  public TelemetryDataLoader(Server server, DbClient dbClient, PluginRepository pluginRepository, UserIndex userIndex, ProjectMeasuresIndex projectMeasuresIndex,
-    PlatformEditionProvider editionProvider, DefaultOrganizationProvider defaultOrganizationProvider, InternalProperties internalProperties,
-    @Nullable LicenseReader licenseReader) {
-    this.server = server;
-    this.dbClient = dbClient;
-    this.pluginRepository = pluginRepository;
-    this.userIndex = userIndex;
-    this.projectMeasuresIndex = projectMeasuresIndex;
-    this.editionProvider = editionProvider;
-    this.defaultOrganizationProvider = defaultOrganizationProvider;
-    this.licenseReader = licenseReader;
-    this.internalProperties = internalProperties;
-  }
-
-  private static Database loadDatabaseMetadata(DbSession dbSession) {
-    try {
-      DatabaseMetaData metadata = dbSession.getConnection().getMetaData();
-      return new Database(metadata.getDatabaseProductName(), metadata.getDatabaseProductVersion());
-    } catch (SQLException e) {
-      throw new IllegalStateException("Fail to get DB metadata", e);
-    }
-  }
-
-  public TelemetryData load() {
-    TelemetryData.Builder data = TelemetryData.builder();
-
-    data.setServerId(server.getId());
-    data.setVersion(server.getVersion());
-    data.setEdition(editionProvider.get());
-    ofNullable(licenseReader)
-      .flatMap(reader -> licenseReader.read())
-      .ifPresent(license -> data.setLicenseType(license.getType()));
-    Function<PluginInfo, String> getVersion = plugin -> plugin.getVersion() == null ? "undefined" : plugin.getVersion().getName();
-    Map<String, String> plugins = pluginRepository.getPluginInfos().stream().collect(MoreCollectors.uniqueIndex(PluginInfo::getKey, getVersion));
-    data.setPlugins(plugins);
-    long userCount = userIndex.search(UserQuery.builder().build(), new SearchOptions().setLimit(1)).getTotal();
-    data.setUserCount(userCount);
-    ProjectMeasuresStatistics projectMeasuresStatistics = projectMeasuresIndex.searchTelemetryStatistics();
-    data.setProjectMeasuresStatistics(projectMeasuresStatistics);
-    try (DbSession dbSession = dbClient.openSession(false)) {
-      data.setDatabase(loadDatabaseMetadata(dbSession));
-      data.setUsingBranches(dbClient.branchDao().hasNonMainBranches(dbSession));
-      SumNclocDbQuery query = SumNclocDbQuery.builder()
-        .setOnlyPrivateProjects(false)
-        .setOrganizationUuid(defaultOrganizationProvider.get().getUuid())
-        .build();
-      data.setNcloc(dbClient.liveMeasureDao().sumNclocOfBiggestLongLivingBranch(dbSession, query));
-    }
-
-    Optional<String> installationDateProperty = internalProperties.read(InternalProperties.INSTALLATION_DATE);
-    if (installationDateProperty.isPresent()) {
-      data.setInstallationDate(Long.valueOf(installationDateProperty.get()));
-    }
-    Optional<String> installationVersionProperty = internalProperties.read(InternalProperties.INSTALLATION_VERSION);
-    data.setInstallationVersion(installationVersionProperty.orElse(null));
-
-    return data.build();
-  }
-
-  String loadServerId() {
-    return server.getId();
-  }
+  String loadServerId();
 }

server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java

@@ -0,0 +1,131 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.telemetry;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+import org.sonar.api.platform.Server;
+import org.sonar.api.server.ServerSide;
+import org.sonar.core.platform.PlatformEditionProvider;
+import org.sonar.core.platform.PluginInfo;
+import org.sonar.core.platform.PluginRepository;
+import org.sonar.core.util.stream.MoreCollectors;
+import org.sonar.db.DbClient;
+import org.sonar.db.DbSession;
+import org.sonar.db.measure.SumNclocDbQuery;
+import org.sonar.server.es.SearchOptions;
+import org.sonar.server.measure.index.ProjectMeasuresIndex;
+import org.sonar.server.measure.index.ProjectMeasuresStatistics;
+import org.sonar.server.organization.DefaultOrganizationProvider;
+import org.sonar.server.property.InternalProperties;
+import org.sonar.server.telemetry.TelemetryData.Database;
+import org.sonar.server.user.index.UserIndex;
+import org.sonar.server.user.index.UserQuery;
+
+import static java.util.Optional.ofNullable;
+
+@ServerSide
+public class TelemetryDataLoaderImpl implements TelemetryDataLoader {
+  private final Server server;
+  private final DbClient dbClient;
+  private final PluginRepository pluginRepository;
+  private final UserIndex userIndex;
+  private final ProjectMeasuresIndex projectMeasuresIndex;
+  private final PlatformEditionProvider editionProvider;
+  private final DefaultOrganizationProvider defaultOrganizationProvider;
+  private final InternalProperties internalProperties;
+  @CheckForNull
+  private final LicenseReader licenseReader;
+
+  public TelemetryDataLoaderImpl(Server server, DbClient dbClient, PluginRepository pluginRepository, UserIndex userIndex, ProjectMeasuresIndex projectMeasuresIndex,
+    PlatformEditionProvider editionProvider, DefaultOrganizationProvider defaultOrganizationProvider, InternalProperties internalProperties) {
+    this(server, dbClient, pluginRepository, userIndex, projectMeasuresIndex, editionProvider, defaultOrganizationProvider, internalProperties, null);
+  }
+
+  public TelemetryDataLoaderImpl(Server server, DbClient dbClient, PluginRepository pluginRepository, UserIndex userIndex, ProjectMeasuresIndex projectMeasuresIndex,
+    PlatformEditionProvider editionProvider, DefaultOrganizationProvider defaultOrganizationProvider, InternalProperties internalProperties,
+    @Nullable LicenseReader licenseReader) {
+    this.server = server;
+    this.dbClient = dbClient;
+    this.pluginRepository = pluginRepository;
+    this.userIndex = userIndex;
+    this.projectMeasuresIndex = projectMeasuresIndex;
+    this.editionProvider = editionProvider;
+    this.defaultOrganizationProvider = defaultOrganizationProvider;
+    this.licenseReader = licenseReader;
+    this.internalProperties = internalProperties;
+  }
+
+  private static Database loadDatabaseMetadata(DbSession dbSession) {
+    try {
+      DatabaseMetaData metadata = dbSession.getConnection().getMetaData();
+      return new Database(metadata.getDatabaseProductName(), metadata.getDatabaseProductVersion());
+    } catch (SQLException e) {
+      throw new IllegalStateException("Fail to get DB metadata", e);
+    }
+  }
+
+  @Override
+  public TelemetryData load() {
+    TelemetryData.Builder data = TelemetryData.builder();
+
+    data.setServerId(server.getId());
+    data.setVersion(server.getVersion());
+    data.setEdition(editionProvider.get());
+    ofNullable(licenseReader)
+      .flatMap(reader -> licenseReader.read())
+      .ifPresent(license -> data.setLicenseType(license.getType()));
+    Function<PluginInfo, String> getVersion = plugin -> plugin.getVersion() == null ? "undefined" : plugin.getVersion().getName();
+    Map<String, String> plugins = pluginRepository.getPluginInfos().stream().collect(MoreCollectors.uniqueIndex(PluginInfo::getKey, getVersion));
+    data.setPlugins(plugins);
+    long userCount = userIndex.search(UserQuery.builder().build(), new SearchOptions().setLimit(1)).getTotal();
+    data.setUserCount(userCount);
+    ProjectMeasuresStatistics projectMeasuresStatistics = projectMeasuresIndex.searchTelemetryStatistics();
+    data.setProjectMeasuresStatistics(projectMeasuresStatistics);
+    try (DbSession dbSession = dbClient.openSession(false)) {
+      data.setDatabase(loadDatabaseMetadata(dbSession));
+      data.setUsingBranches(dbClient.branchDao().hasNonMainBranches(dbSession));
+      SumNclocDbQuery query = SumNclocDbQuery.builder()
+        .setOnlyPrivateProjects(false)
+        .setOrganizationUuid(defaultOrganizationProvider.get().getUuid())
+        .build();
+      data.setNcloc(dbClient.liveMeasureDao().sumNclocOfBiggestLongLivingBranch(dbSession, query));
+    }
+
+    Optional<String> installationDateProperty = internalProperties.read(InternalProperties.INSTALLATION_DATE);
+    if (installationDateProperty.isPresent()) {
+      data.setInstallationDate(Long.valueOf(installationDateProperty.get()));
+    }
+    Optional<String> installationVersionProperty = internalProperties.read(InternalProperties.INSTALLATION_VERSION);
+    data.setInstallationVersion(installationVersionProperty.orElse(null));
+
+    return data.build();
+  }
+
+  @Override
+  public String loadServerId() {
+    return server.getId();
+  }
+}

server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java

@@ -105,12 +105,12 @@ public class TelemetryDaemonTest {
   private UserIndexer userIndexer = new UserIndexer(db.getDbClient(), es.client());
   private PlatformEditionProvider editionProvider = mock(PlatformEditionProvider.class);
 
-  private final TelemetryDataLoader communityDataLoader = new TelemetryDataLoader(server, db.getDbClient(), pluginRepository, new UserIndex(es.client(), system2),
+  private final TelemetryDataLoader communityDataLoader = new TelemetryDataLoaderImpl(server, db.getDbClient(), pluginRepository, new UserIndex(es.client(), system2),
     new ProjectMeasuresIndex(es.client(), null, system2), editionProvider, new DefaultOrganizationProviderImpl(db.getDbClient()), internalProperties, null);
   private TelemetryDaemon communityUnderTest = new TelemetryDaemon(communityDataLoader, client, settings.asConfig(), internalProperties, lockManager, system2);
 
   private final LicenseReader licenseReader = mock(LicenseReader.class);
-  private final TelemetryDataLoader commercialDataLoader = new TelemetryDataLoader(server, db.getDbClient(), pluginRepository, new UserIndex(es.client(), system2),
+  private final TelemetryDataLoader commercialDataLoader = new TelemetryDataLoaderImpl(server, db.getDbClient(), pluginRepository, new UserIndex(es.client(), system2),
     new ProjectMeasuresIndex(es.client(), null, system2), editionProvider, new DefaultOrganizationProviderImpl(db.getDbClient()), internalProperties, licenseReader);
   private TelemetryDaemon commercialUnderTest = new TelemetryDaemon(commercialDataLoader, client, settings.asConfig(), internalProperties, lockManager, system2);
 

server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java

@@ -184,7 +184,7 @@ import org.sonar.server.source.ws.SourceWsModule;
 import org.sonar.server.startup.LogServerId;
 import org.sonar.server.telemetry.TelemetryClient;
 import org.sonar.server.telemetry.TelemetryDaemon;
-import org.sonar.server.telemetry.TelemetryDataLoader;
+import org.sonar.server.telemetry.TelemetryDataLoaderImpl;
 import org.sonar.server.text.MacroInterpreter;
 import org.sonar.server.ui.DeprecatedViews;
 import org.sonar.server.ui.PageDecorations;
@@ -516,7 +516,7 @@ public class PlatformLevel4 extends PlatformLevel {
       ProjectIndexersImpl.class,
 
       // telemetry
-      TelemetryDataLoader.class,
+      TelemetryDataLoaderImpl.class,
       TelemetryDaemon.class,
       TelemetryClient.class