You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/23 18:21:02 UTC
[26/33] organize imports only
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
index 6923cff..a1bd3ec 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
@@ -1,12 +1,8 @@
package org.usergrid.rest.applications.users;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -14,8 +10,10 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+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/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
index c440d9b..d537701 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.applications.users;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Before;
import org.junit.Test;
@@ -31,10 +27,10 @@ import org.usergrid.java.client.response.ApiResponse;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import javax.ws.rs.core.MediaType;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
index 114f798..06989bb 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
@@ -29,11 +29,7 @@ import org.usergrid.rest.test.security.TestAppUser;
import org.usergrid.rest.test.security.TestUser;
import org.usergrid.utils.MapUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
index f7173e9..fd2346e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
@@ -16,12 +16,9 @@
package org.usergrid.rest.applications.users;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.ArrayNode;
import org.junit.Ignore;
@@ -33,14 +30,12 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
index 9383cbf..1036be3 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.users;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Rule;
@@ -14,6 +11,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
index 8c212a5..4198b1c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
@@ -16,15 +16,8 @@
package org.usergrid.rest.applications.users;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
@@ -42,15 +35,10 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.applications.utils.UserRepo;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
-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.fail;
+import static org.junit.Assert.*;
import static org.usergrid.rest.applications.utils.TestUtils.getIdFromSearchResults;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
index 331996e..0e26692 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.applications.users.extensions;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +23,10 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.applications.users.AbstractUserExtensionResource;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
@Ignore
@Component("org.usergrid.rest.applications.users.extensions.TestResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
index abd93e7..0f6e57d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.applications.utils;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
/** @author tnine */
@Ignore("Not a test")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
index 4a87a32..6b9e9b9 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
@@ -1,16 +1,14 @@
package org.usergrid.rest.applications.utils;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
index 8b16db2..d2669fe 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
@@ -16,14 +16,15 @@
package org.usergrid.rest.filters;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
+import org.apache.http.*;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.util.EntityUtils;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -33,20 +34,12 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.ParseException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.util.EntityUtils;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
index 9a7b873..9685edb 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
@@ -16,11 +16,10 @@
package org.usergrid.rest.management;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -29,16 +28,11 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.management.organizations.OrganizationsResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-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.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
index a5fb6e8..ee31dcd 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
@@ -14,21 +14,10 @@
package org.usergrid.rest.management;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.internet.MimeMultipart;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -38,23 +27,18 @@ import org.usergrid.management.UserInfo;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.rest.AbstractRestIT;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import javax.mail.*;
+import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
-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.junit.Assert.fail;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_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.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
index 39c9c4a..39e9744 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
@@ -1,11 +1,7 @@
package org.usergrid.rest.management.organizations;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import junit.framework.Assert;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -14,7 +10,9 @@ import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
index 1fc7477..34daa6c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
@@ -1,14 +1,14 @@
package org.usergrid.rest.management.organizations;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import junit.framework.Assert;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
@@ -17,22 +17,14 @@ import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.User;
import org.usergrid.rest.AbstractRestIT;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
-
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import static junit.framework.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_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.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
index 31e4517..0a9395b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
@@ -14,16 +14,9 @@
package org.usergrid.rest.management.users;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMultipart;
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -31,12 +24,7 @@ import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ActivationState;
-import org.usergrid.management.MockImapClient;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.OrganizationOwnerInfo;
-import org.usergrid.management.UserInfo;
+import org.usergrid.management.*;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.management.organizations.OrganizationsResource;
@@ -47,22 +35,17 @@ import org.usergrid.security.AuthPrincipalInfo;
import org.usergrid.security.AuthPrincipalType;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-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.fail;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION;
-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.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
index b9c0cd8..021395c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
@@ -1,15 +1,14 @@
package org.usergrid.rest.management.users.organizations;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
index d344f88..4e43b8c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
@@ -17,11 +17,6 @@
package org.usergrid.rest.test;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -30,6 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.services.ServiceManagerFactory;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
index 26e0d3c..c1d9f17 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.test.resource;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
+import java.util.UUID;
+
/** @author tnine */
public class Connection extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
index 5102c41..6a94bd2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import org.codehaus.jackson.JsonNode;
+
import java.util.Collections;
import java.util.Map;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-
/** @author tnine */
public class EntityResource extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
index c8b0e73..83abdf0 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
@@ -16,17 +16,15 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+import org.codehaus.jackson.JsonNode;
+
+import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.WebResource.Builder;
-
/**
* @author tnine
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
index 0c6ddc1..fca105b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource;
+import org.codehaus.jackson.JsonNode;
+
import java.util.Map;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
/** @author tnine */
public abstract class SetResource extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
index 10cb6ed..70bfb26 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
@@ -15,15 +15,14 @@
package org.usergrid.rest.test.resource;
-import java.util.UUID;
-
+import com.sun.jersey.test.framework.JerseyTest;
import org.usergrid.rest.test.resource.app.Application;
import org.usergrid.rest.test.resource.app.User;
import org.usergrid.rest.test.resource.app.UsersCollection;
import org.usergrid.rest.test.resource.mgmt.Management;
import org.usergrid.rest.test.security.TestUser;
-import com.sun.jersey.test.framework.JerseyTest;
+import java.util.UUID;
public class TestContext {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
index f5c8d18..817e30b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.WebResource;
+import org.codehaus.jackson.JsonNode;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.WebResource;
-
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
index e076939..2be7375 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
@@ -16,8 +16,6 @@
package org.usergrid.rest.test.resource.app;
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CustomCollection;
import org.usergrid.rest.test.resource.RootResource;
@@ -25,6 +23,8 @@ import org.usergrid.rest.test.resource.ValueResource;
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
import org.usergrid.rest.test.resource.app.queue.QueuesCollection;
+import javax.ws.rs.core.MediaType;
+
/** @author tnine */
public class Application extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
index 91f7f06..5a66551 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource.app;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
index 68e897a..eabb5e2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.test.resource.app;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
index df5ac39..8e56d58 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
@@ -16,15 +16,15 @@
package org.usergrid.rest.test.resource.app;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.Me;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
/** @author tnine */
public class UsersCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
index 23bb526..32a8c0c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
@@ -16,14 +16,13 @@
package org.usergrid.rest.test.resource.app.queue;
-import java.util.List;
-import java.util.Map;
-
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
-import com.sun.jersey.api.client.WebResource;
+import java.util.List;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
index 47d5dd7..98d03ce 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
@@ -16,12 +16,11 @@
package org.usergrid.rest.test.resource.app.queue;
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
-import com.sun.jersey.api.client.WebResource;
-
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
index 01ad317..2b2bcb2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
index 293c1f0..765b44b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
@@ -16,13 +16,13 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.utils.MapUtils;
+import java.util.UUID;
+
/** @author tnine */
public class ApplicationsCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
index 758c701..091e408 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.Me;
import org.usergrid.rest.test.resource.NamedResource;
@@ -27,6 +23,9 @@ import org.usergrid.rest.test.resource.RootResource;
import org.usergrid.rest.test.resource.app.UsersCollection;
import org.usergrid.utils.MapUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
/** @author tnine */
public class Management extends NamedResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
index 9deedd7..3449484 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.resource.app.UsersCollection;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
index e96ba95..0fc8a9d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
@@ -16,14 +16,14 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.security.TestUser;
import org.usergrid.utils.MapUtils;
+import java.util.UUID;
+
/** @author tnine */
public class OrganizationsCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java b/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
index 4f67dd2..4366590 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.security;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.TestContext;
+import java.util.UUID;
+
/** @author tnine */
public abstract class TestUser {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java b/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
index 968e0ac..f059024 100644
--- a/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
@@ -16,12 +16,8 @@
package org.usergrid.management;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import static org.usergrid.persistence.Schema.PROPERTY_NAME;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/ManagementService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ManagementService.java b/stack/services/src/main/java/org/usergrid/management/ManagementService.java
index d3926f5..7af7124 100644
--- a/stack/services/src/main/java/org/usergrid/management/ManagementService.java
+++ b/stack/services/src/main/java/org/usergrid/management/ManagementService.java
@@ -16,12 +16,7 @@
package org.usergrid.management;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityRef;
@@ -33,7 +28,7 @@ import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.services.ServiceResults;
-import com.google.common.collect.BiMap;
+import java.util.*;
public interface ManagementService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java b/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
index a38aeca..ff7a2d5 100644
--- a/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
@@ -16,12 +16,8 @@
package org.usergrid.management;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import static org.usergrid.persistence.Schema.PROPERTY_PATH;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/UserInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/UserInfo.java b/stack/services/src/main/java/org/usergrid/management/UserInfo.java
index cbf27ef..7561ede 100644
--- a/stack/services/src/main/java/org/usergrid/management/UserInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/UserInfo.java
@@ -16,23 +16,14 @@
package org.usergrid.management;
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.Map;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlRootElement;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.persistence.Schema.PROPERTY_ACTIVATED;
-import static org.usergrid.persistence.Schema.PROPERTY_CONFIRMED;
-import static org.usergrid.persistence.Schema.PROPERTY_DISABLED;
-import static org.usergrid.persistence.Schema.PROPERTY_EMAIL;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_USERNAME;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.utils.ConversionUtils.getBoolean;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
index 98e70c7..4a3149d 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
@@ -16,15 +16,14 @@
package org.usergrid.management.cassandra;
-import java.util.Enumeration;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.AccountCreationProps;
-import static java.lang.Boolean.parseBoolean;
+import java.util.Enumeration;
+import java.util.Properties;
+import static java.lang.Boolean.parseBoolean;
import static org.apache.commons.lang.StringUtils.isBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
index f46cfbb..e36d65f 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
@@ -1,9 +1,7 @@
package org.usergrid.management.cassandra;
-import java.util.Arrays;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationCreator;
@@ -14,7 +12,8 @@ import org.usergrid.management.exceptions.ApplicationCreationException;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
-import com.google.common.base.Preconditions;
+import java.util.Arrays;
+import java.util.UUID;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
index 238ebdd..b917047 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -17,47 +17,20 @@
package org.usergrid.management.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.shiro.UnavailableSecurityManagerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ActivationState;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.ManagementService;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.OrganizationOwnerInfo;
-import org.usergrid.management.UserInfo;
-import org.usergrid.management.exceptions.DisabledAdminUserException;
-import org.usergrid.management.exceptions.DisabledAppUserException;
-import org.usergrid.management.exceptions.IncorrectPasswordException;
-import org.usergrid.management.exceptions.ManagementException;
-import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
-import org.usergrid.management.exceptions.UnableToLeaveOrganizationException;
-import org.usergrid.management.exceptions.UnactivatedAdminUserException;
-import org.usergrid.management.exceptions.UnactivatedAppUserException;
-import org.usergrid.management.exceptions.UnconfirmedAdminUserException;
-import org.usergrid.persistence.CredentialsInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Results;
+import org.usergrid.management.*;
+import org.usergrid.management.exceptions.*;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
@@ -79,92 +52,26 @@ import org.usergrid.security.tokens.TokenCategory;
import org.usergrid.security.tokens.TokenInfo;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.security.tokens.exceptions.TokenException;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceManagerFactory;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
-import org.usergrid.utils.ConversionUtils;
-import org.usergrid.utils.JsonUtils;
-import org.usergrid.utils.MailUtils;
-import org.usergrid.utils.StringUtils;
-import org.usergrid.utils.UUIDUtils;
+import org.usergrid.services.*;
+import org.usergrid.utils.*;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
-import org.apache.shiro.UnavailableSecurityManagerException;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static java.lang.Boolean.parseBoolean;
-
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.apache.commons.codec.digest.DigestUtils.sha;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.locking.LockHelper.getUniqueUpdateLock;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL;
-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_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_INVITED;
-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_FOOTER;
-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_ORGANIZATION_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATED;
-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_CONFIRMED_AWAITING_ACTIVATION;
-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_MAILER_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATION_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SETUP_TEST_ACCOUNT;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_ALLOWED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_PASSWORD;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_PASSWORD;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_USERNAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_APP;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ORGANIZATION;
-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.usergrid.management.AccountCreationProps.*;
import static org.usergrid.persistence.CredentialsInfo.getCredentialsSecret;
-import static org.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_PATH;
-import static org.usergrid.persistence.Schema.PROPERTY_SECRET;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ACTOR;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ACTOR_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_CATEGORY;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_CONTENT;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_DISPLAY_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ENTITY_TYPE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_ENTITY_TYPE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_TYPE;
+import static org.usergrid.persistence.entities.Activity.*;
import static org.usergrid.persistence.entities.Activity.PROPERTY_TITLE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_VERB;
-import static org.usergrid.security.AuthPrincipalType.ADMIN_USER;
-import static org.usergrid.security.AuthPrincipalType.APPLICATION;
-import static org.usergrid.security.AuthPrincipalType.APPLICATION_USER;
-import static org.usergrid.security.AuthPrincipalType.ORGANIZATION;
+import static org.usergrid.security.AuthPrincipalType.*;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getTypeFromClientId;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId;
import static org.usergrid.security.tokens.TokenCategory.ACCESS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java b/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
index 091092c..582e0d7 100644
--- a/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
+++ b/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
@@ -16,12 +16,12 @@
package org.usergrid.security;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import static org.usergrid.utils.CodecUtils.base64;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
index 47fcfee..ab0ce01 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
@@ -16,11 +16,11 @@
package org.usergrid.security.crypto;
-import java.util.UUID;
-
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
+import java.util.UUID;
+
/** @author tnine */
public interface EncryptionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
index 68cb9f0..28dd59f 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
@@ -16,20 +16,19 @@
package org.usergrid.security.crypto;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
+import javax.annotation.PostConstruct;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
index 230c85a..15c68ae 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
@@ -16,14 +16,14 @@
package org.usergrid.security.crypto.command;
-import java.nio.charset.Charset;
-import java.util.UUID;
-
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.utils.BCrypt;
+import java.nio.charset.Charset;
+import java.util.UUID;
+
import static org.apache.commons.codec.binary.Base64.decodeBase64;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
index 82e7a32..725d4a8 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
@@ -16,10 +16,10 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
import org.usergrid.persistence.CredentialsInfo;
+import java.util.UUID;
+
/**
* Simple chain of responsibility algorithm for password cryptography.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
index bdb04e9..9fb47a1 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
@@ -16,12 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
-import org.apache.commons.codec.digest.DigestUtils;
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
index f796a28..c84f3d0 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
@@ -16,11 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
+import java.util.UUID;
+
/**
* A no-op provider
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
index 22eebfa..f051dac 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
@@ -16,13 +16,13 @@
package org.usergrid.security.crypto.command;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.usergrid.security.salt.SaltProvider;
+
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.usergrid.security.salt.SaltProvider;
-
/**
* Class that provides salt options
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
index 77402a0..017faaf 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
@@ -16,14 +16,14 @@
package org.usergrid.security.crypto.command;
-import java.security.NoSuchAlgorithmException;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
/** @author tnine */
@Component("org.usergrid.security.crypto.command.Sha1HashCommand")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java b/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
index 28dd8fa..af00d52 100644
--- a/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
@@ -16,17 +16,16 @@
package org.usergrid.security.oauth;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.TreeMap;
+
@XmlRootElement
public class AccessInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java b/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
index aa035ba..320e341 100644
--- a/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
@@ -16,13 +16,13 @@
package org.usergrid.security.oauth;
-import java.util.UUID;
-
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.usergrid.security.AuthPrincipalType;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
public class ClientCredentialsInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
index 2015ba7..84752f9 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
@@ -1,15 +1,14 @@
package org.usergrid.security.providers;
-import java.util.Map;
-
-import org.usergrid.management.ManagementService;
-import org.usergrid.persistence.EntityManager;
-
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
+import org.usergrid.management.ManagementService;
+import org.usergrid.persistence.EntityManager;
+
+import java.util.Map;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
index 0881b24..8ce6086 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
@@ -1,11 +1,6 @@
package org.usergrid.security.providers;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ManagementService;
@@ -17,6 +12,10 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.utils.JsonUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import static org.usergrid.persistence.Schema.PROPERTY_MODIFIED;
import static org.usergrid.utils.ListUtils.anyNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
index 6e3dbe8..adc0432 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
@@ -1,12 +1,11 @@
package org.usergrid.security.providers;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.api.json.JSONConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ManagementService;
@@ -17,11 +16,10 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.utils.JsonUtils;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
import static org.usergrid.utils.ListUtils.anyNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
index a6de36c..b0a034b 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
@@ -1,12 +1,6 @@
package org.usergrid.security.providers;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +10,11 @@ import org.usergrid.persistence.Identifier;
import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
/**
* Provider implementation for accessing Ping Identity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
index c8c0233..2ac3dc5 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
@@ -1,11 +1,11 @@
package org.usergrid.security.providers;
-import java.util.Map;
-
import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
+import java.util.Map;
+
/** @author zznate */
public interface SignInAsProvider {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
index 7a6375e..1ab26ee 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
@@ -16,16 +16,15 @@
package org.usergrid.security.shiro;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.authz.permission.WildcardPermission;
import org.springframework.util.AntPathMatcher;
import org.usergrid.management.UserInfo;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.authz.permission.WildcardPermission;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class CustomPermission extends WildcardPermission {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
index ec44c7c..5063461 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
@@ -19,19 +19,8 @@ package org.usergrid.security.shiro;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.security.shiro.credentials.AdminUserAccessToken;
-import org.usergrid.security.shiro.credentials.AdminUserPassword;
-import org.usergrid.security.shiro.credentials.ApplicationAccessToken;
-import org.usergrid.security.shiro.credentials.ApplicationGuest;
-import org.usergrid.security.shiro.credentials.ApplicationUserAccessToken;
-import org.usergrid.security.shiro.credentials.OrganizationAccessToken;
-import org.usergrid.security.shiro.credentials.PrincipalCredentials;
-import org.usergrid.security.shiro.principals.AdminUserPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationGuestPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
-import org.usergrid.security.shiro.principals.OrganizationPrincipal;
-import org.usergrid.security.shiro.principals.PrincipalIdentifier;
+import org.usergrid.security.shiro.credentials.*;
+import org.usergrid.security.shiro.principals.*;
public class PrincipalCredentialsToken implements org.apache.shiro.authc.AuthenticationToken {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
index 03f9a5a..cb5f4fe 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
@@ -16,53 +16,10 @@
package org.usergrid.security.shiro;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.ManagementService;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.entities.Group;
-import org.usergrid.persistence.entities.Role;
-import org.usergrid.persistence.entities.User;
-import org.usergrid.security.shiro.credentials.AccessTokenCredentials;
-import org.usergrid.security.shiro.credentials.AdminUserAccessToken;
-import org.usergrid.security.shiro.credentials.AdminUserPassword;
-import org.usergrid.security.shiro.credentials.ApplicationAccessToken;
-import org.usergrid.security.shiro.credentials.ApplicationUserAccessToken;
-import org.usergrid.security.shiro.credentials.ClientCredentials;
-import org.usergrid.security.shiro.credentials.OrganizationAccessToken;
-import org.usergrid.security.shiro.credentials.PrincipalCredentials;
-import org.usergrid.security.shiro.principals.AdminUserPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationGuestPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
-import org.usergrid.security.shiro.principals.OrganizationPrincipal;
-import org.usergrid.security.shiro.principals.PrincipalIdentifier;
-import org.usergrid.security.tokens.TokenInfo;
-import org.usergrid.security.tokens.TokenService;
-
+import com.google.common.collect.HashBiMap;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.CredentialsException;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.*;
import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;
import org.apache.shiro.authc.credential.CredentialsMatcher;
import org.apache.shiro.authz.AuthorizationInfo;
@@ -73,8 +30,25 @@ import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.usergrid.management.*;
+import org.usergrid.persistence.*;
+import org.usergrid.persistence.Results.Level;
+import org.usergrid.persistence.entities.Group;
+import org.usergrid.persistence.entities.Role;
+import org.usergrid.persistence.entities.User;
+import org.usergrid.security.shiro.credentials.*;
+import org.usergrid.security.shiro.principals.*;
+import org.usergrid.security.tokens.TokenInfo;
+import org.usergrid.security.tokens.TokenService;
-import com.google.common.collect.HashBiMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;