usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [14/50] [abbrv] organize imports only
Date Thu, 06 Feb 2014 10:21:32 GMT
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
index 54c35a5..b0ab346 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
@@ -20,6 +20,9 @@
 package org.usergrid.cassandra;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
@@ -29,9 +32,6 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 /**
  * Finds currently available server ports.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
index ec31d90..9848d97 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
@@ -1,13 +1,10 @@
 package org.usergrid.cassandra;
 
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-
+import org.apache.cassandra.service.CassandraDaemon;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.math.RandomUtils;
 import org.junit.rules.ExternalResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,10 +12,12 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.yaml.snakeyaml.Yaml;
 
-import org.apache.cassandra.service.CassandraDaemon;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.math.RandomUtils;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
index 10874e9..abe0e31 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
@@ -1,13 +1,12 @@
 package org.usergrid.cassandra;
 
 
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.support.SubjectThreadState;
+import org.junit.rules.ExternalResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /** A {@link org.junit.rules.TestRule} that cleans up the Shiro Subject's ThreadState. */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
index 09fd8ec..1a72fe0 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
@@ -1,20 +1,15 @@
 package org.usergrid.cassandra;
 
 
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.RunnerScheduler;
 
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /** @author Mathieu Carbou (mathieu.carbou@gmail.com) */
 public class ConcurrentJunitRunner extends BlockJUnit4ClassRunner {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
index 9bbadd4..e3f9192 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
@@ -1,18 +1,6 @@
 package org.usergrid.cassandra;
 
 
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
 import org.junit.runner.Runner;
 import org.junit.runners.Suite;
@@ -20,6 +8,13 @@ import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.RunnerBuilder;
 import org.junit.runners.model.RunnerScheduler;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /** @author Mathieu Carbou (mathieu.carbou@gmail.com) */
 public final class ConcurrentSuite extends Suite {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java b/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
index bd51c8d..db2b406 100644
--- a/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
+++ b/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
@@ -1,12 +1,12 @@
 package org.usergrid.cassandra;
 
 
-import java.io.File;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+
 import static junit.framework.Assert.assertTrue;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java b/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
index ef110ff..a35c3ed 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
@@ -16,17 +16,11 @@
 package org.usergrid.tools;
 
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Schema;
@@ -38,11 +32,15 @@ import org.w3c.dom.Document;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.io.FileUtils;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
 
 import static org.usergrid.utils.StringUtils.readClasspathFileAsString;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java b/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
index 97ad9e1..0973452 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
@@ -16,36 +16,21 @@
 package org.usergrid.tools;
 
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.ApplicationInfo;
-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.SimpleEntityRef;
-import org.usergrid.persistence.cassandra.CassandraService;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.persistence.*;
+import org.usergrid.persistence.cassandra.CassandraService;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.util.*;
+import java.util.Map.Entry;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java b/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
index d6286ae..f7de2dd 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
@@ -16,19 +16,18 @@
 package org.usergrid.tools;
 
 
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.EntityManager;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.entities.Application;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.util.Map.Entry;
+import java.util.UUID;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/Cli.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Cli.java b/stack/tools/src/main/java/org/usergrid/tools/Cli.java
index ce55621..3e59f70 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Cli.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Cli.java
@@ -16,33 +16,27 @@
 package org.usergrid.tools;
 
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.codehaus.jackson.JsonFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceParameter;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
 import org.usergrid.utils.HttpUtils;
 import org.usergrid.utils.JsonUtils;
 import org.usergrid.utils.UUIDUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/Command.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Command.java b/stack/tools/src/main/java/org/usergrid/tools/Command.java
index e674dea..40b90d7 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Command.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Command.java
@@ -16,12 +16,11 @@
 package org.usergrid.tools;
 
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
+import org.apache.commons.beanutils.MethodUtils;
 import org.springframework.util.StringUtils;
 
-import org.apache.commons.beanutils.MethodUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 
 
 public class Command {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/CredExport.java b/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
index c022b94..bb5699f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
@@ -16,16 +16,15 @@
 package org.usergrid.tools;
 
 
-import java.util.UUID;
-
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.utils.UUIDUtils;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.management.OrganizationInfo;
+import org.usergrid.utils.UUIDUtils;
+
+import java.util.UUID;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java b/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
index d08d1ed..8ae1c6e 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
@@ -16,36 +16,25 @@
 package org.usergrid.tools;
 
 
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.OrganizationInfo;
 import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.entities.Application;
 import org.usergrid.persistence.entities.User;
 import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
 import org.usergrid.utils.JsonUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import java.io.FileWriter;
+import java.util.*;
 
 import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java b/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
index d5bf2f2..2fee736 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
@@ -16,32 +16,26 @@
 package org.usergrid.tools;
 
 
-import java.io.FileWriter;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.OrganizationInfo;
 import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.entities.Application;
 import org.usergrid.utils.JsonUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import java.io.FileWriter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java b/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
index f090a23..ab7c649 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
@@ -16,12 +16,13 @@
 package org.usergrid.tools;
 
 
-import java.nio.ByteBuffer;
-import java.util.LinkedHashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -37,14 +38,11 @@ import org.usergrid.persistence.query.ir.result.ScanColumnTransformer;
 import org.usergrid.persistence.query.ir.result.SliceIterator;
 import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.LinkedHashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
 
 import static me.prettyprint.hector.api.factory.HFactory.createMutator;
 import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java b/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
index 917206e..c2f5216 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
@@ -16,14 +16,14 @@
 package org.usergrid.tools;
 
 
-import java.nio.ByteBuffer;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.DynamicEntity;
@@ -32,15 +32,13 @@ import org.usergrid.persistence.IndexBucketLocator.IndexType;
 import org.usergrid.persistence.cassandra.EntityManagerImpl;
 import org.usergrid.utils.UUIDUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import static me.prettyprint.hector.api.factory.HFactory.createMutator;
 import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java b/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
index 9483ddc..05c20d0 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
@@ -16,35 +16,11 @@
 package org.usergrid.tools;
 
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-import org.usergrid.persistence.IndexBucketLocator;
-import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.cassandra.EntityManagerImpl;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
 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 me.prettyprint.cassandra.serializers.ByteBufferSerializer;
 import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
 import me.prettyprint.hector.api.Keyspace;
@@ -56,6 +32,23 @@ import me.prettyprint.hector.api.beans.Rows;
 import me.prettyprint.hector.api.factory.HFactory;
 import me.prettyprint.hector.api.query.MultigetSliceQuery;
 import me.prettyprint.hector.api.query.QueryResult;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.IndexBucketLocator.IndexType;
+import org.usergrid.persistence.cassandra.EntityManagerImpl;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.*;
 
 import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
 import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java b/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
index a99ea3a..0d3159f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
@@ -1,27 +1,19 @@
 package org.usergrid.tools;
 
 
-import java.io.File;
-import java.util.Map;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.DynamicEntity;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.PagingResultsIterator;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.persistence.*;
 
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.io.File;
+import java.util.Map;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/Export.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Export.java b/stack/tools/src/main/java/org/usergrid/tools/Export.java
index f35da6b..15532dc 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Export.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Export.java
@@ -16,15 +16,8 @@
 package org.usergrid.tools;
 
 
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import org.apache.commons.cli.CommandLine;
 import org.codehaus.jackson.JsonEncoding;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -32,19 +25,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.OrganizationInfo;
 import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.Results.Level;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.tools.bean.ExportOrg;
 import org.usergrid.utils.JsonUtils;
 
-import org.apache.commons.cli.CommandLine;
-
-import com.google.common.collect.BiMap;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+import java.util.Map.Entry;
 
 
 public class Export extends ExportingToolBase {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java b/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
index 6e5a9bc..6213904 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
@@ -16,8 +16,6 @@
 package org.usergrid.tools;
 
 
-import java.util.UUID;
-
 import org.usergrid.management.ManagementService;
 import org.usergrid.management.OrganizationOwnerInfo;
 import org.usergrid.persistence.Entity;
@@ -26,6 +24,8 @@ import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.persistence.entities.Activity;
 import org.usergrid.persistence.entities.User;
 
+import java.util.UUID;
+
 import static org.junit.Assert.assertNotNull;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java b/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
index 88ee07a..c7864b5 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
@@ -14,11 +14,10 @@
 package org.usergrid.tools;
 
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.impl.DefaultPrettyPrinter;
@@ -27,10 +26,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.utils.ConversionUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.UUID;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/Import.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Import.java b/stack/tools/src/main/java/org/usergrid/tools/Import.java
index 974cb51..7d9f346 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Import.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Import.java
@@ -16,14 +16,11 @@
 package org.usergrid.tools;
 
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.filefilter.PrefixFileFilter;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonParser;
 import org.codehaus.jackson.JsonToken;
@@ -42,11 +39,9 @@ import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsExceptio
 import org.usergrid.tools.bean.ExportOrg;
 import org.usergrid.utils.JsonUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.io.filefilter.PrefixFileFilter;
+import java.io.File;
+import java.util.*;
+import java.util.Map.Entry;
 
 import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
 import static org.usergrid.persistence.Schema.PROPERTY_UUID;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java b/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
index ffdb3e3..20da217 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
@@ -16,6 +16,14 @@
 package org.usergrid.tools;
 
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.utils.JsonUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -24,15 +32,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.utils.JsonUtils;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
 
 public class ImportFB extends ToolBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java b/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
index fc33c56..a78a48d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
@@ -16,13 +16,11 @@
 package org.usergrid.tools;
 
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Entity;
@@ -33,12 +31,8 @@ import org.usergrid.persistence.entities.Application;
 import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
 import org.usergrid.utils.UUIDUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.util.*;
+import java.util.Map.Entry;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Metrics.java b/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
index 5d36b81..f508951 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
@@ -1,15 +1,15 @@
 package org.usergrid.tools;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Ordering;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.lang.time.DateUtils;
 import org.codehaus.jackson.JsonGenerator;
 import org.usergrid.management.ApplicationInfo;
 import org.usergrid.management.OrganizationInfo;
@@ -21,16 +21,7 @@ import org.usergrid.tools.bean.MetricQuery;
 import org.usergrid.tools.bean.MetricSort;
 import org.usergrid.utils.TimeUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.lang.time.DateUtils;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Ordering;
+import java.util.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java b/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
index f5c2dc6..7834652 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
@@ -1,23 +1,21 @@
 package org.usergrid.tools;
 
 
-import java.io.FileWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
+import au.com.bytecode.opencsv.CSVWriter;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.usergrid.management.UserInfo;
 import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.EntityManager;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.Results;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import au.com.bytecode.opencsv.CSVWriter;
+import java.io.FileWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
 
 import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java b/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
index c30039d..ec8b67f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
@@ -16,10 +16,10 @@
 package org.usergrid.tools;
 
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.OrganizationInfo;
@@ -32,10 +32,9 @@ import org.usergrid.services.ServiceManager;
 import org.usergrid.services.ServiceRequest;
 import org.usergrid.services.ServiceResults;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+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/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java b/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
index 34294df..93da3a5 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
@@ -16,22 +16,17 @@
 package org.usergrid.tools;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.cassandra.ManagementServiceImpl;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.AccountCreationProps;
+import org.usergrid.management.cassandra.ManagementServiceImpl;
 
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-
-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.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java b/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
index 87f6921..6b810cc 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
@@ -16,13 +16,12 @@
 package org.usergrid.tools;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class SetupDB extends ToolBase {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/Test.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Test.java b/stack/tools/src/main/java/org/usergrid/tools/Test.java
index e1b6166..e1b0309 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Test.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Test.java
@@ -16,13 +16,12 @@
 package org.usergrid.tools;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class Test extends ToolBase {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java b/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
index 3de74c8..af85679 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
@@ -17,8 +17,9 @@
 package org.usergrid.tools;
 
 
-import java.util.Properties;
-
+import me.prettyprint.hector.testutils.EmbeddedServerHelper;
+import org.apache.commons.cli.*;
+import org.apache.commons.lang.ClassUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,17 +33,7 @@ import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
 import org.usergrid.persistence.cassandra.Setup;
 import org.usergrid.services.ServiceManagerFactory;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.ClassUtils;
-
-import me.prettyprint.hector.testutils.EmbeddedServerHelper;
+import java.util.Properties;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java b/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
index 1b5dff7..511d368 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
@@ -16,24 +16,20 @@
 package org.usergrid.tools;
 
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.IndexBucketLocator.IndexType;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.cassandra.EntityManagerImpl;
@@ -44,17 +40,9 @@ import org.usergrid.persistence.query.ir.result.SliceIterator;
 import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
 import org.usergrid.persistence.schema.CollectionInfo;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
 
 import static me.prettyprint.hector.api.factory.HFactory.createMutator;
 import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/UserManager.java b/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
index 727fde5..cb7095d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
@@ -1,10 +1,9 @@
 package org.usergrid.tools;
 
 
-import org.usergrid.management.UserInfo;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
+import org.usergrid.management.UserInfo;
 
 import static org.usergrid.utils.JsonUtils.mapToFormattedJsonString;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java b/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
index d6caed2..85c4a2c 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
@@ -17,27 +17,16 @@
 package org.usergrid.tools;
 
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import au.com.bytecode.opencsv.CSVReader;
+import au.com.bytecode.opencsv.CSVWriter;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
 import org.jclouds.ContextBuilder;
 import org.jclouds.blobstore.AsyncBlobStore;
 import org.jclouds.blobstore.BlobStoreContext;
@@ -50,28 +39,20 @@ import org.jclouds.netty.config.NettyPayloadModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.management.OrganizationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-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.entities.Application;
 import org.usergrid.persistence.schema.CollectionInfo;
 import org.usergrid.utils.InflectionUtils;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Module;
-
-import au.com.bytecode.opencsv.CSVReader;
-import au.com.bytecode.opencsv.CSVWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
 
 import static org.usergrid.persistence.Schema.getDefaultSchema;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java b/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
index 2c75e81..a4128a0 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
@@ -14,15 +14,14 @@
 package org.usergrid.tools;
 
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.io.IOUtils;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
 
 
 /** Upserts data from files found in an S3 bucket. */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
index 3a1b4ca..cb67f16 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
@@ -16,13 +16,13 @@
 package org.usergrid.tools.apidoc.swagger;
 
 
-import java.util.List;
-
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.usergrid.utils.JsonUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.util.List;
+
 import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
index 1370fbf..1a37142 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
@@ -16,19 +16,18 @@
 package org.usergrid.tools.apidoc.swagger;
 
 
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.usergrid.utils.JsonUtils;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.util.List;
+import java.util.Map;
+
 import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
index 8c56ab6..c0acb89 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
@@ -16,13 +16,13 @@
 package org.usergrid.tools.apidoc.swagger;
 
 
-import java.util.List;
-
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.usergrid.utils.JsonUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.util.List;
+
 import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
index bbe549c..8fa7025 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
@@ -16,11 +16,11 @@
 package org.usergrid.tools.apidoc.swagger;
 
 
-import java.util.List;
-
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.usergrid.utils.JsonUtils;
 
+import java.util.List;
+
 import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java b/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
index fc5a21b..4198e88 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
@@ -16,11 +16,11 @@
 package org.usergrid.tools.bean;
 
 
+import org.usergrid.management.OrganizationInfo;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.usergrid.management.OrganizationInfo;
-
 
 /** @author tnine */
 public class ExportOrg extends OrganizationInfo {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
index dd4870f..8fb11c8 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
@@ -1,14 +1,13 @@
 package org.usergrid.tools.bean;
 
 
-import java.util.List;
-import java.util.UUID;
-
-import org.usergrid.persistence.AggregateCounter;
-
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import org.usergrid.persistence.AggregateCounter;
+
+import java.util.List;
+import java.util.UUID;
 
 
 /** @author zznate */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
index 117c635..aaa18d3 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
@@ -1,19 +1,13 @@
 package org.usergrid.tools.bean;
 
 
+import com.google.common.base.Preconditions;
+import org.usergrid.persistence.*;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import org.usergrid.persistence.AggregateCounter;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
-import com.google.common.base.Preconditions;
-
 
 /** @author zznate */
 public class MetricQuery {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
index 2e3c0c1..009f39b 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
@@ -16,31 +16,16 @@
 package org.usergrid.websocket;
 
 
-import java.security.MessageDigest;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.subject.Subject;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.*;
 import org.jboss.netty.channel.group.ChannelGroup;
 import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.codec.http.*;
 import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
 import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.QueryStringDecoder;
 import org.jboss.netty.handler.codec.http.websocket.DefaultWebSocketFrame;
 import org.jboss.netty.handler.codec.http.websocket.WebSocketFrame;
 import org.jboss.netty.handler.codec.http.websocket.WebSocketFrameDecoder;
@@ -52,23 +37,12 @@ import org.usergrid.management.ManagementService;
 import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.services.ServiceManagerFactory;
 
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.subject.Subject;
+import java.security.MessageDigest;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
-import static org.apache.commons.lang.StringUtils.isEmpty;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.split;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY1;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY2;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_PROTOCOL;
+import static org.apache.commons.lang.StringUtils.*;
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.isKeepAlive;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.setContentLength;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
index 3731609..da2e72a 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
@@ -31,10 +31,9 @@
 package org.usergrid.websocket;
 
 
-import java.net.InetSocketAddress;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.realm.Realm;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
@@ -51,9 +50,9 @@ import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
 import org.usergrid.services.ServiceManagerFactory;
 
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.realm.Realm;
+import java.net.InetSocketAddress;
+import java.util.Properties;
+import java.util.concurrent.Executors;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
index ed88120..f296521 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
@@ -16,8 +16,7 @@
 package org.usergrid.websocket;
 
 
-import javax.net.ssl.SSLEngine;
-
+import org.apache.shiro.mgt.SessionsSecurityManager;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
@@ -29,7 +28,7 @@ import org.usergrid.management.ManagementService;
 import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.services.ServiceManagerFactory;
 
-import org.apache.shiro.mgt.SessionsSecurityManager;
+import javax.net.ssl.SSLEngine;
 
 import static org.jboss.netty.channel.Channels.pipeline;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
index 2780583..9ff6156 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
@@ -16,11 +16,10 @@
 package org.usergrid.websocket;
 
 
-import java.security.KeyStore;
-import java.security.Security;
-
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
+import java.security.KeyStore;
+import java.security.Security;
 
 
 public class WebSocketSslContextFactory {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcf8e3c2/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java b/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
index 0dcf495..367b3d1 100644
--- a/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
+++ b/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
@@ -16,19 +16,18 @@
 package org.usergrid.websocket;
 
 
-import java.util.Date;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
 
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.util.Date;
+
 
 public class SimpleMessageProducer {
 


Mime
View raw message