You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/23 18:21:06 UTC
[30/33] organize imports only
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
index 9c73648..939acca 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
@@ -16,30 +16,17 @@
package org.usergrid.persistence.cassandra;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.ddl.ComparatorType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.cassandra.QueuesCF;
import org.usergrid.persistence.entities.Application;
-import me.prettyprint.hector.api.ddl.ComparatorType;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefinition;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-import static org.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.STATIC_APPLICATION_KEYSPACE;
-import static org.usergrid.persistence.cassandra.CassandraService.SYSTEM_KEYSPACE;
-import static org.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
-import static org.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
+import static org.usergrid.persistence.cassandra.CassandraService.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
index c8d105c..dbf4451 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.cassandra;
+import org.usergrid.persistence.IndexBucketLocator;
+
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import org.usergrid.persistence.IndexBucketLocator;
-
import static org.apache.commons.codec.digest.DigestUtils.md5;
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
index 265dc4d..637ba91 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
@@ -16,19 +16,13 @@
package org.usergrid.persistence.cassandra.index;
-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.yammer.metrics.annotation.Metered;
+import me.prettyprint.hector.api.beans.HColumn;
import org.springframework.util.Assert;
import org.usergrid.persistence.cassandra.CassandraService;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
index 1a0776a..91d7551 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
@@ -16,23 +16,15 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.ApplicationCF;
import org.usergrid.persistence.cassandra.CassandraService;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
index 7a26d66..137e73e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
@@ -16,20 +16,14 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.usergrid.persistence.cassandra.ApplicationCF;
-import org.usergrid.persistence.cassandra.CassandraService;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.TypeParser;
+import org.usergrid.persistence.cassandra.ApplicationCF;
+import org.usergrid.persistence.cassandra.CassandraService;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
index d87f37a..aef01e5 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra.index;
+import me.prettyprint.hector.api.beans.HColumn;
+
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.Set;
-import me.prettyprint.hector.api.beans.HColumn;
-
/**
* Interface for scanning all index buckets.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
index d948af8..25bb0d0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence.cassandra.index;
+import me.prettyprint.hector.api.beans.HColumn;
+
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.NavigableSet;
import java.util.Set;
-import me.prettyprint.hector.api.beans.HColumn;
-
/**
* Index scanner that doesn't return anything. This is used if our cursor has advanced beyond the end of all scannable
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
index 753b149..10682d3 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
@@ -1,11 +1,11 @@
package org.usergrid.persistence.cassandra.util;
-import java.util.Date;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Date;
+
/**
* Simple reporter which dumps to class logger at info level.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
index d30c2f2..a3c8774 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
@@ -1,11 +1,10 @@
package org.usergrid.persistence.cassandra.util;
-import java.util.UUID;
-
+import com.google.common.base.Objects;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.base.Objects;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
index 30166d7..2cbd161 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
@@ -1,12 +1,12 @@
package org.usergrid.persistence.cassandra.util;
-import javax.annotation.Resource;
-
import org.aspectj.lang.ProceedingJoinPoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+
/**
* Use Aspects to apply a trace
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
index 6cdeb3a..85d83ca 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
@@ -1,13 +1,12 @@
package org.usergrid.persistence.cassandra.util;
-import javax.annotation.Resource;
-
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.base.Preconditions;
+import javax.annotation.Resource;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
index 81b77cb..7f2e8ad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -35,6 +26,9 @@ import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
import static org.usergrid.utils.StringUtils.toStringFormat;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
index 2028b26..62a70ad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -31,6 +24,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** Applications represent the topmost container for all entities. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
index 518b391..805c507 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
@@ -16,17 +16,16 @@
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 org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* Asset entity for representing file-like objects.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
index 43b0dd5..b303031 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-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.EntityCollection;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.UUID;
+
/** The Device entity class for representing devices in the service. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
index d85cbf5..e948324 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
@@ -16,19 +16,18 @@
package org.usergrid.persistence.entities;
-import java.util.HashMap;
-import java.util.Map;
-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 org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** An event type posted by the application. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
index a218d2e..2826bcf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
@@ -16,17 +16,16 @@
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 org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* Asset entity for representing folder-like objects.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
index 9ffe504..3789cc9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-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.CredentialsInfo;
@@ -31,6 +24,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** Groups are used to organize users. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
index 06a324d..50434ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.entities;
-import java.util.UUID;
-
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityProperty;
+import java.util.UUID;
+
/**
* All job execution info should be in this entity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
index 30864e8..b46884b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
@@ -16,17 +16,16 @@
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 org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* A generic Message type for message queue type operations. For status updates and other social actions, use Activity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
index e8dd05a..f3b89f7 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-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;
@@ -29,6 +23,11 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
/** Groups are used to organize users. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/User.java b/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
index 32a1078..e260556 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -32,6 +25,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java b/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
index 43e8ff3..29086a1 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
@@ -1,18 +1,17 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java b/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
index 3928ac9..fd46168 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
@@ -1,17 +1,16 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.UUID;
import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
index da25424..7b7468a 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
@@ -1,13 +1,12 @@
package org.usergrid.persistence.geo;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.DynamicComposite;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.util.UUID;
import static org.apache.commons.lang.math.NumberUtils.toDouble;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterLast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
index 5d1b228..9b7b70f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.geo;
-import java.util.Comparator;
-
import org.usergrid.utils.UUIDUtils;
+import java.util.Comparator;
+
/**
* Compares 2 entity location refs by distance. The one with the larger distance is considered greater than one with a
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
index 98629b2..3f6fc6f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
@@ -1,16 +1,13 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.DoubleSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityManager;
@@ -22,14 +19,8 @@ import org.usergrid.persistence.cassandra.index.IndexMultiBucketSetLoader;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.geo.model.Tuple;
-import org.apache.commons.lang.StringUtils;
-
-import me.prettyprint.cassandra.serializers.DoubleSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.DICTIONARY_GEOCELL;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
index be6f52a..dc0b588 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
@@ -1,16 +1,16 @@
package org.usergrid.persistence.geo;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import org.usergrid.persistence.cassandra.GeoIndexManager;
import org.usergrid.persistence.geo.model.BoundingBox;
import org.usergrid.persistence.geo.model.CostFunction;
import org.usergrid.persistence.geo.model.DefaultCostFunction;
import org.usergrid.persistence.geo.model.Point;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
#
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
index 5b112c9..dbbdbc5 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
@@ -13,17 +13,13 @@ and limitations under the License.
package org.usergrid.persistence.geo;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
import org.usergrid.persistence.geo.comparator.DoubleTupleComparator;
import org.usergrid.persistence.geo.model.BoundingBox;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.geo.model.Tuple;
+import java.util.*;
+
/**
#
# Copyright 2010 Alexandre Gellibert
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java b/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
index 6780662..b31530f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
@@ -1,10 +1,10 @@
package org.usergrid.persistence.geo.comparator;
-import java.util.Comparator;
-
import org.usergrid.persistence.geo.model.Tuple;
+import java.util.Comparator;
+
public class DoubleTupleComparator implements Comparator<Tuple<int[], Double>> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
index 089e66f..c30f844 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.query.ir;
-import java.util.List;
-
import org.usergrid.persistence.Query.SortPredicate;
+import java.util.List;
+
/**
* Intermediate representation of ordering operations
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
index da94494..79aca6a 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
@@ -16,12 +16,11 @@
package org.usergrid.persistence.query.ir;
-import java.nio.ByteBuffer;
-
-import org.usergrid.utils.NumberUtils;
-
import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import org.usergrid.utils.NumberUtils;
+
+import java.nio.ByteBuffer;
import static org.usergrid.utils.CompositeUtils.setEqualityFlag;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
index 665ddd2..60a3cad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
@@ -1,23 +1,15 @@
package org.usergrid.persistence.query.ir;
-import java.util.Stack;
-
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.cassandra.QueryProcessor;
import org.usergrid.persistence.cassandra.index.IndexScanner;
import org.usergrid.persistence.cassandra.index.NoOpIndexScanner;
-import org.usergrid.persistence.query.ir.result.EmptyIterator;
-import org.usergrid.persistence.query.ir.result.IntersectionIterator;
-import org.usergrid.persistence.query.ir.result.OrderByIterator;
-import org.usergrid.persistence.query.ir.result.ResultIterator;
-import org.usergrid.persistence.query.ir.result.SecondaryIndexSliceParser;
-import org.usergrid.persistence.query.ir.result.SliceIterator;
-import org.usergrid.persistence.query.ir.result.StaticIdIterator;
-import org.usergrid.persistence.query.ir.result.SubtractionIterator;
-import org.usergrid.persistence.query.ir.result.UnionIterator;
+import org.usergrid.persistence.query.ir.result.*;
+
+import java.util.Stack;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
index dd2a933..dc3dd6e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.query.ir;
+import org.usergrid.persistence.query.ir.QuerySlice.RangeValue;
+
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.usergrid.persistence.query.ir.QuerySlice.RangeValue;
-
import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
index e89954d..a4fbad6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
@@ -1,9 +1,10 @@
package org.usergrid.persistence.query.ir.result;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.cassandra.utils.ByteBufferUtil;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
index 21e407b..6626793 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
@@ -16,12 +16,11 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.DynamicComposite;
import org.usergrid.persistence.Schema;
-import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
index 4466a53..4b04e7d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
@@ -1,16 +1,16 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
import org.usergrid.persistence.ConnectionRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.cassandra.ConnectionRefImpl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
index 67cceb6..568cc6d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
@@ -1,18 +1,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.Schema;
import org.usergrid.persistence.cassandra.CassandraService;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_TYPES;
import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_TYPES;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
index 8236043..14501ec 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
@@ -1,12 +1,12 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/** Iterator that never returns results */
public class EmptyIterator implements ResultIterator {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
index 68f521d..bf6231d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.List;
-
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.SimpleEntityRef;
+import java.util.ArrayList;
+import java.util.List;
+
public class EntityRefLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
index 6cbdbef..f821483 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Results;
+import java.util.List;
+
/** @author tnine */
public class EntityResultsLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
index 121f257..5c82268 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
@@ -16,17 +16,7 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.StringSerializer;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.GeoIndexSearcher;
@@ -34,7 +24,8 @@ import org.usergrid.persistence.geo.GeoIndexSearcher.SearchResults;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.query.ir.QuerySlice;
-import me.prettyprint.cassandra.serializers.StringSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
index 49d891a..6d03047 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
@@ -1,10 +1,10 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.Results;
+import java.util.List;
+
public class IDLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
index 4ffad1b..d2e8277 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence.query.ir.result;
+import com.google.common.collect.Sets;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
-import com.google.common.collect.Sets;
-
/**
* An iterator that unions 1 or more subsets. It makes the assuming that sub iterators iterate from min(uuid) to
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
index 1c1bc31..a7ad3d4 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
@@ -16,19 +16,8 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import org.apache.commons.collections.comparators.ComparatorChain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -39,9 +28,8 @@ import org.usergrid.persistence.Query.SortPredicate;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.persistence.query.ir.QuerySlice;
-import org.apache.commons.collections.comparators.ComparatorChain;
-
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
index 5b3e666..f45afc6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/**
* Interface for iterating slice results per node. This is to be used to iterate and join or intersect values Each
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
index d7a925a..9802885 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.Results;
+import java.util.List;
+
/** @author tnine */
public interface ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
index f003c96..76f7f55 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-
/**
* Parser for reading and writing secondary index composites
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
index 6cc833d..7ea0610 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
@@ -16,13 +16,7 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.cassandra.CursorCache;
@@ -30,7 +24,8 @@ import org.usergrid.persistence.cassandra.index.IndexScanner;
import org.usergrid.persistence.exceptions.QueryIterationException;
import org.usergrid.persistence.query.ir.QuerySlice;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
index 6ca1e89..87e3268 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
@@ -1,14 +1,14 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/** Simple iterator that just returns UUIDs that are set into it */
public class StaticIdIterator implements ResultIterator {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
index b654496..0aac486 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence.query.ir.result;
+import com.google.common.collect.Sets;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
-import com.google.common.collect.Sets;
-
/**
* Simple iterator to perform Unions
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
index c3278de..cb9c6d6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-
/**
* Parser for reading and writing secondary index composites
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
index 00e90b8..bdf0f1d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
@@ -16,20 +16,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
index b1420da..5d8969e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.tree;
-import java.util.UUID;
-
import org.antlr.runtime.ClassicToken;
import org.antlr.runtime.Token;
+import java.util.UUID;
+
/** @author tnine */
public class UUIDLiteral extends Literal<UUID> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
index 6cc01e5..9e46b32 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.schema;
+import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.annotations.EntityCollection;
+
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.annotations.EntityCollection;
-
public class CollectionInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
index e6480d3..db6c103 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.schema;
+import org.usergrid.persistence.Schema;
+
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.usergrid.persistence.Schema;
-
public class EntityInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java b/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
index 68dad28..c40aaae 100644
--- a/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
+++ b/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
@@ -1,16 +1,15 @@
package org.usergrid.system;
-import java.util.Properties;
-
+import me.prettyprint.hector.api.Cluster;
+import me.prettyprint.hector.api.exceptions.HectorException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.MapUtils;
import org.usergrid.utils.TimeUtils;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.exceptions.HectorException;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/AESUtils.java b/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
index b409599..eca8c58 100644
--- a/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
@@ -18,15 +18,14 @@
package org.usergrid.utils;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
import org.apache.commons.codec.binary.Base64;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
import static org.apache.commons.lang.StringUtils.rightPad;
import static org.apache.commons.lang.StringUtils.substring;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java b/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
index 56acce5..e2be6bb 100644
--- a/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
@@ -17,10 +17,10 @@
package org.usergrid.utils;
-import java.util.UUID;
-
import org.apache.commons.codec.binary.Base64;
+import java.util.UUID;
+
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java b/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
index db63d86..85b36ab 100644
--- a/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
@@ -17,13 +17,13 @@
package org.usergrid.utils;
-import java.nio.ByteBuffer;
-import java.util.List;
-
import me.prettyprint.hector.api.beans.AbstractComposite.Component;
import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.List;
+
public class CompositeUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java b/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
index 83cd5e4..8e48506 100644
--- a/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
@@ -17,20 +17,14 @@
package org.usergrid.utils;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.lang.math.NumberUtils;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.*;
/** Convenience methods for converting to and from formats, primarily between byte arrays and UUIDs, Strings,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java b/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
index a088a37..1b398ad 100644
--- a/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
@@ -17,15 +17,15 @@
package org.usergrid.utils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-
public class HttpUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java b/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
index 91f2a87..168fa9d 100644
--- a/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
@@ -17,36 +17,27 @@
package org.usergrid.utils;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.util.Version;
-
-import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ClassUtils.isBasicType;
-import static org.usergrid.utils.JsonUtils.quoteString;
-import static org.usergrid.utils.JsonUtils.toJsonNode;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.ObjectNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.usergrid.utils.ClassUtils.cast;
+import static org.usergrid.utils.ClassUtils.isBasicType;
+import static org.usergrid.utils.JsonUtils.quoteString;
+import static org.usergrid.utils.JsonUtils.toJsonNode;
+
public class IndexUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java b/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
index 6bd8300..17ff56e 100644
--- a/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
@@ -17,19 +17,6 @@
package org.usergrid.utils;
-import java.io.File;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.usergrid.exception.JsonReadException;
-import org.usergrid.exception.JsonWriteException;
-import org.usergrid.persistence.Entity;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.io.JsonStringEncoder;
import org.codehaus.jackson.map.ObjectMapper;
@@ -37,9 +24,16 @@ import org.codehaus.jackson.map.SerializationConfig.Feature;
import org.codehaus.jackson.smile.SmileFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.exception.JsonReadException;
+import org.usergrid.exception.JsonWriteException;
+import org.usergrid.persistence.Entity;
-import static org.apache.commons.lang.StringUtils.substringAfter;
+import java.io.File;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import static org.apache.commons.lang.StringUtils.substringAfter;
import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/ListUtils.java b/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
index 63050ee..e861506 100644
--- a/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
@@ -17,16 +17,15 @@
package org.usergrid.utils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
-import org.apache.commons.lang.math.NumberUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class ListUtils extends org.apache.commons.collections.ListUtils {
private static final Logger LOG = LoggerFactory.getLogger( ListUtils.class );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/MailUtils.java b/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
index a74d172..06120c9 100644
--- a/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
@@ -17,23 +17,17 @@
package org.usergrid.utils;
-import java.util.Properties;
+import com.google.common.base.Preconditions;
+import org.jsoup.Jsoup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.jsoup.Jsoup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
+import javax.mail.internet.*;
+import java.util.Properties;
import static org.usergrid.utils.MapUtils.filter;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/MapUtils.java b/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
index bf1e1b8..c5e513d 100644
--- a/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
@@ -17,20 +17,10 @@
package org.usergrid.utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/StringUtils.java b/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
index 373748a..7f5c4c3 100644
--- a/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
@@ -17,13 +17,12 @@
package org.usergrid.utils;
-import java.util.Arrays;
-
import org.apache.commons.io.IOUtils;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java b/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
index 110a20c..9b994c8 100644
--- a/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
@@ -17,6 +17,11 @@
package org.usergrid.utils;
+import com.fasterxml.uuid.EthernetAddress;
+import com.fasterxml.uuid.UUIDComparator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Collections;
import java.util.List;
import java.util.Random;
@@ -25,20 +30,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
-import com.fasterxml.uuid.EthernetAddress;
-import com.fasterxml.uuid.UUIDComparator;
-
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_HI;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_LO;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_MID;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_SEQUENCE;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import static com.fasterxml.uuid.impl.UUIDUtil.*;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-
import static org.usergrid.utils.ConversionUtils.bytes;
import static org.usergrid.utils.ConversionUtils.uuid;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/main/java/org/usergrid/utils/Version.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/Version.java b/stack/core/src/main/java/org/usergrid/utils/Version.java
index 0c4ac32..51e7e82 100644
--- a/stack/core/src/main/java/org/usergrid/utils/Version.java
+++ b/stack/core/src/main/java/org/usergrid/utils/Version.java
@@ -46,12 +46,12 @@ package org.usergrid.utils;
* POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+import org.apache.commons.lang.StringUtils;
+
import java.io.Serializable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
-
/**
* The Version class can be used to parse a standard version string into its four components,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/test/java/org/usergrid/Application.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/Application.java b/stack/core/src/test/java/org/usergrid/Application.java
index 861c89a..c55b0af 100644
--- a/stack/core/src/test/java/org/usergrid/Application.java
+++ b/stack/core/src/test/java/org/usergrid/Application.java
@@ -1,14 +1,14 @@
package org.usergrid;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.Map;
+import java.util.UUID;
+
/**
* A Usergrid Application object used to simplify Test code by making it much more readable and removing unnecessary
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
index e5bdb05..7bac7ab 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
@@ -23,15 +23,7 @@ import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
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/145260c2/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
index 9787dcb..e431845 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
@@ -7,35 +7,7 @@ import org.junit.runners.Suite;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
-import org.usergrid.persistence.query.AllInCollectionIT;
-import org.usergrid.persistence.query.AllInConnectionIT;
-import org.usergrid.persistence.query.AllInConnectionNoTypeIT;
-import org.usergrid.persistence.query.MultiOrderByCollectionIT;
-import org.usergrid.persistence.query.MultiOrderByComplexUnionCollectionIT;
-import org.usergrid.persistence.query.MultiOrderByComplexUnionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanAscCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanAscConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanDescCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanDescConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexIntersectionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexIntersectionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexUnionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexUnionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByLessThanLimitCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByLessThanLimitConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByMaxLimitCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByMaxLimitConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByNoIntersectionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByNoIntersectionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByNotCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByNotConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterThanEqualCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanEqualCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanEqualConnectionIT;
+import org.usergrid.persistence.query.*;
@RunWith(ConcurrentSuite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/145260c2/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
index 319a3ff..c5c3d03 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
@@ -7,11 +7,7 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
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/145260c2/stack/core/src/test/java/org/usergrid/CoreApplication.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreApplication.java b/stack/core/src/test/java/org/usergrid/CoreApplication.java
index 9f2218b..a6fc172 100644
--- a/stack/core/src/test/java/org/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/usergrid/CoreApplication.java
@@ -16,10 +16,6 @@
package org.usergrid;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -31,6 +27,10 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;