SLCORE-1802 Migrate protobuf-based storage to the new database

Author: damien-urruty-sonarsource

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/SonarLintDatabase.java

@@ -32,7 +32,16 @@
 import org.jooq.impl.DSL;
 import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;
 
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.ACTIVE_RULESETS;
 import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.AI_CODEFIX_SETTINGS;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.NEW_CODE_DEFINITIONS;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.ORGANIZATIONS;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.PLUGINS;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.PROJECTS;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.PROJECT_BRANCHES;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.SERVERS;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.SERVER_FEATURES;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.USERS;
 
 public final class SonarLintDatabase {
   private static final SonarLintLogger LOG = SonarLintLogger.get();
@@ -109,6 +118,33 @@ public void cleanupNonExistingConnections(Set<String> existingConnectionIds) {
     dsl.deleteFrom(AI_CODEFIX_SETTINGS)
       .where(AI_CODEFIX_SETTINGS.CONNECTION_ID.notIn(existingConnectionIds))
       .execute();
+    dsl.deleteFrom(ACTIVE_RULESETS)
+      .where(ACTIVE_RULESETS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(PROJECTS)
+      .where(PROJECTS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(SERVERS)
+      .where(SERVERS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(PROJECT_BRANCHES)
+      .where(PROJECT_BRANCHES.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(PLUGINS)
+      .where(PLUGINS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(SERVER_FEATURES)
+      .where(SERVER_FEATURES.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(ORGANIZATIONS)
+      .where(ORGANIZATIONS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(USERS)
+      .where(USERS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
+    dsl.deleteFrom(NEW_CODE_DEFINITIONS)
+      .where(NEW_CODE_DEFINITIONS.CONNECTION_ID.notIn(existingConnectionIds))
+      .execute();
   }
 }
 

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/repository/AiCodeFixRepository.java

@@ -0,0 +1,23 @@
+/*
+ * SonarLint Core - Commons
+ * Copyright (C) 2016-2025 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.
+ */
+@ParametersAreNonnullByDefault
+package org.sonarsource.sonarlint.core.commons.storage.repository;
+
+import javax.annotation.ParametersAreNonnullByDefault;

backend/commons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/repository/package-info.java

@@ -0,0 +1,70 @@
+-- Flyway migration: create server storage tables for H2
+-- These tables migrate protobuf-based storage to H2 database
+-- Used only in dogfood environment
+
+CREATE TABLE IF NOT EXISTS PROJECTS (
+  connection_id VARCHAR(255) NOT NULL,
+  project_key VARCHAR(255) NOT NULL,
+  last_smart_notification_poll_date TIMESTAMP,
+  CONSTRAINT pk_projects PRIMARY KEY (connection_id, project_key)
+);
+
+CREATE TABLE IF NOT EXISTS ACTIVE_RULESETS (
+  connection_id VARCHAR(255) NOT NULL,
+  project_key VARCHAR(255) NOT NULL,
+  language_key VARCHAR(50) NOT NULL,
+  last_modified TIMESTAMP NOT NULL,
+  rules JSON NOT NULL,
+  CONSTRAINT pk_active_rulesets PRIMARY KEY (connection_id, project_key, language_key)
+);
+
+CREATE TABLE IF NOT EXISTS PROJECT_BRANCHES (
+  connection_id VARCHAR(255) NOT NULL,
+  project_key VARCHAR(255) NOT NULL,
+  name VARCHAR(255) NOT NULL,
+  is_default BOOLEAN NOT NULL,
+  CONSTRAINT pk_project_branches PRIMARY KEY (connection_id, project_key, name)
+);
+
+CREATE TABLE IF NOT EXISTS PLUGINS (
+  connection_id VARCHAR(255) NOT NULL,
+  "key" VARCHAR(255) NOT NULL,
+  hash VARCHAR(255) NOT NULL,
+  filename VARCHAR(255) NOT NULL,
+  CONSTRAINT pk_plugins PRIMARY KEY (connection_id, "key")
+);
+
+CREATE TABLE IF NOT EXISTS SERVERS (
+  connection_id VARCHAR(255) NOT NULL PRIMARY KEY,
+  version VARCHAR(50),
+  id VARCHAR(255),
+  global_settings JSON NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS SERVER_FEATURES (
+  connection_id VARCHAR(255) NOT NULL PRIMARY KEY,
+  features VARCHAR(200) ARRAY NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS ORGANIZATIONS (
+  connection_id VARCHAR(255) NOT NULL PRIMARY KEY,
+  id VARCHAR(255) NOT NULL,
+  uuidv4 VARCHAR(36) NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "USERS" (
+  connection_id VARCHAR(255) NOT NULL PRIMARY KEY,
+  id VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS NEW_CODE_DEFINITIONS (
+  connection_id VARCHAR(255) NOT NULL,
+  project_key VARCHAR(255) NOT NULL,
+  mode VARCHAR(50) NOT NULL,
+  days INT,
+  threshold_date DATE,
+  version VARCHAR(50),
+  reference_branch VARCHAR(255),
+  CONSTRAINT pk_new_code_definitions PRIMARY KEY (connection_id, project_key)
+);
+

backend/commons/src/main/resources/db/migration/V2__create_server_storage_tables.sql

@@ -65,8 +65,9 @@
 import org.sonarsource.sonarlint.core.serverapi.rules.ServerRule;
 import org.sonarsource.sonarlint.core.serverconnection.AnalyzerConfiguration;
 import org.sonarsource.sonarlint.core.serverconnection.RuleSet;
+import org.sonarsource.sonarlint.core.serverconnection.repository.AnalyzerConfigurationRepository;
+import org.sonarsource.sonarlint.core.serverconnection.repository.ServerInfoRepository;
 import org.sonarsource.sonarlint.core.serverconnection.storage.StorageException;
-import org.sonarsource.sonarlint.core.storage.StorageService;
 import org.sonarsource.sonarlint.core.sync.AnalyzerConfigurationSynchronized;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
@@ -88,7 +89,8 @@ public class ActiveRulesService {
   private final LanguageSupportRepository languageSupportRepository;
   private final SonarQubeClientManager sonarQubeClientManager;
   private final SeverityModeService severityModeService;
-  private final StorageService storageService;
+  private final AnalyzerConfigurationRepository analyzerConfigurationRepository;
+  private final ServerInfoRepository serverInfoRepository;
   private final RulesRepository rulesRepository;
   private final ConnectionConfigurationRepository connectionConfigurationRepository;
   private final boolean hotspotEnabled;
@@ -99,13 +101,14 @@ public class ActiveRulesService {
   private final Map<Binding, List<ActiveRuleDetails>> activeRulesPerBinding = new ConcurrentHashMap<>();
 
   public ActiveRulesService(ConfigurationRepository configurationRepository, LanguageSupportRepository languageSupportRepository, SonarQubeClientManager sonarQubeClientManager,
-    SeverityModeService severityModeService, StorageService storageService, RulesRepository rulesRepository, ConnectionConfigurationRepository connectionConfigurationRepository,
+    SeverityModeService severityModeService, AnalyzerConfigurationRepository analyzerConfigurationRepository, ServerInfoRepository serverInfoRepository, RulesRepository rulesRepository, ConnectionConfigurationRepository connectionConfigurationRepository,
     InitializeParams initializeParams, ApplicationEventPublisher eventPublisher) {
     this.configurationRepository = configurationRepository;
     this.languageSupportRepository = languageSupportRepository;
     this.sonarQubeClientManager = sonarQubeClientManager;
     this.severityModeService = severityModeService;
-    this.storageService = storageService;
+    this.analyzerConfigurationRepository = analyzerConfigurationRepository;
+    this.serverInfoRepository = serverInfoRepository;
     this.rulesRepository = rulesRepository;
     this.connectionConfigurationRepository = connectionConfigurationRepository;
     this.hotspotEnabled = initializeParams.getBackendCapabilities().contains(SECURITY_HOTSPOTS);
@@ -184,7 +187,7 @@ public List<ActiveRuleDetails> getConnectedActiveRules(Binding binding) {
   }
 
   private List<ActiveRuleDetails> buildConnectedActiveRules(Binding binding) {
-    var analyzerConfig = storageService.binding(binding).analyzerConfiguration().read();
+    var analyzerConfig = analyzerConfigurationRepository.read(binding.connectionId(), binding.sonarProjectKey());
     var ruleSetByLanguageKey = analyzerConfig.getRuleSetByLanguageKey();
     var result = new ArrayList<ActiveRuleDetails>();
     ruleSetByLanguageKey.entrySet()
@@ -264,7 +267,7 @@ private boolean isHotspotTrackingPossible(String connectionId) {
       return false;
     }
     // when storage is not present, consider hotspots should not be detected
-    return storageService.connection(connectionId).serverInfo().read().isPresent();
+    return serverInfoRepository.read(connectionId).isPresent();
   }
 
   private static Predicate<? super SonarLintRuleDefinition> isExcludedByConfiguration(Set<String> excludedRules) {
@@ -341,7 +344,7 @@ public void onServerEventReceived(SonarServerEventReceivedEvent eventReceived) {
   }
 
   private void updateStorage(String connectionId, RuleSetChangedEvent event) {
-    event.getProjectKeys().forEach(projectKey -> storageService.connection(connectionId).project(projectKey).analyzerConfiguration().update(currentConfiguration -> {
+    event.getProjectKeys().forEach(projectKey -> analyzerConfigurationRepository.update(connectionId, projectKey, currentConfiguration -> {
       var newRuleSetByLanguageKey = incorporate(event, currentConfiguration.getRuleSetByLanguageKey());
       return new AnalyzerConfiguration(currentConfiguration.getSettings(), newRuleSetByLanguageKey, currentConfiguration.getSchemaVersion());
     }));
@@ -421,7 +424,7 @@ private RuleDetails getActiveRuleForBinding(String ruleKey, Binding binding, Son
   private Optional<ServerActiveRule> findServerActiveRuleInStorage(Binding binding, String ruleKey) {
     AnalyzerConfiguration analyzerConfiguration;
     try {
-      analyzerConfiguration = storageService.binding(binding).analyzerConfiguration().read();
+      analyzerConfiguration = analyzerConfigurationRepository.read(binding.connectionId(), binding.sonarProjectKey());
     } catch (StorageException e) {
       // XXX we should make sure this situation can not happen (sync should be enforced at least once)
       return Optional.empty();