Do not use Apache commons in sonar-ws - fix build

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 ebb196c6459edaf524ea3bbbe1edf4e2f8fc302f..078ca3cf5a513c4bf96bbf9fca81bc4f3c9de7c1 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
@@ -47,6 +47,7 @@ import org.sonarqube.ws.client.projectanalysis.EventCategory;
 import static com.google.common.base.Preconditions.checkArgument;
 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.server.ws.WsUtils.writeProtobuf;
 import static org.sonarqube.ws.client.projectanalysis.EventCategory.OTHER;
@@ -152,6 +153,7 @@ public class CreateEventAction implements ProjectAnalysesWsAction {
   }
 
   private EventDto toDbEvent(CreateEventRequest request, SnapshotDto analysis) {
+    checkArgument(isNotBlank(request.getName()), "A non empty name is required");
     return new EventDto()
       .setUuid(uuidFactory.create())
       .setAnalysisUuid(analysis.getUuid())

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 ca265096df4350265f5caa117466495e5880a0a6..29c92fa9e188f555956d9d5f8b55a20384ba8c49 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
@@ -41,7 +41,9 @@ import org.sonarqube.ws.ProjectAnalyses.UpdateEventResponse;
 import org.sonarqube.ws.client.projectanalysis.EventCategory;
 import org.sonarqube.ws.client.projectanalysis.UpdateEventRequest;
 
+import static com.google.common.base.Preconditions.checkArgument;
 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.server.projectanalysis.ws.EventValidator.checkModifiable;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
@@ -121,6 +123,7 @@ public class UpdateEventAction implements ProjectAnalysesWsAction {
   }
 
   private EventDto getDbEvent(DbSession dbSession, UpdateEventRequest request) {
+    checkArgument(isNotBlank(request.getName()), "A non empty name is required");
     return dbClient.eventDao().selectByUuid(dbSession, request.getEvent())
       .orElseThrow(() -> new NotFoundException(format("Event '%s' not found", request.getEvent())));
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java
index 3a89c856ce35e2da6e6e815ed8b81f2eed68e43d..cd80ae1abcddd7c5be31607c646f01e084bf3e69 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/projectanalysis/ws/CreateEventActionTest.java
@@ -213,6 +213,17 @@ public class CreateEventActionTest {
     assertThat(events).hasSize(2);
   }
 
+  @Test
+  public void fail_if_not_blank_name() {
+    SnapshotDto analysis = db.components().insertProjectAndSnapshot(newProjectDto());
+    CreateEventRequest.Builder request = CreateEventRequest.builder().setAnalysis(analysis.getUuid()).setName("    ");
+
+    expectedException.expect(IllegalArgumentException.class);
+    expectedException.expectMessage("A non empty name is required");
+
+    call(request);
+  }
+
   @Test
   public void fail_if_analysis_is_not_found() {
     expectedException.expect(NotFoundException.class);

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 851790d2b801189f36ba2bc458439c327126fd35..e15948f4a51d61b0bc9656e726604216cdada71e 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
@@ -205,6 +205,17 @@ public class UpdateEventActionTest {
     call("E1", null);
   }
 
+  @Test
+  public void fail_if_blank_name() {
+    SnapshotDto analysis = db.components().insertProjectAndSnapshot(newProjectDto());
+    db.events().insertEvent(newEvent(analysis).setUuid("E1"));
+
+    expectedException.expect(IllegalArgumentException.class);
+    expectedException.expectMessage("A non empty name is required");
+
+    call("E1", "     ");
+  }
+
   @Test
   public void fail_if_category_other_than_other_or_version() {
     SnapshotDto analysis = db.components().insertProjectAndSnapshot(newProjectDto());

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequest.java
index 0892fed031012813d677390827dd2fb8b722c38a..6403895c019ee14b197d194c8193c73bbb3b92f4 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequest.java
@@ -21,7 +21,6 @@
 package org.sonarqube.ws.client.projectanalysis;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 public class CreateEventRequest {
   private final String analysis;
@@ -78,10 +77,8 @@ public class CreateEventRequest {
       checkArgument(analysis != null, "Analysis key is required");
       checkArgument(category != null, "Category is required");
       checkArgument(name != null, "Name is required");
-      checkArgument(isNotBlank(name), "A non empty name is required");
 
       return new CreateEventRequest(this);
     }
   }
-
 }

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequest.java
index 59e852a0a08a6a9c55427bcb0af447ce0b2df344..ed9e6481ac8ffaa5b46d027d73ae20a09b9829c2 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequest.java
@@ -22,19 +22,15 @@ package org.sonarqube.ws.client.projectanalysis;
 
 import javax.annotation.CheckForNull;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 public class UpdateEventRequest {
   private final String event;
   private final String name;
 
   public UpdateEventRequest(String event, String name) {
-    requireNonNull(name, "Name is required");
-    checkArgument(isNotBlank(name), "A non empty name is required");
     this.event = requireNonNull(event, "Event key is required");
-    this.name = name;
+    this.name = requireNonNull(name, "Name is required");;
   }
 
   public String getEvent() {

diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequestTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequestTest.java
index 9568c0850f134b78a5677b3369591bd6c24a0416..1daaaecaf955c33d1f0e9cd13e72d2044c043c8f 100644 (file)
--- a/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequestTest.java
+++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/CreateEventRequestTest.java
@@ -74,12 +74,4 @@ public class CreateEventRequestTest {
 
     underTest.setAnalysis("P1").setCategory(VERSION).build();
   }
-
-  @Test
-  public void fail_when_blank_name() {
-    expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("A non empty name is required");
-
-    underTest.setAnalysis("P1").setName("   ").setCategory(VERSION).build();
-  }
 }

diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequestTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequestTest.java
index f2dbf27c716dde2166c57b37ca82295f76fc53ba..3b54585dcc4e1f10abd6aa13060d44fe7d03f206 100644 (file)
--- a/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequestTest.java
+++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/projectanalysis/UpdateEventRequestTest.java
@@ -63,12 +63,4 @@ public class UpdateEventRequestTest {
 
     new UpdateEventRequest("E1", null);
   }
-
-  @Test
-  public void fail_if_name_blank() {
-    expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("A non empty name is required");
-
-    new UpdateEventRequest("E1", "    ");
-  }
 }