rebase

Author: kirill-knize-sonarsource

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

@@ -20,7 +20,8 @@
 package org.sonarsource.sonarlint.core.commons.storage.repository;
 
 import java.nio.file.Path;
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.List;
 import java.util.UUID;
 import org.jooq.Configuration;
@@ -31,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.generated.Tables.KNOWN_FINDING;
+import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.KNOWN_FINDING;
 
 public class KnownFindingsRepository {
 
@@ -69,7 +70,7 @@ private void storeKnownFindings(String configurationScopeId, Path clientRelative
       var lineWithHash = finding.getLineWithHash();
       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)
         .using(trx.dsl().selectOne())
         .on(KNOWN_FINDING.ID.eq(finding.getId().toString()))
@@ -79,7 +80,7 @@ private void storeKnownFindings(String configurationScopeId, Path clientRelative
         .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, Timestamp.from(finding.getIntroductionDate()))
+        .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)
@@ -93,7 +94,7 @@ private void storeKnownFindings(String configurationScopeId, Path clientRelative
           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)
         .values(finding.getId().toString(), configurationScopeId, clientRelativePath.toString(), finding.getServerKey(), finding.getRuleKey(),
-          finding.getMessage(), Timestamp.from(finding.getIntroductionDate()), type.name(),
+          finding.getMessage(), introDate, type.name(),
           startLine, startLineOffset, endLine, endLineOffset, textRangeHash,
           line, lineHash
         )
@@ -116,7 +117,7 @@ private List<KnownFinding> getKnownFindingsForFile(String configurationScopeId,
 
   private KnownFinding recordToKnownFinding(Record rec) {
     var id = UUID.fromString(rec.get(KNOWN_FINDING.ID));
-    var introductionDate = rec.get(KNOWN_FINDING.INTRODUCTION_DATE).toInstant();
+    var introductionDate = rec.get(KNOWN_FINDING.INTRODUCTION_DATE).atZone(ZoneId.systemDefault()).toInstant();
     var textRangeWithHash = getTextRangeWithHash(rec);
     var lineWithHash = getLineWithHash(rec);
     return new KnownFinding(