SONAR-10842 api/project_analyses/update_event fails with NPE when name parameter...

diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java
index aae70d2d50d06d6417291f736c2ee807fc1d6f14..e80d8e6261fcacaea0f78856471970b095b2377b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/UpdateEventAction.java
@@ -86,7 +86,8 @@ public class UpdateEventAction implements ProjectAnalysesWsAction {
     action.createParam(PARAM_NAME)
       .setMaximumLength(org.sonar.db.event.EventValidator.MAX_NAME_LENGTH)
       .setDescription("New name")
-      .setExampleValue("5.6");
+      .setExampleValue("5.6")
+      .setRequired(true);
   }
 
   @Override

diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java
index bee0202f780808b9af40fbcde553625a1c65488e..877e3db325c7190b4e9ae7b43b303e62489c5851 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/UpdateEventActionTest.java
@@ -156,6 +156,7 @@ public class UpdateEventActionTest {
     assertThat(definition.isPost()).isTrue();
     assertThat(definition.since()).isEqualTo("6.3");
     assertThat(definition.param(PARAM_EVENT).isRequired()).isTrue();
+    assertThat(definition.param(PARAM_NAME).isRequired()).isTrue();
   }
 
   @Test
@@ -185,8 +186,8 @@ public class UpdateEventActionTest {
     SnapshotDto analysis = createAnalysisAndLogInAsProjectAdministrator("5.6");
     db.events().insertEvent(newEvent(analysis).setUuid("E1"));
 
-    expectedException.expect(NullPointerException.class);
-
+    expectedException.expect(IllegalArgumentException.class);
+    expectedException.expectMessage("The 'name' parameter is missing");
     call("E1", null);
   }