r608 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap - Faxtomail-commits

5 Sep 2014

Author: echatellier
Date: 2014-09-05 10:52:42 +0200 (Fri, 05 Sep 2014)
New Revision: 608

Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/608

Log:
Fix mock service to be non random

Modified:
   trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java

Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java
===================================================================

--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java	2014-09-04 10:26:31 UTC (rev 607)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java	2014-09-05 08:52:42 UTC (rev 608)
@@ -43,48 +43,40 @@
  */
 public class LdapServiceMock extends LdapServiceImpl {
 
-    protected FaxToMailUser fakeUser;
-
     protected FaxToMailUser getFakeFaxToMailUser() {
-        if (fakeUser == null) {
-            FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao();
-            FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao();
+        FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao();
+        FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao();
 
-            fakeUser = userDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_TOPIA_ID).findFirstOrNull();
+        FaxToMailUser fakeUser = userDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_TOPIA_ID).findFirstOrNull();
 
-            // create user
-            if (fakeUser == null) {
-                fakeUser = new FaxToMailUserImpl();
-                fakeUser.setTrigraph("fkr");
-                fakeUser.setFirstName("Test ldap");
-                fakeUser.setLastName("Test ldap");
-                fakeUser.setLogin("test");
-                fakeUser = userDao.create(fakeUser);
+        // create user
+        if (fakeUser == null) {
+            fakeUser = new FaxToMailUserImpl();
+            fakeUser.setTrigraph("fkr");
+            fakeUser.setFirstName("Test ldap");
+            fakeUser.setLastName("Test ldap");
+            fakeUser.setLogin("test");
+            fakeUser = userDao.create(fakeUser);
+        }
+        
+        // add user to fake group
+        FaxToMailUserGroup fakeGroup = null;
+        List<String> adminGroups = getApplicationConfig().getLdapAdminGroups();
+        if (CollectionUtils.isNotEmpty(adminGroups)) {
+            fakeGroup = groupDao.forCompleteNameEquals(adminGroups.get(0)).findAnyOrNull();
+            if (fakeGroup == null) {
+                fakeGroup = new FaxToMailUserGroupImpl();
+                fakeGroup.setName("fake group");
+                fakeGroup.setCompleteName(adminGroups.get(0));
+                fakeGroup = groupDao.create(fakeGroup);
             }
             
-            // add user to fake group
-            FaxToMailUserGroup fakeGroup = null;
-            List<String> adminGroups = getApplicationConfig().getLdapAdminGroups();
-            if (CollectionUtils.isNotEmpty(adminGroups)) {
-                fakeGroup = groupDao.forCompleteNameEquals(adminGroups.get(0)).findAnyOrNull();
-                if (fakeGroup == null) {
-                    fakeGroup = new FaxToMailUserGroupImpl();
-                    fakeGroup.setName("fake group");
-                    fakeGroup.setCompleteName(adminGroups.get(0));
-                    fakeGroup = groupDao.create(fakeGroup);
-                }
-                
-                if (!fakeUser.containsUserGroups(fakeGroup)) {
-                    fakeUser.addUserGroups(fakeGroup);
-                }
+            if (!fakeUser.containsUserGroups(fakeGroup)) {
+                fakeUser.addUserGroups(fakeGroup);
             }
-            
-            // force collection loading to force non lazy collections
-            fakeUser.isAffectedFoldersEmpty();
-            fakeUser.isUserGroupsEmpty();
+        }
 
-            getPersistenceContext().commit();
-        }
+        getPersistenceContext().commit();
         return fakeUser;
     }
 
@@ -95,16 +87,29 @@
 
     @Override
     public FaxToMailUser getUserBean(String userTopiaId) {
-        return getFakeFaxToMailUser();
+        FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao();
+        FaxToMailUser result = faxtomailUserDao.forTopiaIdEquals(userTopiaId).findUnique();
+        // force collection loading to force non lazy collections
+        result.isAffectedFoldersEmpty();
+        result.isUserGroupsEmpty();
+        return result;
     }
 
     @Override
     public FaxToMailUser authenticateUser(String login, String password) throws AuthenticationException {
-        return getFakeFaxToMailUser();
+        return getUserFromPrincipal(login);
     }
 
     @Override
     public FaxToMailUser getUserFromPrincipal(String principal) throws AuthenticationException {
-        return getFakeFaxToMailUser();
+        FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao();
+        FaxToMailUser result = faxtomailUserDao.forLoginEquals(principal.toLowerCase()).findUniqueOrNull();
+        if (result == null) {
+            result = getFakeFaxToMailUser();
+        }
+        // force collection loading to force non lazy collections
+        result.isAffectedFoldersEmpty();
+        result.isUserGroupsEmpty();
+        return result;
     }
 }

    

r608 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap

echatellier＠users.forge.codelutin.com

tags

participants (1)