2 files changed, 6 insertions, 6 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
index 7d677cbbe82..1432fddeab4 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
@@ -556,11 +556,9 @@ public class InternalRubyIssueService implements ServerComponent {
   /**
    * Execute a bulk change
    */
-  public Result<IssueBulkChangeResult> bulkChange(Map<String, Object> props, String comment) {
-    Result<IssueBulkChangeResult> result = Result.of();
+  public IssueBulkChangeResult bulkChange(Map<String, Object> props, String comment) {
     IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(props, comment);
-    result.set(issueBulkChangeService.execute(issueBulkChangeQuery, UserSession.get()));
-    return result;
+    return issueBulkChangeService.execute(issueBulkChangeQuery, UserSession.get());
   }
 
   private void checkMandatoryParameter(String value, String paramName, Result result) {
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java
index 4654e23ae2f..172f6f34b74 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java
@@ -26,9 +26,11 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Iterables;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.util.RubyUtils;
 
 import javax.annotation.Nullable;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -59,11 +61,11 @@ public class IssueBulkChangeQuery {
   private void parse(Map<String, Object> props, String comment) {
     this.issues = sanitizeList(RubyUtils.toStrings(props.get("issues")));
     if (issues == null || issues.isEmpty()) {
-      throw new IllegalArgumentException("Issues must not be empty");
+      throw BadRequestException.ofL10n("issue_bulk_change.error.empty_issues");
     }
     actions = sanitizeList(RubyUtils.toStrings(props.get("actions")));
     if (actions == null || actions.isEmpty()) {
-      throw new IllegalArgumentException("At least one action must be provided");
+      throw BadRequestException.ofL10n("issue_bulk_change.error.need_one_action");
     }
     for (String action : actions) {
       Map<String, Object> actionProperties = getActionProps(action, props);