X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2Fjpa%2FJpaAuthorizationService.java;h=333781c62e19bfa40ce0f2195d302bd870dfce88;hb=1b9acefff0078d6d2a3f061948b36f6721743306;hp=e1b71d7dd177c8a940f8c9119630294871dcfb50;hpb=34484a56d1c00208678a2824c2c9869dbabc444b;p=utils

diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java b/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java
index e1b71d7d..333781c6 100644
--- a/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java
+++ b/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java
@@ -19,14 +19,17 @@ import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
 
+import org.wamblee.cache.ComputedValue;
+import org.wamblee.cache.ComputedValue.Computation;
 import org.wamblee.persistence.JpaMergeSupport;
+import org.wamblee.security.authentication.UserAccessor;
+import org.wamblee.security.authentication.UserAdministration;
 import org.wamblee.security.authorization.AbstractAuthorizationService;
 import org.wamblee.security.authorization.AbstractAuthorizationRule;
 import org.wamblee.security.authorization.AuthorizationRule;
 import org.wamblee.security.authorization.AuthorizationService;
 import org.wamblee.security.authorization.DefaultAuthorizationService;
 import org.wamblee.security.authorization.Operation;
-import org.wamblee.usermgt.UserAccessor;
 
 /**
  * Authorization service with persistent storage. This is a wrapper for
@@ -40,7 +43,7 @@ public class JpaAuthorizationService implements AuthorizationService {
     /**
      * Authorization service to use.
      */
-    private AuthorizationService service;
+    private ComputedValue<AuthorizationService> service;
 
     /**
      * Hibernate template to use.
@@ -52,6 +55,11 @@ public class JpaAuthorizationService implements AuthorizationService {
      */
     private UserAccessor userAccessor;
 
+    /**
+     * User administration.
+     */
+    private UserAdministration userAdmin;
+
     /**
      * Name of the service.
      */
@@ -76,48 +84,66 @@ public class JpaAuthorizationService implements AuthorizationService {
      *            Entity manager.
      * @param aAccessor
      *            User accessor.
+     * @param aUserAdmin
+     *            User administration.
      * @param aRefresh
      *            Whether or not to refresh the state of the service at the
      *            start of every operation.
      */
     public JpaAuthorizationService(String aName, EntityManager aEntityManager,
-        UserAccessor aAccessor, long aRefreshInterval) {
+        UserAccessor aAccessor, UserAdministration aUserAdmin,
+        long aRefreshInterval) {
         entityManager = aEntityManager;
         refreshInterval = aRefreshInterval;
         lastRefreshTime = System.currentTimeMillis();
         userAccessor = aAccessor;
+        userAdmin = aUserAdmin;
         name = aName;
+        Computation<AuthorizationService> computation = new Computation<AuthorizationService>() {
+            @Override
+            public boolean isOutOfDate() {
+                long time = System.currentTimeMillis();
+                return service.getCached() == null ||
+                    (time - lastRefreshTime) > refreshInterval;
+            }
+
+            @Override
+            public AuthorizationService compute() {
+                AuthorizationService svc = refreshByReload();
+                lastRefreshTime = System.currentTimeMillis();
+                return svc;
+            }
+        };
+        service = new ComputedValue<AuthorizationService>(this, computation);
     }
-    
+
     @Override
     public void setUserAccessor(UserAccessor aUserAccessor) {
-        userAccessor = aUserAccessor;   
+        userAccessor = aUserAccessor;
     }
 
-    /**
-     * Initialize service if needed.
-     * 
-     */
-    private void initialize() {
-        if (service == null) {
-            refreshByReload();
-        }
+    @Override
+    public void setUserAdministration(UserAdministration aUserAdmin) {
+        userAdmin = aUserAdmin;
     }
 
-    private void refreshByReload() {
+    private AuthorizationService refreshByReload() {
+        AuthorizationService svc;
         try {
-            service = entityManager.createNamedQuery(
+            svc = entityManager.createNamedQuery(
                 AbstractAuthorizationService.QUERY_FIND_BY_NAME,
                 AbstractAuthorizationService.class).setParameter(
-                    AbstractAuthorizationService.NAME_PARAM, name).getSingleResult();
-            service.setUserAccessor(userAccessor);
+                DefaultAuthorizationService.NAME_PARAM, name).getSingleResult();
+            svc.setUserAccessor(userAccessor);
+            svc.setUserAdministration(userAdmin);
         } catch (NonUniqueResultException e) {
             throw new IllegalArgumentException(
                 "Returned more than one service for name '" + name + "'");
         } catch (NoResultException e) {
-            service = new DefaultAuthorizationService(userAccessor, name);
-            entityManager.persist(service);
+            svc = new DefaultAuthorizationService(userAccessor, userAdmin, name);
+            entityManager.persist(svc);
         }
+        return svc;
     }
 
     /*
@@ -128,10 +154,7 @@ public class JpaAuthorizationService implements AuthorizationService {
      * .lang.Object, org.wamblee.security.authorization.Operation)
      */
     public boolean isAllowed(Object aResource, Operation aOperation) {
-        initialize();
-        refresh();
-
-        return service.isAllowed(aResource, aOperation);
+        return service.get().isAllowed(aResource, aOperation);
     }
 
     /*
@@ -141,10 +164,7 @@ public class JpaAuthorizationService implements AuthorizationService {
      * org.wamblee.security.authorization.Operation)
      */
     public <T> T check(T aResource, Operation aOperation) {
-        initialize();
-        refresh();
-
-        return service.check(aResource, aOperation);
+        return service.get().check(aResource, aOperation);
     }
 
     /*
@@ -153,10 +173,7 @@ public class JpaAuthorizationService implements AuthorizationService {
      * @see org.wamblee.security.authorization.AuthorizationService#getRules()
      */
     public AuthorizationRule[] getRules() {
-        initialize();
-        refresh();
-
-        return service.getRules();
+        return service.get().getRules();
     }
 
     /*
@@ -167,12 +184,15 @@ public class JpaAuthorizationService implements AuthorizationService {
      * .wamblee.security.authorization.AuthorizationRule)
      */
     public void appendRule(AuthorizationRule aRule) {
-        initialize();
-        refresh();
-        service.appendRule(aRule);
-        save();
+        AuthorizationService svc = refreshByReload();
+        svc.appendRule(aRule);
+        // Setting service to null will force reload the next time the
+        // service is used. This deals effectively with the case where the
+        // current transaction would roll back and the change would not have
+        // been made.
+        service.set(null);
     }
-
+    
     /*
      * (non-Javadoc)
      * 
@@ -180,10 +200,9 @@ public class JpaAuthorizationService implements AuthorizationService {
      * org.wamblee.security.authorization.AuthorizationService#removeRule(int)
      */
     public void removeRule(int aIndex) {
-        initialize();
-        refresh();
-        service.removeRule(aIndex);
-        save();
+        AuthorizationService svc = refreshByReload();
+        svc.removeRule(aIndex);
+        service.set(null);
     }
 
     /*
@@ -194,30 +213,8 @@ public class JpaAuthorizationService implements AuthorizationService {
      * (int, org.wamblee.security.authorization.AuthorizationRule)
      */
     public void insertRuleAfter(int aIndex, AuthorizationRule aRule) {
-        initialize();
-        refresh();
-        service.insertRuleAfter(aIndex, aRule);
-        save();
-    }
-
-    /**
-     * Refreshes the state of the service through hibernate.
-     */
-    private synchronized void refresh() {
-        long time = System.currentTimeMillis();
-
-        if ((time - lastRefreshTime) > refreshInterval) {
-            refreshByReload();
-            lastRefreshTime = time;
-        }
-    }
-
-    /**
-     * Saves any changes to the service state if necessary.
-     */
-    private void save() {
-        AuthorizationService merged = entityManager.merge(service);
-        entityManager.flush();
-        JpaMergeSupport.merge(merged, service);
+        AuthorizationService svc = refreshByReload();
+        svc.insertRuleAfter(aIndex, aRule);
+        service.set(null);
     }
 }