PR feedback

Author: kirill-knize-sonarsource

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

@@ -32,7 +32,7 @@
 import org.sonarsource.sonarlint.core.commons.api.TextRangeWithHash;
 import org.sonarsource.sonarlint.core.commons.storage.SonarLintDatabase;
 
-import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.KNOWN_FINDING;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.KNOWN_FINDINGS;
 
 public class KnownFindingsRepository {
 
@@ -71,28 +71,28 @@ private void storeKnownFindings(String configurationScopeId, Path clientRelative
       var line = lineWithHash == null ? null : lineWithHash.getNumber();
       var lineHash = lineWithHash == null ? null : lineWithHash.getHash();
       var introDate = LocalDateTime.ofInstant(finding.getIntroductionDate(), ZoneId.systemDefault());
-      trx.dsl().mergeInto(KNOWN_FINDING)
+      trx.dsl().mergeInto(KNOWN_FINDINGS)
         .using(trx.dsl().selectOne())
-        .on(KNOWN_FINDING.ID.eq(finding.getId().toString()))
+        .on(KNOWN_FINDINGS.ID.eq(finding.getId().toString()))
         .whenMatchedThenUpdate()
-        .set(KNOWN_FINDING.CONFIGURATION_SCOPE_ID, configurationScopeId)
-        .set(KNOWN_FINDING.IDE_RELATIVE_FILE_PATH, clientRelativePath.toString())
-        .set(KNOWN_FINDING.SERVER_KEY, finding.getServerKey())
-        .set(KNOWN_FINDING.RULE_KEY, finding.getRuleKey())
-        .set(KNOWN_FINDING.MESSAGE, finding.getMessage())
-        .set(KNOWN_FINDING.INTRODUCTION_DATE, introDate)
-        .set(KNOWN_FINDING.FINDING_TYPE, type.name())
-        .set(KNOWN_FINDING.START_LINE, startLine)
-        .set(KNOWN_FINDING.START_LINE_OFFSET, startLineOffset)
-        .set(KNOWN_FINDING.END_LINE, endLine)
-        .set(KNOWN_FINDING.END_LINE_OFFSET, endLineOffset)
-        .set(KNOWN_FINDING.TEXT_RANGE_HASH, textRangeHash)
-        .set(KNOWN_FINDING.LINE, line)
-        .set(KNOWN_FINDING.LINE_HASH, lineHash)
-        .whenNotMatchedThenInsert(KNOWN_FINDING.ID, KNOWN_FINDING.CONFIGURATION_SCOPE_ID, KNOWN_FINDING.IDE_RELATIVE_FILE_PATH, KNOWN_FINDING.SERVER_KEY, KNOWN_FINDING.RULE_KEY,
-          KNOWN_FINDING.MESSAGE, KNOWN_FINDING.INTRODUCTION_DATE, KNOWN_FINDING.FINDING_TYPE,
-          KNOWN_FINDING.START_LINE, KNOWN_FINDING.START_LINE_OFFSET, KNOWN_FINDING.END_LINE, KNOWN_FINDING.END_LINE_OFFSET, KNOWN_FINDING.TEXT_RANGE_HASH,
-          KNOWN_FINDING.LINE, KNOWN_FINDING.LINE_HASH)
+        .set(KNOWN_FINDINGS.CONFIGURATION_SCOPE_ID, configurationScopeId)
+        .set(KNOWN_FINDINGS.IDE_RELATIVE_FILE_PATH, clientRelativePath.toString())
+        .set(KNOWN_FINDINGS.SERVER_KEY, finding.getServerKey())
+        .set(KNOWN_FINDINGS.RULE_KEY, finding.getRuleKey())
+        .set(KNOWN_FINDINGS.MESSAGE, finding.getMessage())
+        .set(KNOWN_FINDINGS.INTRODUCTION_DATE, introDate)
+        .set(KNOWN_FINDINGS.FINDING_TYPE, type.name())
+        .set(KNOWN_FINDINGS.START_LINE, startLine)
+        .set(KNOWN_FINDINGS.START_LINE_OFFSET, startLineOffset)
+        .set(KNOWN_FINDINGS.END_LINE, endLine)
+        .set(KNOWN_FINDINGS.END_LINE_OFFSET, endLineOffset)
+        .set(KNOWN_FINDINGS.TEXT_RANGE_HASH, textRangeHash)
+        .set(KNOWN_FINDINGS.LINE, line)
+        .set(KNOWN_FINDINGS.LINE_HASH, lineHash)
+        .whenNotMatchedThenInsert(KNOWN_FINDINGS.ID, KNOWN_FINDINGS.CONFIGURATION_SCOPE_ID, KNOWN_FINDINGS.IDE_RELATIVE_FILE_PATH, KNOWN_FINDINGS.SERVER_KEY, KNOWN_FINDINGS.RULE_KEY,
+          KNOWN_FINDINGS.MESSAGE, KNOWN_FINDINGS.INTRODUCTION_DATE, KNOWN_FINDINGS.FINDING_TYPE,
+          KNOWN_FINDINGS.START_LINE, KNOWN_FINDINGS.START_LINE_OFFSET, KNOWN_FINDINGS.END_LINE, KNOWN_FINDINGS.END_LINE_OFFSET, KNOWN_FINDINGS.TEXT_RANGE_HASH,
+          KNOWN_FINDINGS.LINE, KNOWN_FINDINGS.LINE_HASH)
         .values(finding.getId().toString(), configurationScopeId, clientRelativePath.toString(), finding.getServerKey(), finding.getRuleKey(),
           finding.getMessage(), introDate, type.name(),
           startLine, startLineOffset, endLine, endLineOffset, textRangeHash,
@@ -104,46 +104,46 @@ private void storeKnownFindings(String configurationScopeId, Path clientRelative
 
   private List<KnownFinding> getKnownFindingsForFile(String configurationScopeId, Path filePath, KnownFindingType type) {
     var issuesInFile = database.dsl()
-      .selectFrom(KNOWN_FINDING)
-      .where(KNOWN_FINDING.CONFIGURATION_SCOPE_ID.eq(configurationScopeId)
-        .and(KNOWN_FINDING.IDE_RELATIVE_FILE_PATH.eq(filePath.toString()))
-        .and(KNOWN_FINDING.FINDING_TYPE.eq(type.name()))
+      .selectFrom(KNOWN_FINDINGS)
+      .where(KNOWN_FINDINGS.CONFIGURATION_SCOPE_ID.eq(configurationScopeId)
+        .and(KNOWN_FINDINGS.IDE_RELATIVE_FILE_PATH.eq(filePath.toString()))
+        .and(KNOWN_FINDINGS.FINDING_TYPE.eq(type.name()))
       )
       .fetch();
     return issuesInFile.stream()
-      .map(this::recordToKnownFinding)
+      .map(KnownFindingsRepository::recordToKnownFinding)
       .toList();
   }
 
-  private KnownFinding recordToKnownFinding(Record rec) {
-    var id = UUID.fromString(rec.get(KNOWN_FINDING.ID));
-    var introductionDate = rec.get(KNOWN_FINDING.INTRODUCTION_DATE).atZone(ZoneId.systemDefault()).toInstant();
+  private static KnownFinding recordToKnownFinding(Record rec) {
+    var id = UUID.fromString(rec.get(KNOWN_FINDINGS.ID));
+    var introductionDate = rec.get(KNOWN_FINDINGS.INTRODUCTION_DATE).atZone(ZoneId.systemDefault()).toInstant();
     var textRangeWithHash = getTextRangeWithHash(rec);
     var lineWithHash = getLineWithHash(rec);
     return new KnownFinding(
       id,
-      rec.get(KNOWN_FINDING.SERVER_KEY),
+      rec.get(KNOWN_FINDINGS.SERVER_KEY),
       textRangeWithHash, lineWithHash,
-      rec.get(KNOWN_FINDING.RULE_KEY),
-      rec.get(KNOWN_FINDING.MESSAGE),
+      rec.get(KNOWN_FINDINGS.RULE_KEY),
+      rec.get(KNOWN_FINDINGS.MESSAGE),
       introductionDate
     );
   }
 
   private static LineWithHash getLineWithHash(Record rec) {
-    if (rec.get(KNOWN_FINDING.LINE) == null) return null;
-    var line = rec.get(KNOWN_FINDING.LINE);
-    var hash = rec.get(KNOWN_FINDING.LINE_HASH);
+    if (rec.get(KNOWN_FINDINGS.LINE) == null) return null;
+    var line = rec.get(KNOWN_FINDINGS.LINE);
+    var hash = rec.get(KNOWN_FINDINGS.LINE_HASH);
     return new LineWithHash(line, hash);
   }
 
   private static TextRangeWithHash getTextRangeWithHash(Record rec) {
-    if (rec.get(KNOWN_FINDING.START_LINE) == null) return null;
-    var startLine = rec.get(KNOWN_FINDING.START_LINE);
-    var endLine = rec.get(KNOWN_FINDING.END_LINE);
-    var startLineOffset = rec.get(KNOWN_FINDING.START_LINE_OFFSET);
-    var endLineOffset = rec.get(KNOWN_FINDING.END_LINE_OFFSET);
-    var hash = rec.get(KNOWN_FINDING.TEXT_RANGE_HASH);
+    if (rec.get(KNOWN_FINDINGS.START_LINE) == null) return null;
+    var startLine = rec.get(KNOWN_FINDINGS.START_LINE);
+    var endLine = rec.get(KNOWN_FINDINGS.END_LINE);
+    var startLineOffset = rec.get(KNOWN_FINDINGS.START_LINE_OFFSET);
+    var endLineOffset = rec.get(KNOWN_FINDINGS.END_LINE_OFFSET);
+    var hash = rec.get(KNOWN_FINDINGS.TEXT_RANGE_HASH);
     return new TextRangeWithHash(startLine, startLineOffset, endLine, endLineOffset, hash);
   }
 

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

@@ -9,16 +9,16 @@ CREATE TABLE IF NOT EXISTS AI_CODEFIX_SETTINGS (
   CONSTRAINT pk_ai_codefix_settings PRIMARY KEY (connection_id)
 );
 
-CREATE TABLE IF NOT EXISTS KNOWN_FINDING (
+CREATE TABLE IF NOT EXISTS KNOWN_FINDINGS (
     -- UUID
     id VARCHAR(255) NOT NULL PRIMARY KEY,
-    configuration_scope_id VARCHAR(255),
-    ide_relative_file_path VARCHAR(255),
+    configuration_scope_id VARCHAR(255) NOT NULL,
+    ide_relative_file_path VARCHAR(255) NOT NULL,
     server_key VARCHAR(255),
-    rule_key VARCHAR(255),
-    message VARCHAR(255),
-    introduction_date TIMESTAMP,
-    finding_type VARCHAR(255),
+    rule_key VARCHAR(255) NOT NULL,
+    message VARCHAR(255) NOT NULL,
+    introduction_date TIMESTAMP NOT NULL,
+    finding_type VARCHAR(255) NOT NULL,
     -- TextRangeWithHash
     start_line INT,
     start_line_offset INT,

backend/commons/src/test/java/org/sonarsource/sonarlint/core/commons/storage/repository/KnownFindingsRepositoryTests.java

@@ -36,7 +36,7 @@
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-public class KnownFindingsRepositoryTests {
+class KnownFindingsRepositoryTests {
 
   @RegisterExtension
   static SonarLintLogTester logTester = new SonarLintLogTester();

rpc-protocol/src/main/java/org/sonarsource/sonarlint/core/rpc/protocol/backend/initialize/InitializeParams.java

@@ -53,7 +53,6 @@ public class InitializeParams {
   private final boolean automaticAnalysisEnabled;
   private final TelemetryMigrationDto telemetryMigration;
   private final LogLevel logLevel;
-  private final boolean newSonarLintDatabaseEnabled;
 
   /**
    * @deprecated use newer constructor with log level
@@ -88,11 +87,10 @@ public InitializeParams(
     this(clientConstantInfo, telemetryConstantAttributes, httpConfiguration, alternativeSonarCloudEnvironment, backendCapabilities, storageRoot, workDir, embeddedPluginPaths,
       connectedModeEmbeddedPluginPathsByKey, enabledLanguagesInStandaloneMode, extraEnabledLanguagesInConnectedMode, disabledPluginKeysForAnalysis, sonarQubeConnections,
       sonarCloudConnections, sonarlintUserHome, standaloneRuleConfigByKey, isFocusOnNewCode, languageSpecificRequirements, automaticAnalysisEnabled, telemetryMigration,
-      LogLevel.TRACE, false);
+      LogLevel.TRACE);
   }
 
   /**
-   * @deprecated use newer constructor with newSonarLintDatabaseEnabled
    * @param enabledLanguagesInStandaloneMode if IPYTHON is part of the list and a configuration scope is bound, standalone active rules will be used
    * @param telemetryConstantAttributes Static information about the client, that will be sent with the telemetry payload
    * @param workDir                     Path to work directory. If null, will default to [sonarlintUserHome]/work
@@ -121,42 +119,6 @@ public InitializeParams(
     boolean automaticAnalysisEnabled,
     @Nullable TelemetryMigrationDto telemetryMigration,
     LogLevel logLevel) {
-    this(clientConstantInfo, telemetryConstantAttributes, httpConfiguration, alternativeSonarCloudEnvironment, backendCapabilities, storageRoot, workDir, embeddedPluginPaths,
-      connectedModeEmbeddedPluginPathsByKey, enabledLanguagesInStandaloneMode, extraEnabledLanguagesInConnectedMode, disabledPluginKeysForAnalysis, sonarQubeConnections,
-      sonarCloudConnections, sonarlintUserHome, standaloneRuleConfigByKey, isFocusOnNewCode, languageSpecificRequirements, automaticAnalysisEnabled, telemetryMigration,
-      logLevel, false);
-  }
-
-  /**
-   * @param enabledLanguagesInStandaloneMode if IPYTHON is part of the list and a configuration scope is bound, standalone active rules will be used
-   * @param telemetryConstantAttributes Static information about the client, that will be sent with the telemetry payload
-   * @param workDir                     Path to work directory. If null, will default to [sonarlintUserHome]/work
-   * @param sonarlintUserHome           Path to SonarLint user home directory. If null, will default to the SONARLINT_USER_HOME env variable if set, else ~/.sonarlint
-   * @param standaloneRuleConfigByKey   Local rule configuration for standalone analysis. This configuration will override defaults rule activation and parameters.
-   */
-  public InitializeParams(
-    ClientConstantInfoDto clientConstantInfo,
-    TelemetryClientConstantAttributesDto telemetryConstantAttributes,
-    HttpConfigurationDto httpConfiguration,
-    @Nullable SonarCloudAlternativeEnvironmentDto alternativeSonarCloudEnvironment,
-    Set<BackendCapability> backendCapabilities,
-    Path storageRoot,
-    @Nullable Path workDir,
-    @Nullable Set<Path> embeddedPluginPaths,
-    @Nullable Map<String, Path> connectedModeEmbeddedPluginPathsByKey,
-    @Nullable Set<Language> enabledLanguagesInStandaloneMode,
-    @Nullable Set<Language> extraEnabledLanguagesInConnectedMode,
-    @Nullable Set<String> disabledPluginKeysForAnalysis,
-    @Nullable List<SonarQubeConnectionConfigurationDto> sonarQubeConnections,
-    @Nullable List<SonarCloudConnectionConfigurationDto> sonarCloudConnections,
-    @Nullable String sonarlintUserHome,
-    @Nullable Map<String, StandaloneRuleConfigDto> standaloneRuleConfigByKey,
-    boolean isFocusOnNewCode,
-    @Nullable LanguageSpecificRequirements languageSpecificRequirements,
-    boolean automaticAnalysisEnabled,
-    @Nullable TelemetryMigrationDto telemetryMigration,
-    LogLevel logLevel,
-    boolean newSonarLintDatabaseEnabled) {
     this.clientConstantInfo = clientConstantInfo;
     this.telemetryConstantAttributes = telemetryConstantAttributes;
     this.httpConfiguration = httpConfiguration;
@@ -178,7 +140,6 @@ public InitializeParams(
     this.automaticAnalysisEnabled = automaticAnalysisEnabled;
     this.telemetryMigration = telemetryMigration;
     this.logLevel = logLevel;
-    this.newSonarLintDatabaseEnabled = newSonarLintDatabaseEnabled;
   }
 
   public ClientConstantInfoDto getClientConstantInfo() {
@@ -269,8 +230,4 @@ public TelemetryMigrationDto getTelemetryMigration() {
   public LogLevel getLogLevel() {
     return logLevel;
   }
-
-  public boolean isUseNewSonarLintDatabaseEnabled() {
-    return newSonarLintDatabaseEnabled;
-  }
 }