From f5236b57918963ce3def034abdda2b0fe35ddb02 Mon Sep 17 00:00:00 2001 From: Guillaume Jambet Date: Thu, 2 Nov 2017 16:55:49 +0100 Subject: [PATCH] SONAR-10040 add length validation to Events ws --- .../src/main/java/org/sonar/db/event/EventValidator.java | 4 ++-- .../sonar/server/projectanalysis/ws/CreateEventAction.java | 6 ++++-- .../sonar/server/projectanalysis/ws/UpdateEventAction.java | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventValidator.java b/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventValidator.java index 278ca7e6e62..abca7386d8a 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventValidator.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/event/EventValidator.java @@ -24,8 +24,8 @@ import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkArgument; -class EventValidator { - private static final int MAX_NAME_LENGTH = 400; +public class EventValidator { + public static final int MAX_NAME_LENGTH = 400; private static final int MAX_CATEGORY_LENGTH = 50; private static final int MAX_DESCRIPTION_LENGTH = 4000; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java index 7c8b7fb633a..0fd7c05bfa6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/CreateEventAction.java @@ -50,6 +50,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.lang.String.format; import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.sonar.core.util.Protobuf.setNullable; +import static org.sonar.db.event.EventValidator.MAX_NAME_LENGTH; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.projectanalysis.EventCategory.OTHER; import static org.sonarqube.ws.client.projectanalysis.EventCategory.VERSION; @@ -100,9 +101,10 @@ public class CreateEventAction implements ProjectAnalysesWsAction { .setPossibleValues(VERSION, OTHER); action.createParam(PARAM_NAME) + .setRequired(true) + .setMaximumLength(MAX_NAME_LENGTH) .setDescription("Name") - .setExampleValue("5.6") - .setRequired(true); + .setExampleValue("5.6"); } @Override 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 488d39d6d5f..e065f851b42 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 @@ -83,6 +83,7 @@ public class UpdateEventAction implements ProjectAnalysesWsAction { .setRequired(true); action.createParam(PARAM_NAME) + .setMaximumLength(org.sonar.db.event.EventValidator.MAX_NAME_LENGTH) .setDescription("New name") .setExampleValue("5.6"); } -- 2.39.5