SONAR-10040 add length validation to Events ws

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 278ca7e6e6288ec42c9880efac9bddb5c5246101..abca7386d8a23ae2ce7b06315d65496b5cafdeba 100644 (file)
--- 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 7c8b7fb633ad9b40f903c805058d55dc3042c13f..0fd7c05bfa6096dffbc32ae0ae333fd14bcf9a61 100644 (file)
--- 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 488d39d6d5fb2293fadaabf2a2a65333648496e5..e065f851b42f0aeb12bbc3103dd605875d995d3e 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
@@ -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");
   }