usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [19/23] organize imports only
Date Sun, 19 Jan 2014 10:21:06 GMT
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSetup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSetup.java b/stack/core/src/test/java/org/usergrid/CoreITSetup.java
index 57dad2b..72958e0 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSetup.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSetup.java
@@ -16,14 +16,14 @@
 package org.usergrid;
 
 
-import java.util.UUID;
-
 import org.junit.rules.TestRule;
 import org.usergrid.mq.QueueManagerFactory;
 import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.persistence.IndexBucketLocator;
 import org.usergrid.persistence.cassandra.CassandraService;
 
+import java.util.UUID;
+
 
 public interface CoreITSetup extends TestRule {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java b/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
index 038bd85..5b20946 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
@@ -1,8 +1,6 @@
 package org.usergrid;
 
 
-import java.util.UUID;
-
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
@@ -14,6 +12,8 @@ import org.usergrid.persistence.IndexBucketLocator;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.utils.JsonUtils;
 
+import java.util.UUID;
+
 
 public class CoreITSetupImpl implements CoreITSetup {
     private static final Logger LOG = LoggerFactory.getLogger( CoreITSetupImpl.class );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSuite.java b/stack/core/src/test/java/org/usergrid/CoreITSuite.java
index 3efeb7e..d769e6e 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSuite.java
@@ -8,15 +8,7 @@ import org.usergrid.cassandra.CassandraResource;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.locking.cassandra.HectorLockManagerIT;
 import org.usergrid.mq.MessagesIT;
-import org.usergrid.persistence.CollectionIT;
-import org.usergrid.persistence.CounterIT;
-import org.usergrid.persistence.EntityConnectionsIT;
-import org.usergrid.persistence.EntityDictionaryIT;
-import org.usergrid.persistence.EntityManagerIT;
-import org.usergrid.persistence.GeoIT;
-import org.usergrid.persistence.IndexIT;
-import org.usergrid.persistence.PathQueryIT;
-import org.usergrid.persistence.PermissionsIT;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.cassandra.EntityManagerFactoryImplIT;
 import org.usergrid.system.UsergridSystemMonitorIT;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreTestSuite.java b/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
index 71064ea..fed5bff 100644
--- a/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
@@ -21,11 +21,7 @@ import org.junit.runners.Suite;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.locking.zookeeper.ZookeeperLockManagerTest;
 import org.usergrid.mq.QueuePathsTest;
-import org.usergrid.persistence.EntityTest;
-import org.usergrid.persistence.QueryTest;
-import org.usergrid.persistence.QueryUtilsTest;
-import org.usergrid.persistence.SchemaTest;
-import org.usergrid.persistence.UtilsTest;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.cassandra.QueryProcessorTest;
 import org.usergrid.persistence.cassandra.SimpleIndexBucketLocatorImplTest;
 import org.usergrid.persistence.query.ir.result.IntersectionIteratorTest;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java b/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
index 186ea71..f34094d 100644
--- a/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
@@ -1,11 +1,10 @@
 package org.usergrid.batch;
 
 
+import com.google.common.base.CharMatcher;
 import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 
-import com.google.common.base.CharMatcher;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java b/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
index f1eec0f..47ab071 100644
--- a/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
@@ -1,8 +1,6 @@
 package org.usergrid.batch;
 
 
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.batch.JobExecution.Status;
 import org.usergrid.batch.repository.JobDescriptor;
@@ -10,6 +8,8 @@ import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java b/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
index a87eb78..62cfda0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
+++ b/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
@@ -1,12 +1,12 @@
 package org.usergrid.batch;
 
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.junit.Ignore;
 import org.usergrid.batch.repository.JobDescriptor;
 
+import java.util.Arrays;
+import java.util.List;
+
 
 /** @author zznate */
 @Ignore

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
index 6c29c05..42b7765 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
@@ -4,14 +4,7 @@ package org.usergrid.batch;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import org.usergrid.batch.job.SchedulerRuntime1IT;
-import org.usergrid.batch.job.SchedulerRuntime2IT;
-import org.usergrid.batch.job.SchedulerRuntime3IT;
-import org.usergrid.batch.job.SchedulerRuntime4IT;
-import org.usergrid.batch.job.SchedulerRuntime5IT;
-import org.usergrid.batch.job.SchedulerRuntime6IT;
-import org.usergrid.batch.job.SchedulerRuntime7IT;
-import org.usergrid.batch.job.SchedulerRuntime8IT;
+import org.usergrid.batch.job.*;
 import org.usergrid.cassandra.CassandraResource;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.cassandra.ConcurrentSuite;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
index 7562a11..e83a59f 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
@@ -3,9 +3,6 @@ package org.usergrid.batch;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import org.usergrid.batch.AppArgsTest;
-import org.usergrid.batch.BulkJobExecutionUnitTest;
-import org.usergrid.batch.UsergridJobFactoryTest;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.cassandra.ConcurrentSuite;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
index 069e3f1..f7bf908 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
@@ -5,14 +5,7 @@ import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import org.usergrid.batch.job.SchedulerRuntime1IT;
-import org.usergrid.batch.job.SchedulerRuntime2IT;
-import org.usergrid.batch.job.SchedulerRuntime3IT;
-import org.usergrid.batch.job.SchedulerRuntime4IT;
-import org.usergrid.batch.job.SchedulerRuntime5IT;
-import org.usergrid.batch.job.SchedulerRuntime6IT;
-import org.usergrid.batch.job.SchedulerRuntime7IT;
-import org.usergrid.batch.job.SchedulerRuntime8IT;
+import org.usergrid.batch.job.*;
 import org.usergrid.cassandra.CassandraResource;
 import org.usergrid.cassandra.Concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
index 7eeef42..38306b7 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
@@ -3,9 +3,6 @@ package org.usergrid.batch;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import org.usergrid.batch.AppArgsTest;
-import org.usergrid.batch.BulkJobExecutionUnitTest;
-import org.usergrid.batch.UsergridJobFactoryTest;
 import org.usergrid.cassandra.Concurrent;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java b/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
index 4228ea6..d3f6ef3 100644
--- a/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
@@ -1,13 +1,13 @@
 package org.usergrid.batch;
 
 
-import java.util.List;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.batch.repository.JobDescriptor;
 import org.usergrid.cassandra.Concurrent;
 
+import java.util.List;
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
index 5bc9d51..e85d505 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
@@ -17,16 +17,14 @@
 package org.usergrid.batch.job;
 
 
-import java.util.Properties;
-
 import com.google.common.util.concurrent.Service.State;
-
+import org.junit.Before;
 import org.usergrid.batch.SchedulerITSuite;
 import org.usergrid.batch.service.JobSchedulerService;
 import org.usergrid.batch.service.SchedulerService;
 import org.usergrid.cassandra.CassandraResource;
 
-import org.junit.Before;
+import java.util.Properties;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java b/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
index 8ab0f61..81ba3e0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
@@ -17,14 +17,14 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Ignore;
 import org.springframework.stereotype.Component;
 import org.usergrid.batch.Job;
 import org.usergrid.batch.JobExecution;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * A simple job that does nothing but increment an atomic counter

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java b/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
index a4e93bb..7f871b0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
@@ -17,9 +17,6 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ import org.springframework.stereotype.Component;
 import org.usergrid.batch.Job;
 import org.usergrid.batch.JobExecution;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * A simple job that does nothing but increment an atomic counter

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java b/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
index d30a97e..b813fed 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
@@ -17,9 +17,6 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ import org.springframework.stereotype.Component;
 import org.usergrid.batch.Job;
 import org.usergrid.batch.JobExecution;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * A simple job that does nothing but increment an atomic counter and use heartbeat delay

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java b/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
index 330b143..08f7670 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
@@ -17,14 +17,14 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Ignore;
 import org.springframework.stereotype.Component;
 import org.usergrid.batch.Job;
 import org.usergrid.batch.JobExecution;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * A simple job that does nothing but increment an atomic counter

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
index 7970c85..e39ba54 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
@@ -17,15 +17,15 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.usergrid.batch.JobExecution;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * A job that will sleep for the amount of time specified. Used to check that our counter is only ever run once.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
index 09d2a20..0b694f4 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
@@ -17,15 +17,15 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.usergrid.batch.JobExecution;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * A job that will sleep for the amount of time specified. Used to check that our counter is only ever run once.  Checks

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
index 8b7ec6f..763608c 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
@@ -17,17 +17,17 @@
 package org.usergrid.batch.job;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 
 /**
  * Class to test job runtimes

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
index bc3c3cd..4d28fe0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
@@ -17,17 +17,17 @@
 package org.usergrid.batch.job;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 
 /**
  * Class to test job runtimes

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
index 304f5af..65d2872 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
@@ -17,12 +17,11 @@
 package org.usergrid.batch.job;
 
 
+import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
index 67dc405..eaa60b6 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
@@ -17,12 +17,11 @@
 package org.usergrid.batch.job;
 
 
+import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
index b88bee5..efd9c62 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
@@ -17,12 +17,11 @@
 package org.usergrid.batch.job;
 
 
+import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
index 2da11cc..ddf50b6 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
@@ -17,18 +17,14 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.TimeUnit;
-
+import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
index c017d82..34d33e7 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
@@ -17,12 +17,11 @@
 package org.usergrid.batch.job;
 
 
+import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
index cdea0cf..5833b85 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
@@ -17,15 +17,14 @@
 package org.usergrid.batch.job;
 
 
-import java.util.UUID;
-
+import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.Results;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.utils.UUIDUtils;
 
-import org.junit.Test;
+import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
index 8932014..ad1a94d 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
@@ -18,13 +18,13 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.batch.JobExecution;
 import org.usergrid.batch.service.JobListener;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /**
  * Implementation of the JobListener for tests.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
index 0b47b1c..8405a10 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
@@ -18,13 +18,12 @@
 package org.usergrid.batch.job;
 
 
-import org.usergrid.batch.JobExecution;
-import org.usergrid.persistence.entities.JobData;
-import org.usergrid.persistence.entities.JobStat;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usergrid.batch.JobExecution;
+import org.usergrid.persistence.entities.JobData;
+import org.usergrid.persistence.entities.JobStat;
 
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java b/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
index 63a065e..f4c6bef 100644
--- a/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
+++ b/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
@@ -16,9 +16,7 @@
 package org.usergrid.clustering.hazelcast;
 
 
-import java.util.Collection;
-import java.util.Set;
-
+import com.hazelcast.core.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -28,13 +26,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.ITopic;
-import com.hazelcast.core.Instance;
-import com.hazelcast.core.InstanceEvent;
-import com.hazelcast.core.InstanceListener;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MessageListener;
+import java.util.Collection;
+import java.util.Set;
 
 
 @Ignore

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
index f273860..5f79104 100644
--- a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
@@ -1,24 +1,19 @@
 package org.usergrid.count;
 
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.count.common.Count;
+import static org.junit.Assert.assertEquals;
 
 
 /** @author zznate */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java b/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
index f3cc29d..e0aed8c 100644
--- a/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
@@ -18,7 +18,6 @@ package org.usergrid.count;
 
 import org.junit.Before;
 import org.junit.Test;
-
 import org.usergrid.count.common.Count;
 
 import static junit.framework.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java b/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
index fc82ede..45d9875 100644
--- a/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
@@ -16,18 +16,9 @@
 package org.usergrid.locking.cassandra;
 
 
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
 import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
 import me.prettyprint.hector.api.ConsistencyLevelPolicy;
 import me.prettyprint.hector.api.HConsistencyLevel;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -40,6 +31,9 @@ import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.UUID;
+import java.util.concurrent.*;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java b/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
index c8e3bbd..0b6e3cb 100644
--- a/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
+++ b/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
@@ -16,14 +16,6 @@
 package org.usergrid.locking.singlenode;
 
 
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -34,6 +26,9 @@ import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.UUID;
+import java.util.concurrent.*;
+
 import static org.junit.Assert.assertTrue;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
index 93bc508..f4211f2 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
@@ -16,16 +16,15 @@
 package org.usergrid.locking.zookeeper;
 
 
-import java.io.File;
-import java.net.InetSocketAddress;
-
+import org.apache.zookeeper.server.ServerConfig;
+import org.apache.zookeeper.server.ZooKeeperServerMain;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.zookeeper.server.ServerConfig;
-import org.apache.zookeeper.server.ZooKeeperServerMain;
+import java.io.File;
+import java.net.InetSocketAddress;
 
 
 /** Base test class for ZooKeeper tests. */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
index 49e0e31..04143a5 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
@@ -16,15 +16,10 @@
 package org.usergrid.locking.zookeeper;
 
 
-import java.io.IOException;
-
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.*;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
+
+import java.io.IOException;
 
 
 /** Util for uploading and updating files in ZooKeeper. */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
index 9cefa00..2837afa 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
@@ -16,25 +16,16 @@
 package org.usergrid.locking.zookeeper;
 
 
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.UUID;
+import java.util.concurrent.*;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java b/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
index 58c5b95..6dcf4d0 100644
--- a/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
+++ b/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
@@ -16,10 +16,6 @@
 package org.usergrid.mq;
 
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,10 +23,11 @@ import org.usergrid.AbstractCoreIT;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.utils.JsonUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
index 08c69af..c05247f 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
@@ -16,13 +16,6 @@
 package org.usergrid.persistence;
 
 
-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 org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -38,11 +31,9 @@ import org.usergrid.persistence.exceptions.NoIndexException;
 import org.usergrid.utils.JsonUtils;
 import org.usergrid.utils.UUIDUtils;
 
-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 java.util.*;
+
+import static org.junit.Assert.*;
 import static org.usergrid.utils.MapUtils.hashMap;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
index 4c9db0a..f3a47c3 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
@@ -1,6 +1,7 @@
 package org.usergrid.persistence;
 
 
+import me.prettyprint.hector.api.Cluster;
 import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,8 +9,6 @@ import org.usergrid.cassandra.SchemaManager;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.cassandra.Setup;
 
-import me.prettyprint.hector.api.Cluster;
-
 
 /** @author zznate */
 @Ignore

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java b/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
index 62483ab..ff73bd1 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
@@ -16,11 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -28,12 +23,16 @@ import org.slf4j.LoggerFactory;
 import org.usergrid.AbstractCoreIT;
 import org.usergrid.CoreITSuite;
 import org.usergrid.cassandra.Concurrent;
+import org.usergrid.count.SimpleBatcher;
 import org.usergrid.persistence.entities.Event;
 import org.usergrid.persistence.entities.Group;
 import org.usergrid.persistence.entities.User;
 import org.usergrid.utils.JsonUtils;
 
-import org.usergrid.count.SimpleBatcher;
+import java.util.HashMap;
+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/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
index e2b6df3..17866cd 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
@@ -16,12 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,10 +24,9 @@ import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.Results.Level;
 import org.usergrid.persistence.entities.User;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
index 0136f65..2164469 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
@@ -16,10 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,9 +24,11 @@ import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.Application;
 import org.usergrid.utils.JsonUtils;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
index c71c90e..da29648 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
@@ -16,15 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -36,10 +27,10 @@ import org.usergrid.persistence.entities.Group;
 import org.usergrid.persistence.entities.User;
 import org.usergrid.utils.UUIDUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.junit.Assert.*;
 import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java b/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
index fad93dd..e33e5d7 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
@@ -16,10 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +24,10 @@ import org.usergrid.persistence.entities.Group;
 import org.usergrid.persistence.entities.User;
 import org.usergrid.utils.JsonUtils;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java b/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
index 5ac304e..2e15ceb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
@@ -16,13 +16,6 @@
 package org.usergrid.persistence;
 
 
-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 org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +29,8 @@ import org.usergrid.persistence.query.ir.QuerySlice;
 import org.usergrid.persistence.query.ir.result.GeoIterator;
 import org.usergrid.utils.MapUtils;
 
+import java.util.*;
+
 import static junit.framework.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java b/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
index e66575d..96b3f8a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
@@ -16,11 +16,9 @@
 package org.usergrid.persistence;
 
 
-import java.nio.ByteBuffer;
-import java.util.LinkedHashMap;
-import java.util.Map;
-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.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,14 +32,13 @@ import org.usergrid.persistence.cassandra.RelationManagerImpl;
 import org.usergrid.utils.JsonUtils;
 import org.usergrid.utils.UUIDUtils;
 
-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.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
 
 import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java b/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
index 4252749..9a489de 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
@@ -1,17 +1,11 @@
 package org.usergrid.persistence;
 
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.AbstractCoreIT;
 
+import java.util.*;
+
 import static org.junit.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java b/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
index d416c13..c5cb9fb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
@@ -16,12 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,9 +23,9 @@ import org.usergrid.AbstractCoreIT;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.entities.Role;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import java.util.*;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java b/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
index 0bd48fb..0e0526a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
@@ -16,10 +16,6 @@
 package org.usergrid.persistence;
 
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,22 +23,13 @@ import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.Query.SortDirection;
 import org.usergrid.persistence.Query.SortPredicate;
 import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.FloatLiteral;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.LongLiteral;
-import org.usergrid.persistence.query.tree.NotOperand;
-import org.usergrid.persistence.query.tree.StringLiteral;
-import org.usergrid.persistence.query.tree.WithinOperand;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import org.usergrid.persistence.query.tree.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java b/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
index 78ac217..addc516 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
@@ -1,14 +1,14 @@
 package org.usergrid.persistence;
 
 
+import org.junit.Test;
+import org.usergrid.cassandra.Concurrent;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
-import org.usergrid.cassandra.Concurrent;
-
 import static org.junit.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java b/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
index 6d9cdfb..920dff6 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
@@ -16,15 +16,14 @@
 package org.usergrid.persistence;
 
 
-import java.util.List;
-
+import io.baas.Simple;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.entities.SampleEntity;
 
-import io.baas.Simple;
+import java.util.List;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 72b80c0..cb2f9a1 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -16,17 +16,7 @@
 package org.usergrid.persistence.cassandra;
 
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.AbstractCoreIT;
@@ -40,10 +30,9 @@ import org.usergrid.persistence.cassandra.util.TraceTag;
 import org.usergrid.persistence.cassandra.util.TraceTagManager;
 import org.usergrid.persistence.cassandra.util.TraceTagReporter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
 
 
 @Concurrent()

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
index 1d15f66..e418c87 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
@@ -16,29 +16,21 @@
 package org.usergrid.persistence.cassandra;
 
 
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.UUID;
-
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.TokenRewriteStream;
 import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.exceptions.PersistenceException;
-import org.usergrid.persistence.query.ir.AndNode;
-import org.usergrid.persistence.query.ir.NotNode;
-import org.usergrid.persistence.query.ir.OrNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SliceNode;
-import org.usergrid.persistence.query.ir.WithinNode;
+import org.usergrid.persistence.query.ir.*;
 import org.usergrid.persistence.query.tree.QueryFilterLexer;
 import org.usergrid.persistence.query.tree.QueryFilterParser;
 
-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 java.math.BigInteger;
+import java.util.Iterator;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
index 71c3ec6..5073ad3 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
@@ -16,21 +16,16 @@
 package org.usergrid.persistence.cassandra;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
 import org.junit.Test;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.persistence.IndexBucketLocator.IndexType;
 import org.usergrid.utils.UUIDUtils;
 
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java b/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
index cb19b46..c58b403 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
@@ -16,16 +16,15 @@
 package org.usergrid.persistence.entities;
 
 
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 import org.usergrid.persistence.TypedEntity;
 import org.usergrid.persistence.annotations.EntityDictionary;
 
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
 
 @XmlRootElement
 public class SampleEntity extends TypedEntity {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java b/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
index b783406..82fbcbb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
@@ -16,12 +16,12 @@
 package org.usergrid.persistence.geo;
 
 
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.persistence.geo.model.Point;
 import org.usergrid.utils.UUIDUtils;
 
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
index d1aed3a..a78056b 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
@@ -16,15 +16,6 @@
 package org.usergrid.persistence.query;
 
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.slf4j.Logger;
@@ -37,6 +28,8 @@ import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.Results;
 
+import java.util.*;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
index 5f554d3..adc1f4f 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
@@ -16,18 +16,14 @@
 package org.usergrid.persistence.query;
 
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.Results;
 
+import java.util.*;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
index 85b124c..5c0f404 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
@@ -1,17 +1,12 @@
 package org.usergrid.persistence.query.ir.result;
 
 
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.Iterables;
 import org.junit.Ignore;
 import org.usergrid.persistence.cassandra.CursorCache;
 
-import com.google.common.collect.Iterables;
+import java.nio.ByteBuffer;
+import java.util.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
index c165caa..dbe4cae 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
@@ -16,18 +16,12 @@
 package org.usergrid.persistence.query.ir.result;
 
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.utils.UUIDUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
index d184edb..9a5ea3a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
@@ -16,15 +16,13 @@
 package org.usergrid.persistence.query.ir.result;
 
 
-import java.util.Set;
-import java.util.UUID;
-
 import org.junit.Test;
 import org.usergrid.utils.UUIDUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
 import static org.usergrid.persistence.query.ir.result.IteratorHelper.uuidColumn;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
index 683f00d..0678547 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
@@ -16,17 +16,14 @@
 package org.usergrid.persistence.query.ir.result;
 
 
+import org.junit.Test;
+import org.usergrid.utils.UUIDUtils;
+
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import org.junit.Test;
-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 static org.junit.Assert.*;
 import static org.usergrid.persistence.query.ir.result.IteratorHelper.uuidColumn;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
index 30bf820..bf91f07 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
@@ -16,24 +16,18 @@
 package org.usergrid.persistence.query.tree;
 
 
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.TokenRewriteStream;
 import org.junit.Test;
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.ir.OrNode;
 
-import antlr.NoViableAltException;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java b/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
index 3a2ec36..7c289f4 100644
--- a/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
+++ b/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
@@ -1,15 +1,14 @@
 package org.usergrid.system;
 
 
-import java.util.Date;
-
+import org.apache.commons.lang.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.usergrid.CoreITSuite;
 import org.usergrid.cassandra.Concurrent;
 import org.usergrid.utils.MapUtils;
 
-import org.apache.commons.lang.StringUtils;
+import java.util.Date;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
index efa5316..38af953 100644
--- a/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
@@ -17,10 +17,10 @@
 package org.usergrid.utils;
 
 
-import java.util.UUID;
-
 import org.junit.Test;
 
+import java.util.UUID;
+
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
index 1e7de0f..0b7c723 100644
--- a/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
@@ -17,15 +17,14 @@
 package org.usergrid.utils;
 
 
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.usergrid.persistence.entities.Activity;
-import org.usergrid.persistence.entities.User;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.entities.Activity;
+import org.usergrid.persistence.entities.User;
+
+import java.util.List;
+import java.util.Map.Entry;
 
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
index f250c29..1cee013 100644
--- a/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
@@ -17,17 +17,17 @@
 package org.usergrid.utils;
 
 
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.codehaus.jackson.node.JsonNodeFactory;
 import org.codehaus.jackson.node.ObjectNode;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import static org.junit.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
index 930916e..c3d32a7 100644
--- a/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
@@ -17,13 +17,13 @@
 package org.usergrid.utils;
 
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
index fe5b3d6..c392b26 100644
--- a/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
@@ -17,14 +17,13 @@
 package org.usergrid.utils;
 
 
-import java.util.List;
-import java.util.Properties;
-
-import javax.mail.Message;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.mail.Message;
+import java.util.List;
+import java.util.Properties;
+
 import static org.junit.Assert.assertEquals;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
index e8c9b58..23dfcad 100644
--- a/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
@@ -17,12 +17,12 @@
 package org.usergrid.utils;
 
 
-import java.util.Map;
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 
 public class MapUtilsTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
index 5311b63..6d33111 100644
--- a/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
@@ -17,29 +17,17 @@
 package org.usergrid.utils;
 
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-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 static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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 java.util.*;
+import java.util.concurrent.*;
+
+import static org.junit.Assert.*;
+import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
+import static org.usergrid.utils.UUIDUtils.newTimeUUID;
 
 
 public class UUIDUtilsTest {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/App.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/App.java b/stack/launcher/src/main/java/org/usergrid/launcher/App.java
index e896969..66d57f4 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/App.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/App.java
@@ -16,19 +16,6 @@
 package org.usergrid.launcher;
 
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.prefs.Preferences;
-
-import javax.swing.UIManager;
-
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.node.ArrayNode;
 import org.codehaus.jackson.node.JsonNodeFactory;
@@ -36,6 +23,13 @@ import org.codehaus.jackson.type.TypeReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.prefs.Preferences;
+
 
 public class App {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java b/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
index 9463f9e..1f09404 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
@@ -16,8 +16,7 @@
 package org.usergrid.launcher;
 
 
-import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
+import javax.swing.*;
 
 
 public class AppleUtils {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java b/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
index 760b8e0..b5bf40b 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
@@ -16,18 +16,11 @@
 package org.usergrid.launcher;
 
 
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Insets;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.IOException;
@@ -40,25 +33,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import javax.swing.BorderFactory;
-import javax.swing.ComboBoxEditor;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JToolBar;
-import javax.swing.Timer;
-import javax.swing.WindowConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 
 public class LauncherFrame extends JFrame {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java b/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
index 68b5b19..a10de6e 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
@@ -16,20 +16,15 @@
 package org.usergrid.launcher;
 
 
-import java.awt.BorderLayout;
-import java.io.IOException;
-
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
 
+import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+
 
 public class LogViewerFrame extends JFrame {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
index eb1d182..0ba0004 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
@@ -16,6 +16,10 @@
 package org.usergrid.mongo;
 
 
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.ThreadState;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
@@ -29,11 +33,6 @@ import org.usergrid.mongo.protocol.OpReply;
 import org.usergrid.persistence.EntityManagerFactory;
 import org.usergrid.services.ServiceManagerFactory;
 
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.ThreadState;
-
 
 public class MongoChannelHandler extends SimpleChannelUpstreamHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
index cce7fd2..e27b8cb 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
@@ -22,15 +22,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.usergrid.mongo.protocol.Message;
-import org.usergrid.mongo.protocol.OpDelete;
-import org.usergrid.mongo.protocol.OpGetMore;
-import org.usergrid.mongo.protocol.OpInsert;
-import org.usergrid.mongo.protocol.OpKillCursors;
-import org.usergrid.mongo.protocol.OpMsg;
-import org.usergrid.mongo.protocol.OpQuery;
-import org.usergrid.mongo.protocol.OpReply;
-import org.usergrid.mongo.protocol.OpUpdate;
+import org.usergrid.mongo.protocol.*;
 
 
 public class MongoMessageDecoder extends FrameDecoder {


Mime
View raw message