Fixed Issue With Permission Manager Test

Updated Dependencies
Fixed Other Small Issues

Signed-off-by: Joshua Gager <jlgager@jgcomptech.com>

Author: jlgager24

pom.xml

@@ -161,7 +161,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>auto-clean</id>
@@ -302,13 +302,13 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>4.5.2</version>
+            <version>5.0.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>4.5.2</version>
+            <version>5.0.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>

src/main/java/com/jgcomptech/tools/authc/AuthManager.java

@@ -664,7 +664,7 @@ public boolean getUserVerification(final boolean retryLoginOnFailure) {
      * Returns a list of the current existing roles.
      * @return a list of the current existing roles
      */
-    public HashMap<String, UserRole> getRoles() { return userRoleManager.getUserRoles(); }
+    public Map<String, UserRole> getRoles() { return userRoleManager.getUserRoles(); }
 
     /**
      * Returns the specified role.

src/main/java/com/jgcomptech/tools/authc/UserRoleManager.java

@@ -2,9 +2,7 @@
 
 import com.jgcomptech.tools.authz.PermissionManager;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,10 +38,10 @@ private UserRoleManager() {
         SystemUserRoles.BASIC.getRole().modify().add(Read);
 
         addExistingUserRole(SystemUserRoles.ADMIN.getRole());
-        addExistingUserRole(SystemUserRoles.EDITOR.role);
-        addExistingUserRole(SystemUserRoles.AUTHOR.role);
-        addExistingUserRole(SystemUserRoles.BASIC.role);
-        addExistingUserRole(SystemUserRoles.NONE.role);
+        addExistingUserRole(SystemUserRoles.EDITOR.getRole());
+        addExistingUserRole(SystemUserRoles.AUTHOR.getRole());
+        addExistingUserRole(SystemUserRoles.BASIC.getRole());
+        addExistingUserRole(SystemUserRoles.NONE.getRole());
     }
 
     /** A List of the implemented system user roles. */
@@ -109,7 +107,7 @@ public void addExistingUserRole(final UserRole role) {
      * Returns a list of the current existing user roles.
      * @return a list of the current existing user roles
      */
-    public HashMap<String, UserRole> getUserRoles() { return userRoles; }
+    public Map<String, UserRole> getUserRoles() { return Collections.unmodifiableMap(userRoles); }
 
     /**
      * Returns the specified user role.

src/main/java/com/jgcomptech/tools/authz/PermissionManager.java

@@ -7,10 +7,7 @@
 import com.jgcomptech.tools.events.EventTarget;
 import com.jgcomptech.tools.events.PermissionEvent;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -38,10 +35,10 @@ public static synchronized PermissionManager getInstance() {
         if(instance == null) {
             instance = new PermissionManager();
             instance.permissions = new HashMap<>();
-            instance.addCustomPermission(SystemPermissions.Admin.name, null);
-            instance.addCustomPermission(SystemPermissions.Edit.name, null);
-            instance.addCustomPermission(SystemPermissions.Create.name, null);
-            instance.addCustomPermission(SystemPermissions.Read.name, null);
+            instance.addCustomPermission(SystemPermissions.Admin.getName(), null);
+            instance.addCustomPermission(SystemPermissions.Edit.getName(), null);
+            instance.addCustomPermission(SystemPermissions.Create.getName(), null);
+            instance.addCustomPermission(SystemPermissions.Read.getName(), null);
 
             try {
                 instance.eventPermissionsApplied =
@@ -162,76 +159,76 @@ public void disableDebugLogging() {
      * Returns true if Admin permission is enabled.
      * @return true if Admin permission is enabled
      */
-    public boolean isAdminPermissionEnabled() { return permissions.get(SystemPermissions.Admin.name).isEnabled(); }
+    public boolean isAdminPermissionEnabled() { return permissions.get(SystemPermissions.Admin.getName()).isEnabled(); }
     /**
      * Returns true if Edit permission is enabled.
      * @return true if Edit permission is enabled
      */
-    public boolean isEditPermissionEnabled() { return permissions.get(SystemPermissions.Edit.name).isEnabled(); }
+    public boolean isEditPermissionEnabled() { return permissions.get(SystemPermissions.Edit.getName()).isEnabled(); }
     /**
      * Returns true if Create permission is enabled.
      * @return true if Create permission is enabled
      */
-    public boolean isCreatePermissionEnabled() { return permissions.get(SystemPermissions.Create.name).isEnabled(); }
+    public boolean isCreatePermissionEnabled() { return permissions.get(SystemPermissions.Create.getName()).isEnabled(); }
     /**
      * Returns true if Read permission is enabled.
      * @return true if Read permission is enabled
      */
-    public boolean isReadPermissionEnabled() { return permissions.get(SystemPermissions.Read.name).isEnabled(); }
+    public boolean isReadPermissionEnabled() { return permissions.get(SystemPermissions.Read.getName()).isEnabled(); }
 
     /**
      * Manually sets the status of the Admin permission.
      * @param value the value to set
      */
     public void setAdminPermission(final boolean value) {
-        permissions.get(SystemPermissions.Admin.name).setEnabled(value); }
+        permissions.get(SystemPermissions.Admin.getName()).setEnabled(value); }
     /**
      * Manually sets the status of the Edit permission.
      * @param value the value to set
      */
     public void setEditPermission(final boolean value) {
-        permissions.get(SystemPermissions.Edit.name).setEnabled(value); }
+        permissions.get(SystemPermissions.Edit.getName()).setEnabled(value); }
     /**
      * Manually sets the status of the Create permission.
      * @param value the value to set
      */
     public void setCreatePermission(final boolean value) {
-        permissions.get(SystemPermissions.Create.name).setEnabled(value); }
+        permissions.get(SystemPermissions.Create.getName()).setEnabled(value); }
     /**
      * Manually sets the status of the Read permission.
      * @param value the value to set
      */
     public void setReadPermission(final boolean value) {
-        permissions.get(SystemPermissions.Read.name).setEnabled(value); }
+        permissions.get(SystemPermissions.Read.getName()).setEnabled(value); }
 
     /**
      * Returns the Admin permission.
      * @return the permission object
      */
-    public Permission getAdminPermission() { return permissions.get(SystemPermissions.Admin.name); }
+    public Permission getAdminPermission() { return permissions.get(SystemPermissions.Admin.getName()); }
     /**
      * Returns the Edit permission.
      * @return the permission object
      */
-    public Permission getEditPermission() { return permissions.get(SystemPermissions.Edit.name); }
+    public Permission getEditPermission() { return permissions.get(SystemPermissions.Edit.getName()); }
     /**
      * Returns the Create permission.
      * @return the permission object
      */
-    public Permission getCreatePermission() { return permissions.get(SystemPermissions.Create.name); }
+    public Permission getCreatePermission() { return permissions.get(SystemPermissions.Create.getName()); }
     /**
      * Returns the Read permission.
      * @return the permission object
      */
-    public Permission getReadPermission() { return permissions.get(SystemPermissions.Read.name); }
+    public Permission getReadPermission() { return permissions.get(SystemPermissions.Read.getName()); }
 
     //endregion System Permissions
 
     /**
      * Returns a HashMap of all existing permission objects.
      * @return a HashMap of all existing permission objects
      */
-    public HashMap<String, Permission> getPermissions() { return permissions; }
+    public Map<String, Permission> getPermissions() { return permissions; }
 
     /**
      * Returns a list of names of existing permissions.
@@ -450,10 +447,7 @@ public void loadPermissions(final boolean enableAll) {
      * @since 1.5.0 now uses a parallel stream allowing a large list of permissions
      */
     public void loadPermissions(final UserRole userRole) {
-        getAdminPermission().disable();
-        getEditPermission().disable();
-        getCreatePermission().disable();
-        getReadPermission().disable();
+        permissions.values().parallelStream().forEach(Permission::disable);
         userRole.getPermissions().parallelStream().forEach(this::enablePermission);
         eventPermissionsApplied.fireEvent(this, userRole);
     }

src/test/java/com/jgcomptech/tools/authz/PermissionManagerTest.java

@@ -58,31 +58,31 @@ public void testPermissionManager() {
         assertTrue(manager.isCreatePermissionEnabled());
         assertTrue(manager.isReadPermissionEnabled());
 
-        manager.loadPermissions(UserRoleManager.SystemUserRoles.NONE);
-        assertFalse(manager.isAdminPermissionEnabled());
-        assertFalse(manager.isEditPermissionEnabled());
-        assertFalse(manager.isCreatePermissionEnabled());
-        assertFalse(manager.isReadPermissionEnabled());
         manager.loadPermissions(UserRoleManager.SystemUserRoles.ADMIN);
-        assertTrue(manager.isAdminPermissionEnabled());
-        assertTrue(manager.isEditPermissionEnabled());
-        assertTrue(manager.isCreatePermissionEnabled());
         assertTrue(manager.isReadPermissionEnabled());
-        manager.loadPermissions(UserRoleManager.SystemUserRoles.EDITOR);
-        assertFalse(manager.isAdminPermissionEnabled());
-        assertTrue(manager.isEditPermissionEnabled());
         assertTrue(manager.isCreatePermissionEnabled());
+        assertTrue(manager.isEditPermissionEnabled());
+        assertTrue(manager.isAdminPermissionEnabled());
+        manager.loadPermissions(UserRoleManager.SystemUserRoles.EDITOR);
         assertTrue(manager.isReadPermissionEnabled());
-        manager.loadPermissions(UserRoleManager.SystemUserRoles.AUTHOR);
-        assertFalse(manager.isAdminPermissionEnabled());
-        assertFalse(manager.isEditPermissionEnabled());
         assertTrue(manager.isCreatePermissionEnabled());
+        assertTrue(manager.isEditPermissionEnabled());
+        assertFalse(manager.isAdminPermissionEnabled());
+        manager.loadPermissions(UserRoleManager.SystemUserRoles.AUTHOR);
         assertTrue(manager.isReadPermissionEnabled());
-        manager.loadPermissions(UserRoleManager.SystemUserRoles.BASIC);
+        assertTrue(manager.isCreatePermissionEnabled());
+        assertFalse(manager.isEditPermissionEnabled());
         assertFalse(manager.isAdminPermissionEnabled());
+        manager.loadPermissions(UserRoleManager.SystemUserRoles.BASIC);
+        assertTrue(manager.isReadPermissionEnabled());
+        assertFalse(manager.isCreatePermissionEnabled());
         assertFalse(manager.isEditPermissionEnabled());
+        assertFalse(manager.isAdminPermissionEnabled());
+        manager.loadPermissions(UserRoleManager.SystemUserRoles.NONE);
+        assertFalse(manager.isReadPermissionEnabled());
         assertFalse(manager.isCreatePermissionEnabled());
-        assertTrue(manager.isReadPermissionEnabled());
+        assertFalse(manager.isEditPermissionEnabled());
+        assertFalse(manager.isAdminPermissionEnabled());
 
         assertEquals(4, manager.getPermissionsNames().size());