diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2017-10-19 15:06:38 +0200 |
|---|---|---|
| committer | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2017-10-23 08:01:13 -0700 |
| commit | 649fa6f74e2bcf36e98ceba4758ac5736ee20569 (patch) | |
| tree | bc260433f1114b55af0ba48d4abbcb9f7e96911e /server/sonar-server/src/main/java/org/sonar | |
| parent | 88bccc2a748c04602940dd41c9c8fbe09dacbc7c (diff) | |
| download | sonarqube-649fa6f74e2bcf36e98ceba4758ac5736ee20569.tar.gz sonarqube-649fa6f74e2bcf36e98ceba4758ac5736ee20569.zip | |
SONAR-9996 Minor improvements uninstall of edition
Diffstat (limited to 'server/sonar-server/src/main/java/org/sonar')
| -rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/edition/ws/UninstallAction.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/edition/ws/UninstallAction.java b/server/sonar-server/src/main/java/org/sonar/server/edition/ws/UninstallAction.java index 67c1d269616..64df2f3229a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/edition/ws/UninstallAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/edition/ws/UninstallAction.java @@ -22,12 +22,15 @@ package org.sonar.server.edition.ws; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.server.edition.EditionManagementState; +import org.sonar.server.edition.EditionManagementState.PendingStatus; import org.sonar.server.edition.MutableEditionManagementState; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.plugins.edition.EditionInstaller; import org.sonar.server.user.UserSession; +import static org.sonar.server.edition.EditionManagementState.PendingStatus.NONE; +import static org.sonar.server.edition.EditionManagementState.PendingStatus.UNINSTALL_IN_PROGRESS; + public class UninstallAction implements EditionsWsAction { private final UserSession userSession; private final MutableEditionManagementState mutableEditionManagementState; @@ -51,9 +54,8 @@ public class UninstallAction implements EditionsWsAction { @Override public void handle(Request request, Response response) throws Exception { userSession.checkLoggedIn().checkIsSystemAdministrator(); - - if (mutableEditionManagementState.getPendingInstallationStatus() != EditionManagementState.PendingStatus.NONE - && mutableEditionManagementState.getPendingInstallationStatus() != EditionManagementState.PendingStatus.UNINSTALL_IN_PROGRESS) { + PendingStatus status = mutableEditionManagementState.getPendingInstallationStatus(); + if (status != NONE && status != UNINSTALL_IN_PROGRESS) { throw BadRequestException.create("Uninstall of the current edition is not allowed when install of an edition is in progress"); } |