From 7644f5bebaf19dc7beff9d4b81d1eee0c032aa29 Mon Sep 17 00:00:00 2001 From: Kenny Bastani Date: Tue, 3 Jan 2017 13:59:24 -0500 Subject: [PATCH] Fixing build --- .../src/main/java/demo/account/action/ConfirmAccount.java | 2 ++ .../src/main/java/demo/account/action/SuspendAccount.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/account/account-web/src/main/java/demo/account/action/ConfirmAccount.java b/account/account-web/src/main/java/demo/account/action/ConfirmAccount.java index 02de295..56cc71d 100644 --- a/account/account-web/src/main/java/demo/account/action/ConfirmAccount.java +++ b/account/account-web/src/main/java/demo/account/action/ConfirmAccount.java @@ -12,6 +12,7 @@ import org.springframework.util.Assert; import java.util.function.Consumer; +import static demo.account.domain.AccountStatus.ACCOUNT_CONFIRMED; import static demo.account.domain.AccountStatus.ACCOUNT_PENDING; /** @@ -24,6 +25,7 @@ public class ConfirmAccount extends Action { public Consumer getConsumer() { return (account) -> { + Assert.isTrue(account.getStatus() != ACCOUNT_CONFIRMED, "The account has already been confirmed"); Assert.isTrue(account.getStatus() == ACCOUNT_PENDING, "The account has already been confirmed"); AccountService accountService = account.getModule(AccountModule.class) diff --git a/account/account-web/src/main/java/demo/account/action/SuspendAccount.java b/account/account-web/src/main/java/demo/account/action/SuspendAccount.java index c4d7c39..d70ef08 100644 --- a/account/account-web/src/main/java/demo/account/action/SuspendAccount.java +++ b/account/account-web/src/main/java/demo/account/action/SuspendAccount.java @@ -25,7 +25,7 @@ public class SuspendAccount extends Action { public Consumer getConsumer() { return (account) -> { - Assert.isTrue(account.getStatus() == ACCOUNT_SUSPENDED, "The account is already suspended"); + Assert.isTrue(account.getStatus() != ACCOUNT_SUSPENDED, "The account is already suspended"); Assert.isTrue(account.getStatus() == ACCOUNT_ACTIVE, "An inactive account cannot be suspended"); AccountService accountService = account.getModule(AccountModule.class)