SONAR-22305 Ignore scanner properties with null values

2 files changed, 34 insertions, 8 deletions

diff --git a/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/bootstrap/BootstrapMediumIT.java b/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/bootstrap/BootstrapMediumIT.java
index ac110567e85..4af42659e6e 100644
--- a/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/bootstrap/BootstrapMediumIT.java
+++ b/sonar-scanner-engine/src/it/java/org/sonar/scanner/mediumtest/bootstrap/BootstrapMediumIT.java
@@ -126,15 +126,31 @@ class BootstrapMediumIT {
     ScannerMain.run(new ByteArrayInputStream("""
       {"scannerProperties": [{"value": "aValueWithoutKey"}]}""".getBytes()));
 
-    assertThat(logTester.logs(Level.WARN)).contains("Ignoring property with null key: 'aValueWithoutKey'");
+    assertThat(logTester.logs(Level.WARN)).contains("Ignoring property with null key. Value='aValueWithoutKey'");
+  }
+
+  @Test
+  void should_warn_if_null_property_value() {
+    ScannerMain.run(new ByteArrayInputStream("""
+      {"scannerProperties": [{"key": "aKey", "value": null}]}""".getBytes()));
+
+    assertThat(logTester.logs(Level.WARN)).contains("Ignoring property with null value. Key='aKey'");
+  }
+
+  @Test
+  void should_warn_if_not_provided_property_value() {
+    ScannerMain.run(new ByteArrayInputStream("""
+      {"scannerProperties": [{"key": "aKey"}]}""".getBytes()));
+
+    assertThat(logTester.logs(Level.WARN)).contains("Ignoring property with null value. Key='aKey'");
   }
 
   @Test
   void should_warn_if_duplicate_property_keys() {
     ScannerMain.run(new ByteArrayInputStream("""
-      {"scannerProperties": [{"key": "aKey"}, {"key": "aKey"}]}""".getBytes()));
+      {"scannerProperties": [{"key": "aKey", "value": "aValue"}, {"key": "aKey", "value": "aValue"}]}""".getBytes()));
 
-    assertThat(logTester.logs(Level.WARN)).contains("Duplicated properties with key: 'aKey'");
+    assertThat(logTester.logs(Level.WARN)).contains("Duplicated properties. Key='aKey'");
   }
 
   @Test
@@ -142,7 +158,15 @@ class BootstrapMediumIT {
     ScannerMain.run(new ByteArrayInputStream("""
       {"scannerProperties": [{"key": "aKey", "value": "aValue"},]}""".getBytes()));
 
-    assertThat(logTester.logs(Level.WARN)).contains("Ignoring null property");
+    assertThat(logTester.logs(Level.WARN)).contains("Ignoring null or empty property");
+  }
+
+  @Test
+  void should_warn_if_empty_property() {
+    ScannerMain.run(new ByteArrayInputStream("""
+      {"scannerProperties": [{}]}""".getBytes()));
+
+    assertThat(logTester.logs(Level.WARN)).contains("Ignoring null or empty property");
   }
 
   /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerMain.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerMain.java
index 887844a1756..3ef1de25629 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerMain.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerMain.java
@@ -118,13 +118,15 @@ public class ScannerMain {
     var input = parseJsonInput(in);
     if (input != null && input.scannerProperties != null) {
       input.scannerProperties.forEach(prop -> {
-        if (prop == null) {
-          LOG.warn("Ignoring null property");
+        if (prop == null || (prop.key == null && prop.value == null)) {
+          LOG.warn("Ignoring null or empty property");
         } else if (prop.key == null) {
-          LOG.warn("Ignoring property with null key: '{}'", prop.value);
+          LOG.warn("Ignoring property with null key. Value='{}'", prop.value);
+        } else if (prop.value == null) {
+          LOG.warn("Ignoring property with null value. Key='{}'", prop.key);
         } else {
           if (properties.containsKey(prop.key)) {
-            LOG.warn("Duplicated properties with key: '{}'", prop.key);
+            LOG.warn("Duplicated properties. Key='{}'", prop.key);
           }
           properties.put(prop.key, prop.value);
         }