From e3dab98b3ff012054242eebbea523a1091d3b722 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 14 Sep 2014 12:19:34 +0200 Subject: [PATCH] [Minor] code cleanup --- .../privilege/handler/EncryptionHandler.java | 2 +- .../handler/XmlPersistenceHandler.java | 2 +- .../eitchnet/privilege/model/UserState.java | 2 +- .../privilege/model/internal/User.java | 4 ++-- .../privilege/test/PrivilegeTest.java | 21 ++++++++++--------- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/ch/eitchnet/privilege/handler/EncryptionHandler.java b/src/main/java/ch/eitchnet/privilege/handler/EncryptionHandler.java index 186789f4d..59eddcfbe 100644 --- a/src/main/java/ch/eitchnet/privilege/handler/EncryptionHandler.java +++ b/src/main/java/ch/eitchnet/privilege/handler/EncryptionHandler.java @@ -40,7 +40,7 @@ public interface EncryptionHandler { * @return the hash of the string after converting */ public String convertToHash(String string); - + /** * Converts a given byte array, e.g. a password to a hash which is defined by the concrete implementation * diff --git a/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java b/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java index dc21d5b91..fe9745bc5 100644 --- a/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java +++ b/src/main/java/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java @@ -196,7 +196,7 @@ public class XmlPersistenceHandler implements PersistenceHandler { // validate that role exists if (getRole(roleName) == null) { String msg = "Role {0} does not exist referenced by user {1}"; - msg = MessageFormat.format(msg, roleName, user.getUsername()); //$NON-NLS-1$ + msg = MessageFormat.format(msg, roleName, user.getUsername()); throw new PrivilegeException(msg); } } diff --git a/src/main/java/ch/eitchnet/privilege/model/UserState.java b/src/main/java/ch/eitchnet/privilege/model/UserState.java index 4922ff67e..2272002d3 100644 --- a/src/main/java/ch/eitchnet/privilege/model/UserState.java +++ b/src/main/java/ch/eitchnet/privilege/model/UserState.java @@ -48,7 +48,7 @@ public enum UserState { * the user has automatically expired through a predefined time */ EXPIRED, - + /** * This is the System user state which is special and thus exempted from normal uses */ diff --git a/src/main/java/ch/eitchnet/privilege/model/internal/User.java b/src/main/java/ch/eitchnet/privilege/model/internal/User.java index f54ccb630..c81ad1ee8 100644 --- a/src/main/java/ch/eitchnet/privilege/model/internal/User.java +++ b/src/main/java/ch/eitchnet/privilege/model/internal/User.java @@ -78,8 +78,8 @@ public final class User { * @param propertyMap * a {@link Map} containing string value pairs of properties for this user */ - public User(String userId, String username, String password, String firstname, String lastname, UserState userState, - Set roles, Locale locale, Map propertyMap) { + public User(String userId, String username, String password, String firstname, String lastname, + UserState userState, Set roles, Locale locale, Map propertyMap) { if (StringHelper.isEmpty(userId)) { throw new PrivilegeException("No UserId defined!"); //$NON-NLS-1$ diff --git a/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java b/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java index 3968c6e25..25804e155 100644 --- a/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java +++ b/src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java @@ -185,8 +185,8 @@ public class PrivilegeTest { } public void testFailAuthenticationNOk() throws Exception { - exception.expect(AccessDeniedException.class); - exception.expectMessage("blabla"); + this.exception.expect(AccessDeniedException.class); + this.exception.expectMessage("blabla"); try { login(ADMIN, ArraysHelper.copyOf(PASS_BAD)); } finally { @@ -195,8 +195,8 @@ public class PrivilegeTest { } public void testFailAuthenticationPWNull() throws Exception { - exception.expect(PrivilegeException.class); - exception.expectMessage("blabla"); + this.exception.expect(PrivilegeException.class); + this.exception.expectMessage("blabla"); try { login(ADMIN, null); } finally { @@ -250,8 +250,8 @@ public class PrivilegeTest { */ @Test public void testPerformSystemRestrictableFailPrivilege() throws Exception { - exception.expect(PrivilegeException.class); - exception + this.exception.expect(PrivilegeException.class); + this.exception .expectMessage("User system_admin does not have Privilege ch.eitchnet.privilege.test.model.TestSystemUserActionDeny"); try { // create the action to be performed as a system user @@ -269,8 +269,9 @@ public class PrivilegeTest { */ @Test public void testPerformSystemRestrictableFailNoAdditionalPrivilege() throws Exception { - exception.expect(PrivilegeException.class); - exception.expectMessage("User system_admin2 does not have Privilege ch.eitchnet.privilege.test.model.TestRestrictable"); + this.exception.expect(PrivilegeException.class); + this.exception + .expectMessage("User system_admin2 does not have Privilege ch.eitchnet.privilege.test.model.TestRestrictable"); try { // create the action to be performed as a system user TestSystemUserActionDeny action = new TestSystemUserActionDeny(); @@ -287,8 +288,8 @@ public class PrivilegeTest { */ @Test public void testLoginSystemUser() throws Exception { - exception.expect(AccessDeniedException.class); - exception.expectMessage("User system_admin is a system user and may not login!"); + this.exception.expect(AccessDeniedException.class); + this.exception.expectMessage("User system_admin is a system user and may not login!"); try { login(SYSTEM_USER_ADMIN, SYSTEM_USER_ADMIN.getBytes()); } finally {