opendev/gerrit
Code Issues Proposed changes

Merge "SetHashtagsOp: Fail with 405 Method Not Allowed if NoteDb is disabled"

Browse Source
This commit is contained in:
ekempin
2016-10-13 14:09:51 +00:00
committed by Gerrit Code Review
parent 1da3cd1e13 25358fefc5
commit e02473bf8b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/change/SetHashtagsOp.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.ChangeMessage; import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.server.ChangeMessagesUtil; import com.google.gerrit.server.ChangeMessagesUtil;
@@ -85,9 +86,11 @@ public class SetHashtagsOp extends BatchUpdate.Op {
@Override @Override
public boolean updateChange(ChangeContext ctx) public boolean updateChange(ChangeContext ctx)
throws AuthException, BadRequestException, OrmException, IOException { throws AuthException, BadRequestException, MethodNotAllowedException,
OrmException, IOException {
if (!notesMigration.readChanges()) { if (!notesMigration.readChanges()) {
throw new BadRequestException("Cannot add hashtags; NoteDb is disabled"); throw new MethodNotAllowedException(
"Cannot add hashtags; NoteDb is disabled");
} }
if (input == null if (input == null
|| (input.add == null && input.remove == null)) { || (input.add == null && input.remove == null)) {