From 122be7bb5860e7d4d643fbce2e5d5b153da8714c Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 28 Oct 2024 12:56:36 +0100
Subject: SONAR-23485 Fix NPE when importing FOSSA CVEs

Make published_at and last_modified_at nullable
---
 .../src/main/java/org/sonar/db/dependency/CveDto.java       | 13 ++++++++++---
 server/sonar-db-dao/src/schema/schema-sq.ddl                |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'server/sonar-db-dao/src')

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java
index 53278c024c4..e8c3cd8a21e 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/dependency/CveDto.java
@@ -19,14 +19,21 @@
  */
 package org.sonar.db.dependency;
 
+import javax.annotation.Nullable;
+
 public record CveDto(
   String uuid,
   String id,
   String description,
-  double cvssScore,
-  double epssScore,
-  double epssPercentile,
+  @Nullable
+  Double cvssScore,
+  @Nullable
+  Double epssScore,
+  @Nullable
+  Double epssPercentile,
+  @Nullable
   Long publishedAt,
+  @Nullable
   Long lastModifiedAt,
   Long createdAt,
   Long updatedAt
diff --git a/server/sonar-db-dao/src/schema/schema-sq.ddl b/server/sonar-db-dao/src/schema/schema-sq.ddl
index 8d87b6f6d02..272b1c156a1 100644
--- a/server/sonar-db-dao/src/schema/schema-sq.ddl
+++ b/server/sonar-db-dao/src/schema/schema-sq.ddl
@@ -263,8 +263,8 @@ CREATE TABLE "CVES"(
     "CVSS_SCORE" DOUBLE PRECISION,
     "EPSS_SCORE" DOUBLE PRECISION,
     "EPSS_PERCENTILE" DOUBLE PRECISION,
-    "PUBLISHED_AT" BIGINT NOT NULL,
-    "LAST_MODIFIED_AT" BIGINT NOT NULL,
+    "PUBLISHED_AT" BIGINT,
+    "LAST_MODIFIED_AT" BIGINT,
     "CREATED_AT" BIGINT NOT NULL,
     "UPDATED_AT" BIGINT NOT NULL
 );
-- 
cgit v1.2.3