address review comments for entitlements - nulls etc
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a869ea29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a869ea29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a869ea29 Branch: refs/heads/master Commit: a869ea29af09cf889ce36bcc78e4902898bd5474 Parents: 898aa73 Author: Alex Heneveld <[email protected]> Authored: Tue Jan 20 12:28:30 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Jan 20 12:28:30 2015 +0000 ---------------------------------------------------------------------- .../management/entitlement/PerUserEntitlementManager.java | 2 +- .../management/entitlement/AcmeEntitlementManagerTest.java | 4 ++-- .../entitlement/PerUserEntitlementManagerPropertiesTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a869ea29/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java index 5ca0e58..337ffe0 100644 --- a/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java +++ b/core/src/main/java/brooklyn/management/entitlement/PerUserEntitlementManager.java @@ -78,7 +78,7 @@ public class PerUserEntitlementManager implements EntitlementManager { } public void addUser(String user, EntitlementManager managerForThisUser) { - perUserManagers.put(user, managerForThisUser); + perUserManagers.put(Preconditions.checkNotNull(user, "user"), Preconditions.checkNotNull(managerForThisUser, "managerForThisUser")); } @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a869ea29/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java index 7a34351..1927f4d 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java @@ -32,8 +32,8 @@ public class AcmeEntitlementManagerTest extends AcmeEntitlementManagerTestFixtur } @Test - public void testAnonUserHasAllPermissions() { - checkUserHasAllPermissions("anon"); + public void testOtherAuthorizedUserHasAllPermissions() { + checkUserHasAllPermissions("other"); } @Test http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a869ea29/core/src/test/java/brooklyn/management/entitlement/PerUserEntitlementManagerPropertiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/PerUserEntitlementManagerPropertiesTest.java b/core/src/test/java/brooklyn/management/entitlement/PerUserEntitlementManagerPropertiesTest.java index 63e2f62..b583c08 100644 --- a/core/src/test/java/brooklyn/management/entitlement/PerUserEntitlementManagerPropertiesTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/PerUserEntitlementManagerPropertiesTest.java @@ -38,8 +38,8 @@ public class PerUserEntitlementManagerPropertiesTest extends AcmeEntitlementMana } @Test - public void testAnonUserHasMinimalPermissions() { - checkUserHasMinimalPermissions("anon"); + public void testOtherAuthorizedUserHasMinimalPermissions() { + checkUserHasMinimalPermissions("other"); } @Test
