From 51a53ddbaa604f6937112c81f6ca2f50fcc8bb70 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 17 Nov 2010 14:15:11 +0000
Subject: [PATCH] Minor refactoring of GAE code to use specific
 GrantedAuthority type.

---
 .../gae/users/GaeDatastoreUserRegistry.java   | 20 ++++++++++---------
 .../main/java/samples/gae/users/GaeUser.java  |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/samples/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java b/samples/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java
index 0c15bace36..21fd54ad83 100644
--- a/samples/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java
+++ b/samples/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java
@@ -1,15 +1,17 @@
 package samples.gae.users;
 
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Set;
-
-import com.google.appengine.api.datastore.*;
+import com.google.appengine.api.datastore.DatastoreService;
+import com.google.appengine.api.datastore.DatastoreServiceFactory;
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.datastore.EntityNotFoundException;
+import com.google.appengine.api.datastore.Key;
+import com.google.appengine.api.datastore.KeyFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.security.core.GrantedAuthority;
 import samples.gae.security.AppRole;
 
+import java.util.*;
+
 /**
  * UserRegistry implementation which uses GAE's low-level Datastore APIs.
  *
@@ -70,12 +72,12 @@ public class GaeDatastoreUserRegistry implements UserRegistry {
         user.setProperty(USER_SURNAME, newUser.getSurname());
         user.setUnindexedProperty(USER_ENABLED, newUser.isEnabled());
 
-        Collection<? extends GrantedAuthority> roles = newUser.getAuthorities();
+        Collection<AppRole> roles = newUser.getAuthorities();
 
         long binaryAuthorities = 0;
 
-        for (GrantedAuthority r : roles) {
-            binaryAuthorities |= 1 << ((AppRole)r).getBit();
+        for (AppRole r : roles) {
+            binaryAuthorities |= 1 << r.getBit();
         }
 
         user.setUnindexedProperty(USER_AUTHORITIES, binaryAuthorities);
diff --git a/samples/gae/src/main/java/samples/gae/users/GaeUser.java b/samples/gae/src/main/java/samples/gae/users/GaeUser.java
index 6e23fb6546..d50da00542 100644
--- a/samples/gae/src/main/java/samples/gae/users/GaeUser.java
+++ b/samples/gae/src/main/java/samples/gae/users/GaeUser.java
@@ -75,7 +75,7 @@ public class GaeUser implements Serializable {
         return enabled;
     }
 
-    public Collection<? extends GrantedAuthority> getAuthorities() {
+    public Collection<AppRole> getAuthorities() {
         return authorities;
     }