Revize 317b7363

re #37 naming improvements

server/src/main/java/org/danekja/ymanager/business/UserManager.java

@@ -26 +26 @@
     /**
      * Gets user by id (PK)
      *
-     * @param id id value, used as search key
+     * @param userId id value, used as search key
      * @return found user Object or null
      */
-    User getUser(Long id);
+    User getUser(Long userId);
 }

server/src/main/java/org/danekja/ymanager/business/auth/AuthExpressions.java

@@ -14 +14 @@
      * <li>data owner - employee can edit only his records</li>
      * </ul>
      * <p>
-     * In this case, the protected method needs to take <b>id</b> parameter which represents the "userId" value and
+     * In this case, the protected method needs to take <b>userId</b> parameter which represents the "userId" value and
      * is compared to principal id.
      */
-    public static final String SELF_ONLY_ID_PARAM = "hasAuthority('EMPLOYER') or #id == authentication.principal.id";
+    public static final String MASTER_SELF_ID_PARAM = "hasAuthority('EMPLOYER') or #userId == authentication.principal.id";
 }

server/src/main/java/org/danekja/ymanager/business/impl/DefaultUserManager.java

@@ -42 +42 @@
     }
 
     @Override
-    @PreAuthorize(AuthExpressions.SELF_ONLY_ID_PARAM)
-    public User getUser(Long id) {
-        return userRepository.getUser(id);
+    @PreAuthorize(AuthExpressions.MASTER_SELF_ID_PARAM)
+    public User getUser(Long userId) {
+        return userRepository.getUser(userId);
     }
 
     @Override