#1734 Minor code layout improvements.

fieldenms · Dec 2, 2021 · 9006a77 · 9006a77
1 parent 121d149
commit 9006a77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.../main/java/ua/com/fielden/platform/menu/validators/UserAsConfigurationOwnerValidator.java b/.../main/java/ua/com/fielden/platform/menu/validators/UserAsConfigurationOwnerValidator.java
@@ -1,6 +1,8 @@
 package ua.com.fielden.platform.menu.validators;
 
 import static java.lang.String.format;
+import static ua.com.fielden.platform.error.Result.failure;
+import static ua.com.fielden.platform.error.Result.successful;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
@@ -23,7 +25,7 @@ public class UserAsConfigurationOwnerValidator implements IBeforeChangeEventHand
 
     @Override
     public Result handle(final MetaProperty<User> property, final User newValue, final Set<Annotation> mutatorAnnotations) {
-        return newValue.isBase() ? Result.failure(format(ERR_USER_IS_A_BASE_USER, newValue)) : Result.successful(newValue);
+        return newValue.isBase() ? failure(format(ERR_USER_IS_A_BASE_USER, newValue)) : successful(newValue);
     }
 
 }
diff --git a/platform-pojo-bl/src/main/java/ua/com/fielden/platform/security/user/IUser.java b/platform-pojo-bl/src/main/java/ua/com/fielden/platform/security/user/IUser.java
@@ -25,6 +25,10 @@
  */
 public interface IUser extends IEntityDao<User> {
 
+    static final IFetchProvider<User> FETCH_PROVIDER = EntityUtils.fetch(User.class)
+            .with("key", EMAIL, ACTIVE)
+            .with("base", "basedOnUser.base", "roles");
+
     /**
      * Returns users with roles.
      *
@@ -139,15 +143,11 @@ public interface IUser extends IEntityDao<User> {
     User findUser(String username);
 
     /**
-     * Returns all active based-on users
+     * Returns all active based-on users.
      *
      * @param baseUser
      * @return
      */
     Set<User> findBasedOnUsers(final User baseUser, final fetch<User> userFetch);
 
-    static final IFetchProvider<User> FETCH_PROVIDER = EntityUtils.fetch(User.class)
-            .with("key", EMAIL, ACTIVE)
-            .with("base", "basedOnUser.base", "roles");
-
 }