From 4ce3f21921ceda09e54d4c43e7b09169ab375df9 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Thu, 7 Jun 2018 11:37:12 +0200 Subject: [PATCH] SONAR-10842 api/project_analyses/update_event fails with NPE when name parameter is not specified --- .../sonar/server/projectanalysis/ws/UpdateEventAction.java | 3 ++- .../server/projectanalysis/ws/UpdateEventActionTest.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 aae70d2d50d..e80d8e6261f 100644 --- 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 bee0202f780..877e3db325c 100644 --- 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); } -- 2.39.5