X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fwamblee%2Fphotos%2Fmodel%2Fauthorization%2FAuthorizedAlbum.java;h=b59aafeb9a0d13650dd09d49b6b09307114e2dd1;hb=HEAD;hp=48fb47ace6be662593ceb477ad20e399278120aa;hpb=be2dfde47261118e3f67f1c100bb935bc0a1b581;p=photos

diff --git a/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java b/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java
index 48fb47a..b59aafe 100644
--- a/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java
+++ b/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java
@@ -48,8 +48,7 @@ import org.wamblee.security.authorization.WriteOperation;
 @AuthorizedPhotos
 public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
 
-    private static final Logger LOGGER = Logger.getLogger(AuthorizedAlbum.class
-        .getName());
+    private static final Logger LOGGER = Logger.getLogger(AuthorizedAlbum.class.getName());
 
     private AuthorizationService _authorizer;
 
@@ -57,42 +56,33 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
 
     private HttpSession _session;
 
-    protected AuthorizedAlbum() {
-        super(null);
-        // for CDI
-    }
-
     /**
      * Constructs concurrent album as a decorator for an album implementation.
-     * 
-     * @param aAlbum
-     *            Album to decorate.
+     *
+     * @param aAlbum Album to decorate.
      */
     @Inject
-    public AuthorizedAlbum(@AllPhotos Album aAlbum,
-        AuthorizationService aService,
-        @PhotoCache Cache<String, ArrayList<PhotoEntry>> aCache,
-        HttpSession aSession) {
+    public AuthorizedAlbum(@AllPhotos Album aAlbum, AuthorizationService aService,
+            @PhotoCache Cache<String, ArrayList<PhotoEntry>> aCache, HttpSession aSession) {
         super(aAlbum);
         _authorizer = aService;
-        _authorizedEntries = new CachedObject<String, ArrayList<PhotoEntry>>(
-            aCache, aSession.getId() + "/" + aAlbum.getPath(),
-            new CachedObject.Computation<String, ArrayList<PhotoEntry>>() {
-                public ArrayList<PhotoEntry> getObject(String aObjectKey) {
-                    return AuthorizedAlbum.this.compute();
-                }
-            });
+        _authorizedEntries = new CachedObject<>(aCache, "session:" + aSession.getId() + "/" + aAlbum.getPath(),
+                new CachedObject.Computation<String, ArrayList<PhotoEntry>>() {
+                    public ArrayList<PhotoEntry> getObject(String aObjectKey) {
+                        return AuthorizedAlbum.this.compute();
+                    }
+                });
         _session = aSession;
     }
 
     /**
      * Computes the cache of photo entries to which read access is allowed.
-     * 
+     *
      * @return Photo entries to which read access is allowed.
      */
     private synchronized ArrayList<PhotoEntry> compute() {
         LOGGER.info("Refreshing cache " + getPath());
-        ArrayList<PhotoEntry> result = new ArrayList<PhotoEntry>();
+        ArrayList<PhotoEntry> result = new ArrayList<>();
         for (int i = 0; i < decorated().size(); i++) {
             PhotoEntry entry = decorated().getEntry(i);
             if (_authorizer.isAllowed(entry, new ReadOperation())) {
@@ -100,6 +90,9 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
                 // automatically.
             }
         }
+        if (result == null) {
+            throw new RuntimeException("Result is null");
+        }
         return result;
     }
 
@@ -110,9 +103,8 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
     /**
      * Creates a decorate for the photo entry to make it safe for concurrent
      * access.
-     * 
-     * @param aEntry
-     *            Entry to decorate
+     *
+     * @param aEntry Entry to decorate
      * @return Decorated photo.
      */
     private <T extends PhotoEntry> T decorate(T aEntry) {
@@ -121,11 +113,9 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
         } else if (aEntry instanceof Photo) {
             return (T) new AuthorizedPhoto((Photo) aEntry);
         } else if (aEntry instanceof Album) {
-            return (T) new AuthorizedAlbum((Album) aEntry, _authorizer,
-                _authorizedEntries.getCache(), _session);
+            return (T) new AuthorizedAlbum((Album) aEntry, _authorizer, _authorizedEntries.getCache(), _session);
         } else {
-            throw new IllegalArgumentException(
-                "Entry is neither a photo nor an album: " + aEntry);
+            throw new IllegalArgumentException("Entry is neither a photo nor an album: " + aEntry);
         }
     }
 
@@ -157,7 +147,7 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
                 } else {
                     if (!(entry instanceof Album)) {
                         throw new IllegalArgumentException(getPath() + " " +
-                            aPath);
+                                aPath);
                     }
                     return ((Album) entry).getEntry(remainder);
                 }
@@ -191,9 +181,12 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      *      java.io.InputStream)
      */
     public void addImage(String aId, InputStream aImage) throws IOException {
-        _authorizer.check(this, new WriteOperation());
-        _authorizedEntries.invalidate();
-        decorated().addImage(aId, aImage);
+        try {
+            _authorizer.check(this, new WriteOperation());
+            decorated().addImage(aId, aImage);
+        } finally {
+            _authorizedEntries.invalidate();
+        }
     }
 
     /*
@@ -202,9 +195,12 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      * @see org.wamblee.photos.model.Album#addAlbum(java.lang.String)
      */
     public void addAlbum(String aId) throws IOException {
-        _authorizer.check(this, new WriteOperation());
-        _authorizedEntries.invalidate();
-        decorated().addAlbum(aId);
+        try {
+            _authorizer.check(this, new WriteOperation());
+            decorated().addAlbum(aId);
+        } finally {
+            _authorizedEntries.invalidate();
+        }
     }
 
     /*
@@ -213,17 +209,19 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      * @see org.wamblee.photos.model.Album#removeEntry(java.lang.String)
      */
     public void removeEntry(String aId) throws IOException {
-        // Check whether deletion is allowed.
-        PhotoEntry entry = _authorizer.check(decorated().getEntry("/" + aId),
-            new DeleteOperation());
-        _authorizedEntries.invalidate();
-        decorated().removeEntry(aId);
+        try {
+            // Check whether deletion is allowed.
+            PhotoEntry entry = _authorizer.check(decorated().getEntry("/" + aId), new DeleteOperation());
+            _authorizedEntries.invalidate();
+            decorated().removeEntry(aId);
+        } finally {
+            _authorizedEntries.invalidate();
+        }
     }
 
     public Photo findPhotoBefore(String aId) {
         Photo entry = decorated().findPhotoBefore(aId);
-        while (entry != null &&
-            !_authorizer.isAllowed(entry, new AllOperation())) {
+        while (entry != null && !_authorizer.isAllowed(entry, new AllOperation())) {
             entry = decorated().findPhotoBefore(entry.getId());
         }
         return decorate(entry);
@@ -231,8 +229,7 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
 
     public Photo findPhotoAfter(String aId) {
         Photo entry = decorated().findPhotoAfter(aId);
-        while (entry != null &&
-            !_authorizer.isAllowed(entry, new AllOperation())) {
+        while (entry != null && !_authorizer.isAllowed(entry, new AllOperation())) {
             entry = decorated().findPhotoAfter(entry.getId());
         }
         return decorate(entry);