usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [06/23] organize imports only
Date Sun, 19 Jan 2014 10:20:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
index af904de..8585459 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
@@ -16,10 +16,10 @@
 package org.usergrid.security.shiro.principals;
 
 
-import java.util.UUID;
-
 import org.usergrid.management.ApplicationInfo;
 
+import java.util.UUID;
+
 
 public class ApplicationGuestPrincipal extends PrincipalIdentifier {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
index 77de19f..1b0ea72 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
@@ -16,10 +16,10 @@
 package org.usergrid.security.shiro.principals;
 
 
-import java.util.UUID;
-
 import org.usergrid.management.ApplicationInfo;
 
+import java.util.UUID;
+
 
 public class ApplicationPrincipal extends PrincipalIdentifier {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
index a22e8c7..8ad3e0e 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
@@ -16,10 +16,10 @@
 package org.usergrid.security.shiro.principals;
 
 
-import java.util.UUID;
-
 import org.usergrid.management.UserInfo;
 
+import java.util.UUID;
+
 
 public class ApplicationUserPrincipal extends UserPrincipal {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
index 6d5b5c7..7953185 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
@@ -16,10 +16,10 @@
 package org.usergrid.security.shiro.principals;
 
 
-import java.util.UUID;
-
 import org.usergrid.management.OrganizationInfo;
 
+import java.util.UUID;
+
 
 public class OrganizationPrincipal extends PrincipalIdentifier {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
index 22a8dda..f7fcf86 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
@@ -16,10 +16,10 @@
 package org.usergrid.security.shiro.principals;
 
 
-import java.util.UUID;
-
 import org.usergrid.management.UserInfo;
 
+import java.util.UUID;
+
 
 public abstract class UserPrincipal extends PrincipalIdentifier {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
index de66a05..def615d 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
@@ -16,9 +16,12 @@
 package org.usergrid.security.shiro.utils;
 
 
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.ApplicationInfo;
@@ -28,20 +31,11 @@ import org.usergrid.persistence.Identifier;
 import org.usergrid.security.shiro.PrincipalCredentialsToken;
 import org.usergrid.security.shiro.principals.UserPrincipal;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-
-import com.google.common.collect.BiMap;
+import java.util.Set;
+import java.util.UUID;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.security.shiro.Realm.ROLE_ADMIN_USER;
-import static org.usergrid.security.shiro.Realm.ROLE_APPLICATION_ADMIN;
-import static org.usergrid.security.shiro.Realm.ROLE_APPLICATION_USER;
-import static org.usergrid.security.shiro.Realm.ROLE_ORGANIZATION_ADMIN;
-import static org.usergrid.security.shiro.Realm.ROLE_SERVICE_ADMIN;
+import static org.usergrid.security.shiro.Realm.*;
 
 
 public class SubjectUtils {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java b/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
index 1fa7069..109ee0d 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
@@ -1,11 +1,11 @@
 package org.usergrid.security.tokens;
 
 
+import org.usergrid.security.AuthPrincipalInfo;
+
 import java.util.Map;
 import java.util.UUID;
 
-import org.usergrid.security.AuthPrincipalInfo;
-
 
 public class TokenInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java b/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
index e1d0e09..0b369c7 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
@@ -1,10 +1,10 @@
 package org.usergrid.security.tokens;
 
 
-import java.util.Map;
-
 import org.usergrid.security.AuthPrincipalInfo;
 
+import java.util.Map;
+
 
 public interface TokenService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 7d8fe72..4ce146b 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -1,9 +1,13 @@
 package org.usergrid.security.tokens.cassandra;
 
 
-import java.nio.ByteBuffer;
-import java.util.*;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.LongSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,16 +27,10 @@ import org.usergrid.security.tokens.exceptions.InvalidTokenException;
 import org.usergrid.utils.JsonUtils;
 import org.usergrid.utils.UUIDUtils;
 
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
 
 import static java.lang.System.currentTimeMillis;
-
 import static me.prettyprint.hector.api.factory.HFactory.createColumn;
 import static me.prettyprint.hector.api.factory.HFactory.createMutator;
 import static org.apache.commons.codec.binary.Base64.decodeBase64;
@@ -41,16 +39,8 @@ import static org.apache.commons.codec.digest.DigestUtils.sha;
 import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getColumnMap;
 import static org.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
 import static org.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-import static org.usergrid.security.tokens.TokenCategory.ACCESS;
-import static org.usergrid.security.tokens.TokenCategory.EMAIL;
-import static org.usergrid.security.tokens.TokenCategory.OFFLINE;
-import static org.usergrid.security.tokens.TokenCategory.REFRESH;
-import static org.usergrid.utils.ConversionUtils.HOLDER;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.bytes;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.security.tokens.TokenCategory.*;
+import static org.usergrid.utils.ConversionUtils.*;
 import static org.usergrid.utils.MapUtils.hasKeys;
 import static org.usergrid.utils.MapUtils.hashMap;
 import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java b/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
index 7a84653..b89de3d 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
@@ -16,25 +16,17 @@
 package org.usergrid.services;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
 import org.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
 import org.usergrid.services.ServiceResults.Type;
 import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
 import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
 
+import java.util.*;
+
 import static org.usergrid.utils.ClassUtils.cast;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java b/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
index 5190645..7d42b28 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
@@ -16,26 +16,20 @@
 package org.usergrid.services;
 
 
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
 import org.usergrid.services.ServiceParameter.IdParameter;
 import org.usergrid.services.ServiceParameter.NameParameter;
 import org.usergrid.services.ServiceParameter.QueryParameter;
 import org.usergrid.services.ServiceResults.Type;
 import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
 
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
 import static org.usergrid.services.ServiceParameter.filter;
 import static org.usergrid.services.ServiceParameter.firstParameterIsName;
 import static org.usergrid.utils.ClassUtils.cast;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java b/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
index fd58736..f8a90d4 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
@@ -16,11 +16,6 @@
 package org.usergrid.services;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.EntityRef;
@@ -31,6 +26,11 @@ import org.usergrid.services.ServiceParameter.NameParameter;
 import org.usergrid.services.ServiceParameter.QueryParameter;
 import org.usergrid.services.exceptions.ServiceInvocationException;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 import static org.usergrid.services.ServiceParameter.filter;
 import static org.usergrid.services.ServiceParameter.mergeQueries;
 import static org.usergrid.utils.InflectionUtils.pluralize;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractService.java b/stack/services/src/main/java/org/usergrid/services/AbstractService.java
index 419d988..3801252 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractService.java
@@ -16,23 +16,12 @@
 package org.usergrid.services;
 
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
 import org.usergrid.security.shiro.utils.SubjectUtils;
 import org.usergrid.services.ServiceParameter.IdParameter;
 import org.usergrid.services.ServiceParameter.NameParameter;
@@ -42,8 +31,7 @@ import org.usergrid.services.exceptions.ServiceInvocationException;
 import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
 import org.usergrid.services.exceptions.UnsupportedServiceOperationException;
 
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.shiro.subject.Subject;
+import java.util.*;
 
 import static org.usergrid.security.shiro.utils.SubjectUtils.getPermissionFromPath;
 import static org.usergrid.services.ServiceParameter.filter;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/Service.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/Service.java b/stack/services/src/main/java/org/usergrid/services/Service.java
index 75888e7..ff4f77c 100644
--- a/stack/services/src/main/java/org/usergrid/services/Service.java
+++ b/stack/services/src/main/java/org/usergrid/services/Service.java
@@ -16,11 +16,11 @@
 package org.usergrid.services;
 
 
-import java.util.UUID;
-
 import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.EntityRef;
 
+import java.util.UUID;
+
 
 public interface Service {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceContext.java b/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
index f1efd9c..5696dd5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
@@ -16,15 +16,15 @@
 package org.usergrid.services;
 
 
+import org.usergrid.persistence.EntityRef;
+import org.usergrid.persistence.Query;
+import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
-
 import static org.usergrid.services.ServiceInfo.normalizeServicePattern;
 import static org.usergrid.utils.ListUtils.dequeueCopy;
 import static org.usergrid.utils.ListUtils.isEmpty;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
index 2765253..f3dc82b 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
@@ -16,29 +16,22 @@
 package org.usergrid.services;
 
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import org.usergrid.persistence.Schema;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
+import org.usergrid.persistence.Schema;
+
+import java.util.*;
+import java.util.concurrent.ExecutionException;
 
 import static org.apache.commons.lang.StringUtils.capitalize;
 import static org.apache.commons.lang.StringUtils.removeEnd;
 import static org.apache.commons.lang.StringUtils.split;
 import static org.usergrid.utils.InflectionUtils.pluralize;
 import static org.usergrid.utils.InflectionUtils.singularize;
-import static org.usergrid.utils.StringUtils.stringOrSubstringAfterLast;
-import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
-import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeLast;
+import static org.usergrid.utils.StringUtils.*;
 
 
 public class ServiceInfo {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
index a4778e5..c48e3da 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
@@ -16,11 +16,10 @@
 package org.usergrid.services;
 
 
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -37,11 +36,10 @@ import org.usergrid.services.applications.ApplicationsService;
 import org.usergrid.services.exceptions.UndefinedServiceEntityTypeException;
 import org.usergrid.utils.ListUtils;
 
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 import static org.usergrid.persistence.SimpleEntityRef.ref;
 import static org.usergrid.utils.InflectionUtils.pluralize;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java b/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
index d1ef31d..e62de49 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
@@ -16,10 +16,6 @@
 package org.usergrid.services;
 
 
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -30,6 +26,10 @@ import org.usergrid.mq.QueueManagerFactory;
 import org.usergrid.persistence.EntityManager;
 import org.usergrid.persistence.EntityManagerFactory;
 
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
+
 
 public class ServiceManagerFactory implements ApplicationContextAware {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java b/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
index a5586b5..240f0f5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
@@ -16,22 +16,19 @@
 package org.usergrid.services;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.Identifier;
+import org.usergrid.persistence.Query;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-
 import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.utils.ListUtils.dequeue;
-import static org.usergrid.utils.ListUtils.dequeueCopy;
-import static org.usergrid.utils.ListUtils.isEmpty;
-import static org.usergrid.utils.ListUtils.queue;
+import static org.usergrid.utils.ListUtils.*;
 
 
 public abstract class ServiceParameter {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServicePayload.java b/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
index 672118d..4147ed3 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
@@ -16,17 +16,11 @@
 package org.usergrid.services;
 
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.usergrid.utils.JsonUtils;
-
 import org.apache.commons.collections.iterators.EmptyIterator;
 import org.apache.commons.collections.iterators.SingletonListIterator;
+import org.usergrid.utils.JsonUtils;
+
+import java.util.*;
 
 import static org.usergrid.utils.JsonUtils.normalizeJsonTree;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
index 083ae22..4a4f8e9 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
@@ -16,12 +16,7 @@
 package org.usergrid.services;
 
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.EntityRef;
@@ -29,7 +24,11 @@ import org.usergrid.persistence.Query;
 import org.usergrid.services.ServiceParameter.QueryParameter;
 import org.usergrid.services.ServiceResults.Type;
 
-import org.apache.shiro.SecurityUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 import static org.usergrid.utils.ListUtils.isEmpty;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceResults.java b/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
index 369a819..a801f6b 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
@@ -16,18 +16,14 @@
 package org.usergrid.services;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.*;
+
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
 
 public class ServiceResults extends Results {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
index 0f1b433..80bb636 100644
--- a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
@@ -16,11 +16,7 @@
 package org.usergrid.services.applications;
 
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -34,7 +30,10 @@ import org.usergrid.services.ServicePayload;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.services.ServiceResults.Type;
 
-import org.apache.commons.lang.StringUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 import static org.usergrid.services.ServiceResults.genericServiceResults;
 import static org.usergrid.services.ServiceResults.simpleServiceResults;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java b/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
index 5581423..1a883cc 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
@@ -16,8 +16,6 @@
 package org.usergrid.services.assets;
 
 
-import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.EntityRef;
@@ -25,6 +23,8 @@ import org.usergrid.services.AbstractPathBasedColllectionService;
 import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServiceResults;
 
+import java.util.List;
+
 
 public class AssetsService extends AbstractPathBasedColllectionService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
index 1a0f771..215dd95 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
@@ -1,22 +1,16 @@
 package org.usergrid.services.assets.data;
 
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Entity;
-
 import org.apache.tika.detect.DefaultDetector;
 import org.apache.tika.detect.Detector;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.Entity;
+
+import java.io.*;
+import java.util.Map;
 
 
 /** Detect the mime type of an Asset */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
index 44d8e88..69c9a4a 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
@@ -1,20 +1,18 @@
 package org.usergrid.services.assets.data;
 
 
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
 import org.usergrid.utils.StringUtils;
 
-import org.apache.commons.lang.time.DateUtils;
-
-import com.google.common.base.Preconditions;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 
 public class AssetUtils {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
index fcc3fa1..a8c1211 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
@@ -1,12 +1,12 @@
 package org.usergrid.services.assets.data;
 
 
+import org.usergrid.persistence.Entity;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.UUID;
 
-import org.usergrid.persistence.Entity;
-
 
 public interface BinaryStore {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
index 2547ace..9609f62 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
@@ -1,6 +1,9 @@
 package org.usergrid.services.assets.data;
 
 
+import org.apache.commons.io.FileUtils;
+import org.usergrid.persistence.Entity;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -8,10 +11,6 @@ import java.io.InputStream;
 import java.util.Map;
 import java.util.UUID;
 
-import org.usergrid.persistence.Entity;
-
-import org.apache.commons.io.FileUtils;
-
 
 /** A binary store implementation using the local file system */
 public class LocalFileBinaryStore implements BinaryStore {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
index f766f2c..a17fc3b 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
@@ -1,18 +1,12 @@
 package org.usergrid.services.assets.data;
 
 
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.jclouds.ContextBuilder;
 import org.jclouds.blobstore.AsyncBlobStore;
 import org.jclouds.blobstore.BlobStore;
@@ -31,13 +25,11 @@ import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.EntityManager;
 import org.usergrid.persistence.EntityManagerFactory;
 
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Module;
+import java.io.*;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 public class S3BinaryStore implements BinaryStore {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java b/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
index c4abb62..b3dc34c 100644
--- a/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
@@ -16,14 +16,14 @@
 package org.usergrid.services.devices;
 
 
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.services.AbstractCollectionService;
 import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServiceResults;
 
+import java.util.UUID;
+
 
 public class DevicesService extends AbstractCollectionService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java b/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
index 83ad9a6..b906d2b 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
@@ -16,12 +16,8 @@
 package org.usergrid.services.groups;
 
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.EntityRef;
@@ -32,8 +28,7 @@ import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServicePayload;
 import org.usergrid.services.ServiceResults;
 
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
+import java.util.*;
 
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.usergrid.services.ServiceResults.genericServiceResults;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
index 25d1019..2c70dc7 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
@@ -16,9 +16,6 @@
 package org.usergrid.services.groups.activities;
 
 
-import java.util.List;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -28,6 +25,9 @@ import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.services.generic.GenericCollectionService;
 
+import java.util.List;
+import java.util.UUID;
+
 
 public class ActivitiesService extends GenericCollectionService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
index 35fa6c6..405f412 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
@@ -16,9 +16,6 @@
 package org.usergrid.services.groups.users.activities;
 
 
-import java.util.List;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -29,6 +26,9 @@ import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.services.generic.GenericCollectionService;
 
+import java.util.List;
+import java.util.UUID;
+
 
 public class ActivitiesService extends GenericCollectionService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java b/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
index 6e1b91e..e57be7d 100644
--- a/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
@@ -16,10 +16,6 @@
 package org.usergrid.services.roles;
 
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.EntityRef;
@@ -31,6 +27,10 @@ import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServicePayload;
 import org.usergrid.services.ServiceResults;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.usergrid.services.ServiceResults.genericServiceResults;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java b/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
index 4da043c..c57a54c 100644
--- a/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
+++ b/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
@@ -16,8 +16,6 @@
 package org.usergrid.services.roles.users;
 
 
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -27,6 +25,8 @@ import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.services.ServiceResults.Type;
 
+import java.util.UUID;
+
 
 public class UsersService extends org.usergrid.services.users.UsersService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/UsersService.java b/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
index 6248e96..38cf6b1 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
@@ -16,31 +16,17 @@
 package org.usergrid.services.users;
 
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.entities.Role;
 import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.usergrid.services.AbstractCollectionService;
-import org.usergrid.services.ServiceContext;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
 import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
 
+import java.util.*;
+
 import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.apache.commons.lang.StringUtils.isNotBlank;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
index 49d4b70..f7baef7 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
@@ -16,11 +16,6 @@
 package org.usergrid.services.users.activities;
 
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -34,6 +29,11 @@ import org.usergrid.services.ServicePayload;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.services.generic.GenericCollectionService;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 
 public class ActivitiesService extends GenericCollectionService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java b/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
index 58e40f8..3174905 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
@@ -16,8 +16,6 @@
 package org.usergrid.services.users.roles;
 
 
-import java.util.UUID;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -27,6 +25,8 @@ import org.usergrid.services.ServiceContext;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.services.ServiceResults.Type;
 
+import java.util.UUID;
+
 
 public class RolesService extends org.usergrid.services.roles.RolesService {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java b/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
index b7cd486..be644ee 100644
--- a/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
+++ b/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
@@ -15,16 +15,7 @@ import org.usergrid.management.cassandra.ManagementServiceIT;
 import org.usergrid.security.providers.FacebookProviderIT;
 import org.usergrid.security.providers.PingIdentityProviderIT;
 import org.usergrid.security.tokens.TokenServiceIT;
-import org.usergrid.services.ActivitiesServiceIT;
-import org.usergrid.services.ApplicationsServiceIT;
-import org.usergrid.services.CollectionServiceIT;
-import org.usergrid.services.ConnectionsServiceIT;
-import org.usergrid.services.GroupServiceIT;
-import org.usergrid.services.RolesServiceIT;
-import org.usergrid.services.ServiceFactoryIT;
-import org.usergrid.services.ServiceInvocationIT;
-import org.usergrid.services.ServiceRequestIT;
-import org.usergrid.services.UsersServiceIT;
+import org.usergrid.services.*;
 
 
 @RunWith(ConcurrentSuite.class)

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceApplication.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceApplication.java b/stack/services/src/test/java/org/usergrid/ServiceApplication.java
index bd70b56..33d3fdd 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceApplication.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceApplication.java
@@ -1,11 +1,6 @@
 package org.usergrid;
 
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.junit.runner.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +14,11 @@ import org.usergrid.services.ServiceRequest;
 import org.usergrid.services.ServiceResults;
 import org.usergrid.utils.JsonUtils;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.usergrid.services.ServiceParameter.parameters;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSetup.java b/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
index fbfb923..2a41406 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
@@ -1,14 +1,14 @@
 package org.usergrid;
 
 
-import java.util.Properties;
-
 import org.usergrid.management.ApplicationCreator;
 import org.usergrid.management.ManagementService;
 import org.usergrid.security.providers.SignInProviderFactory;
 import org.usergrid.security.tokens.TokenService;
 import org.usergrid.services.ServiceManagerFactory;
 
+import java.util.Properties;
+
 
 public interface ServiceITSetup extends CoreITSetup {
     ManagementService getMgmtSvc();

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java b/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
index cf6068f..1de23ac 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
@@ -1,8 +1,6 @@
 package org.usergrid;
 
 
-import java.util.Properties;
-
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
@@ -16,6 +14,8 @@ import org.usergrid.security.providers.SignInProviderFactory;
 import org.usergrid.security.tokens.TokenService;
 import org.usergrid.services.ServiceManagerFactory;
 
+import java.util.Properties;
+
 
 /** A {@link org.junit.rules.TestRule} that sets up services. */
 public class ServiceITSetupImpl extends CoreITSetupImpl implements ServiceITSetup {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSuite.java b/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
index b02f6c0..443afdd 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
@@ -13,16 +13,7 @@ import org.usergrid.management.cassandra.ApplicationCreatorIT;
 import org.usergrid.management.cassandra.ManagementServiceIT;
 import org.usergrid.security.providers.FacebookProviderIT;
 import org.usergrid.security.providers.PingIdentityProviderIT;
-import org.usergrid.services.ActivitiesServiceIT;
-import org.usergrid.services.ApplicationsServiceIT;
-import org.usergrid.services.CollectionServiceIT;
-import org.usergrid.services.ConnectionsServiceIT;
-import org.usergrid.services.GroupServiceIT;
-import org.usergrid.services.RolesServiceIT;
-import org.usergrid.services.ServiceFactoryIT;
-import org.usergrid.services.ServiceInvocationIT;
-import org.usergrid.services.ServiceRequestIT;
-import org.usergrid.services.UsersServiceIT;
+import org.usergrid.services.*;
 
 
 @RunWith(Suite.class)

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
index 0340f27..a29afa1 100644
--- a/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
@@ -16,17 +16,8 @@
 package org.usergrid.management;
 
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMultipart;
-
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.text.StrSubstitutor;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,36 +36,15 @@ import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.entities.Application;
 import org.usergrid.persistence.entities.User;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMultipart;
+import java.io.IOException;
+import java.util.*;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATIONS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java b/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
index 959d04a..a2fc557 100644
--- a/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
+++ b/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
@@ -16,11 +16,11 @@
 package org.usergrid.management;
 
 
-import java.util.Properties;
-
 import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.security.tokens.TokenService;
 
+import java.util.Properties;
+
 
 public interface ManagementTestHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/MockImapClient.java b/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
index 0f5effc..017eabe 100644
--- a/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
+++ b/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
@@ -1,18 +1,13 @@
 package org.usergrid.management;
 
 
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.mail.*;
+import java.io.IOException;
+import java.util.Properties;
+
 
 public class MockImapClient {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
index 0b5aede..16a200f 100644
--- a/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
@@ -16,11 +16,6 @@
 package org.usergrid.management;
 
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,10 +28,12 @@ import org.usergrid.management.cassandra.ManagementServiceImpl;
 import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
 import org.usergrid.security.AuthPrincipalInfo;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/RoleIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/RoleIT.java b/stack/services/src/test/java/org/usergrid/management/RoleIT.java
index 6bdb93e..d191fe0 100644
--- a/stack/services/src/test/java/org/usergrid/management/RoleIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/RoleIT.java
@@ -16,10 +16,7 @@
 package org.usergrid.management;
 
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.shiro.subject.Subject;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -35,7 +32,9 @@ import org.usergrid.persistence.entities.User;
 import org.usergrid.security.shiro.PrincipalCredentialsToken;
 import org.usergrid.security.shiro.utils.SubjectUtils;
 
-import org.apache.shiro.subject.Subject;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
 
 import static org.junit.Assert.assertFalse;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
index 917e182..0bf0121 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
@@ -1,8 +1,6 @@
 package org.usergrid.management.cassandra;
 
 
-import java.util.Set;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -16,9 +14,9 @@ import org.usergrid.cassandra.Concurrent;
 import org.usergrid.management.ApplicationInfo;
 import org.usergrid.management.OrganizationOwnerInfo;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Set;
+
+import static org.junit.Assert.*;
 
 
 /** @author zznate */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
index a27ebb2..560e920 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1,11 +1,6 @@
 package org.usergrid.management.cassandra;
 
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -18,6 +13,7 @@ import org.usergrid.ServiceITSuite;
 import org.usergrid.cassandra.CassandraResource;
 import org.usergrid.cassandra.ClearShiroSubject;
 import org.usergrid.cassandra.Concurrent;
+import org.usergrid.count.SimpleBatcher;
 import org.usergrid.management.OrganizationInfo;
 import org.usergrid.management.UserInfo;
 import org.usergrid.persistence.CredentialsInfo;
@@ -32,14 +28,13 @@ import org.usergrid.security.tokens.exceptions.InvalidTokenException;
 import org.usergrid.utils.JsonUtils;
 import org.usergrid.utils.UUIDUtils;
 
-import org.usergrid.count.SimpleBatcher;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
 import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
index baa9fc8..961386a 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
@@ -19,8 +19,6 @@ package org.usergrid.management.cassandra;
  * Copyright 2010,2011 Ed Anuff and Usergrid, all rights reserved.
  ******************************************************************************/
 
-import java.util.Properties;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +28,8 @@ import org.usergrid.management.ManagementTestHelper;
 import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.security.tokens.TokenService;
 
+import java.util.Properties;
+
 
 @Component
 public class ManagementTestHelperImpl implements ManagementTestHelper {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java b/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
index 4ca7fa5..e9fbac2 100644
--- a/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
@@ -16,8 +16,14 @@
 package org.usergrid.security;
 
 
-import java.util.UUID;
-
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.LifecycleUtils;
+import org.apache.shiro.util.ThreadState;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -29,14 +35,7 @@ import org.usergrid.security.shiro.CustomPermission;
 import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
 import org.usergrid.utils.UUIDUtils;
 
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.subject.SimplePrincipalCollection;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.LifecycleUtils;
-import org.apache.shiro.util.ThreadState;
+import java.util.UUID;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
index 3707c9d..40fb829 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
@@ -16,16 +16,16 @@
 package org.usergrid.security.crypto;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.persistence.CredentialsInfo;
 import org.usergrid.security.crypto.command.EncryptionCommand;
 import org.usergrid.security.crypto.command.Md5HashCommand;
 import org.usergrid.security.crypto.command.Sha1HashCommand;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 import static org.junit.Assert.assertTrue;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
index a7b4dc1..5387f71 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
@@ -16,17 +16,16 @@
 package org.usergrid.security.crypto.command;
 
 
-import java.io.UnsupportedEncodingException;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.usergrid.persistence.CredentialsInfo;
-
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.MetricPredicate;
 import com.yammer.metrics.core.Timer;
 import com.yammer.metrics.core.TimerContext;
 import com.yammer.metrics.reporting.ConsoleReporter;
+import org.junit.Test;
+import org.usergrid.persistence.CredentialsInfo;
+
+import java.io.UnsupportedEncodingException;
+import java.util.UUID;
 
 import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
 import static org.junit.Assert.assertArrayEquals;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
index ed5966e..2a6b094 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
@@ -16,12 +16,11 @@
 package org.usergrid.security.crypto.command;
 
 
-import java.io.UnsupportedEncodingException;
-
+import org.apache.commons.codec.digest.DigestUtils;
 import org.junit.Test;
 import org.usergrid.persistence.CredentialsInfo;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import java.io.UnsupportedEncodingException;
 
 import static org.junit.Assert.assertArrayEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
index 2c0b468..28e68be 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
@@ -16,13 +16,13 @@
 package org.usergrid.security.crypto.command;
 
 
+import org.junit.Test;
+import org.usergrid.persistence.CredentialsInfo;
+
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.junit.Test;
-import org.usergrid.persistence.CredentialsInfo;
-
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java b/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
index 45e9631..3d3ed34 100644
--- a/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
@@ -1,14 +1,7 @@
 package org.usergrid.security.providers;
 
 
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.usergrid.ServiceITSetup;
 import org.usergrid.ServiceITSetupImpl;
 import org.usergrid.ServiceITSuite;
@@ -20,6 +13,9 @@ import org.usergrid.persistence.entities.Application;
 import org.usergrid.persistence.entities.User;
 import org.usergrid.utils.MapUtils;
 
+import java.util.Map;
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java b/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
index 6aaf993..7eb2327 100644
--- a/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
@@ -1,14 +1,7 @@
 package org.usergrid.security.providers;
 
 
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.usergrid.ServiceITSetup;
 import org.usergrid.ServiceITSetupImpl;
 import org.usergrid.ServiceITSuite;
@@ -20,6 +13,9 @@ import org.usergrid.persistence.entities.Application;
 import org.usergrid.persistence.entities.User;
 import org.usergrid.utils.MapUtils;
 
+import java.util.Map;
+import java.util.UUID;
+
 import static junit.framework.Assert.assertNotNull;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java b/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
index 499f9e2..0d0316b 100644
--- a/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
@@ -1,9 +1,6 @@
 package org.usergrid.security.tokens;
 
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -28,10 +25,10 @@ import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
 import org.usergrid.security.tokens.exceptions.InvalidTokenException;
 import org.usergrid.utils.UUIDUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java b/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
index 80e758d..d78a609 100644
--- a/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
@@ -26,9 +26,7 @@ import org.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
 import org.usergrid.persistence.schema.CollectionInfo;
 import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java b/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
index 5b70c02..720b74b 100644
--- a/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
@@ -16,15 +16,13 @@
 package org.usergrid.services;
 
 
-import java.util.Map;
-
 import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.Entity;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Map;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java b/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
index 98751e0..2892e19 100644
--- a/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
@@ -16,21 +16,17 @@
 package org.usergrid.services;
 
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
 import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.entities.Role;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.*;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
index 97351bb..c50eaa3 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
@@ -16,15 +16,14 @@
 package org.usergrid.services;
 
 
-import java.util.UUID;
-
+import baas.io.simple.SimpleService;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.cassandra.Concurrent;
 
-import baas.io.simple.SimpleService;
+import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java b/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
index 700e499..5255b38 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
@@ -16,13 +16,13 @@
 package org.usergrid.services;
 
 
-import java.util.List;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.utils.JsonUtils;
 
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
index e622fbd..95e19c7 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
@@ -16,18 +16,14 @@
 package org.usergrid.services;
 
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.Query;
 
+import java.util.*;
+
 import static org.junit.Assert.assertNotNull;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
index 4c51cec..3950766 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
@@ -16,12 +16,6 @@
 package org.usergrid.services;
 
 
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -32,6 +26,8 @@ import org.usergrid.ServiceITSuite;
 import org.usergrid.cassandra.ClearShiroSubject;
 import org.usergrid.cassandra.Concurrent;
 
+import java.util.*;
+
 import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
 import static org.usergrid.services.ServiceParameter.filter;
 import static org.usergrid.services.ServiceParameter.parameters;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java b/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
index df0811a..e2e7f48 100644
--- a/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
+++ b/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
@@ -1,11 +1,11 @@
 package org.usergrid.services.assets.data;
 
 
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.persistence.entities.Asset;
 
+import java.util.UUID;
+
 import static junit.framework.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
index 1730bd6..213faaf 100644
--- a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
+++ b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
@@ -1,11 +1,11 @@
 package org.usergrid;
 
 
-import java.security.Permission;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.Permission;
+
 
 /**
  * Used to prevent System.exit() calls when testing funky Cassandra exit code and race conditions in the ForkedBooter


Mime
View raw message