usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [22/23] git commit: organize imports only
Date Sun, 19 Jan 2014 10:21:09 GMT
organize imports only


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2e35e490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2e35e490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2e35e490

Branch: refs/pull/30/head
Commit: 2e35e4901b60388235b9f15701e9b2e5659e879f
Parents: f8ae7fe
Author: Strong Liu <stliu@hibernate.org>
Authored: Sun Jan 19 18:00:01 2014 +0800
Committer: Strong Liu <stliu@hibernate.org>
Committed: Sun Jan 19 18:00:01 2014 +0800

----------------------------------------------------------------------
 .../java/org/usergrid/batch/JobExecution.java   |   4 +-
 .../org/usergrid/batch/JobExecutionImpl.java    |   5 +-
 .../java/org/usergrid/batch/JobFactory.java     |   4 +-
 .../org/usergrid/batch/UsergridJobFactory.java  |   6 +-
 .../org/usergrid/batch/job/OnlyOnceJob.java     |   4 +-
 .../usergrid/batch/repository/JobAccessor.java  |   4 +-
 .../batch/repository/JobDescriptor.java         |   5 +-
 .../java/org/usergrid/batch/service/App.java    |   3 +-
 .../batch/service/JobSchedulerService.java      |  33 ++---
 .../batch/service/SchedulerService.java         |   4 +-
 .../batch/service/SchedulerServiceImpl.java     |  29 ++--
 .../hazelcast/HazelcastLifecycleMonitor.java    |   8 +-
 .../org/usergrid/count/AbstractBatcher.java     |  12 +-
 .../java/org/usergrid/count/BatchSubmitter.java |   4 +-
 .../usergrid/count/CassandraCounterStore.java   |  20 ++-
 .../org/usergrid/count/CassandraSubmitter.java  |  17 +--
 .../java/org/usergrid/count/CounterStore.java   |   4 +-
 .../java/org/usergrid/count/SimpleBatcher.java  |   1 -
 .../org/usergrid/count/Slf4JBatchSubmitter.java |  17 +--
 .../java/org/usergrid/count/common/Count.java   |  14 +-
 .../usergrid/count/common/CountSerDeUtils.java  |   4 +-
 .../main/java/org/usergrid/locking/Lock.java    |   4 +-
 .../java/org/usergrid/locking/LockHelper.java   |   5 +-
 .../java/org/usergrid/locking/LockManager.java  |   4 +-
 .../locking/cassandra/HectorLockImpl.java       |  11 +-
 .../cassandra/HectorLockManagerImpl.java        |   8 +-
 .../org/usergrid/locking/noop/NoOpLockImpl.java |   4 +-
 .../locking/noop/NoOpLockManagerImpl.java       |   4 +-
 .../locking/singlenode/SingleNodeLockImpl.java  |   6 +-
 .../singlenode/SingleNodeLockManagerImpl.java   |  15 +-
 .../zookeeper/ZooKeeperLockManagerImpl.java     |  16 +--
 .../locking/zookeeper/ZookeeperLockImpl.java    |   5 +-
 .../main/java/org/usergrid/mq/CounterQuery.java |  13 +-
 .../src/main/java/org/usergrid/mq/Message.java  |  36 +----
 .../src/main/java/org/usergrid/mq/Query.java    |  28 +---
 .../java/org/usergrid/mq/QueryFilterLexer.java  |  10 +-
 .../java/org/usergrid/mq/QueryFilterParser.java |  10 +-
 .../java/org/usergrid/mq/QueryProcessor.java    |  18 +--
 .../src/main/java/org/usergrid/mq/Queue.java    |  19 +--
 .../main/java/org/usergrid/mq/QueueManager.java |   8 +-
 .../main/java/org/usergrid/mq/QueueQuery.java   |   5 +-
 .../main/java/org/usergrid/mq/QueueResults.java |   9 +-
 .../src/main/java/org/usergrid/mq/QueueSet.java |  11 +-
 .../usergrid/mq/cassandra/CassandraMQUtils.java |  36 ++---
 .../mq/cassandra/MessageIndexUpdate.java        |  20 +--
 .../usergrid/mq/cassandra/QueueIndexUpdate.java |  21 +--
 .../mq/cassandra/QueueManagerFactoryImpl.java   |  10 +-
 .../usergrid/mq/cassandra/QueueManagerImpl.java | 103 +++-----------
 .../org/usergrid/mq/cassandra/QueuesCF.java     |   5 +-
 .../mq/cassandra/io/AbstractSearch.java         |  46 ++----
 .../mq/cassandra/io/ConsumerTransaction.java    |  29 ++--
 .../org/usergrid/mq/cassandra/io/EndSearch.java |   5 +-
 .../usergrid/mq/cassandra/io/FilterSearch.java  |  20 +--
 .../mq/cassandra/io/NoTransactionSearch.java    |   7 +-
 .../usergrid/mq/cassandra/io/StartSearch.java   |   5 +-
 .../usergrid/persistence/AbstractEntity.java    |  14 +-
 .../persistence/AggregateCounterSet.java        |   6 +-
 .../org/usergrid/persistence/CounterQuery.java  |  13 +-
 .../usergrid/persistence/CredentialsInfo.java   |   9 +-
 .../org/usergrid/persistence/DynamicEntity.java |   9 +-
 .../java/org/usergrid/persistence/Entity.java   |  16 +--
 .../org/usergrid/persistence/EntityFactory.java |   4 +-
 .../org/usergrid/persistence/EntityManager.java |   8 +-
 .../org/usergrid/persistence/Identifier.java    |   6 +-
 .../java/org/usergrid/persistence/Query.java    |  44 ++----
 .../org/usergrid/persistence/QueryUtils.java    |   4 +-
 .../usergrid/persistence/RelationManager.java   |   4 +-
 .../java/org/usergrid/persistence/Results.java  |  17 +--
 .../java/org/usergrid/persistence/Schema.java   |  60 +++-----
 .../persistence/SimpleCollectionRef.java        |   4 +-
 .../org/usergrid/persistence/SimpleRoleRef.java |   4 +-
 .../persistence/cassandra/ApplicationCF.java    |   4 +-
 .../usergrid/persistence/cassandra/CFEnum.java  |   4 +-
 .../cassandra/CassandraPersistenceUtils.java    |  44 ++----
 .../persistence/cassandra/CassandraService.java |  70 +++-------
 .../cassandra/ConnectedEntityRefImpl.java       |   4 +-
 .../cassandra/ConnectionRefImpl.java            |  15 +-
 .../persistence/cassandra/CounterUtils.java     |  33 ++---
 .../persistence/cassandra/CursorCache.java      |   1 -
 .../cassandra/EntityManagerFactoryImpl.java     |  55 +++-----
 .../cassandra/EntityManagerImpl.java            | 139 ++++---------------
 .../cassandra/EntityValueSerializer.java        |   6 +-
 .../persistence/cassandra/GeoIndexManager.java  |  22 ++-
 .../persistence/cassandra/IndexUpdate.java      |  23 +--
 .../persistence/cassandra/QueryProcessor.java   |  47 +------
 .../cassandra/RelationManagerImpl.java          | 111 +++------------
 .../usergrid/persistence/cassandra/Setup.java   |  19 +--
 .../cassandra/SimpleIndexBucketLocatorImpl.java |   4 +-
 .../cassandra/index/ConnectedIndexScanner.java  |  14 +-
 .../cassandra/index/IndexBucketScanner.java     |  16 +--
 .../index/IndexMultiBucketSetLoader.java        |  16 +--
 .../cassandra/index/IndexScanner.java           |   4 +-
 .../cassandra/index/NoOpIndexScanner.java       |   4 +-
 .../cassandra/util/Slf4jTraceTagReporter.java   |   4 +-
 .../persistence/cassandra/util/TimedOpTag.java  |   5 +-
 .../cassandra/util/TraceTagAspect.java          |   4 +-
 .../cassandra/util/TraceTagManager.java         |   5 +-
 .../usergrid/persistence/entities/Activity.java |  12 +-
 .../persistence/entities/Application.java       |  13 +-
 .../usergrid/persistence/entities/Asset.java    |   9 +-
 .../usergrid/persistence/entities/Device.java   |   9 +-
 .../usergrid/persistence/entities/Event.java    |  13 +-
 .../usergrid/persistence/entities/Folder.java   |   9 +-
 .../usergrid/persistence/entities/Group.java    |  13 +-
 .../usergrid/persistence/entities/JobStat.java  |   4 +-
 .../usergrid/persistence/entities/Message.java  |   9 +-
 .../org/usergrid/persistence/entities/Role.java |  11 +-
 .../org/usergrid/persistence/entities/User.java |  13 +-
 .../persistence/geo/CollectionGeoSearch.java    |  11 +-
 .../persistence/geo/ConnectionGeoSearch.java    |  11 +-
 .../persistence/geo/EntityLocationRef.java      |   5 +-
 .../EntityLocationRefDistanceComparator.java    |   4 +-
 .../persistence/geo/GeoIndexSearcher.java       |  27 ++--
 .../persistence/geo/GeocellManager.java         |   8 +-
 .../usergrid/persistence/geo/GeocellUtils.java  |   8 +-
 .../geo/comparator/DoubleTupleComparator.java   |   4 +-
 .../persistence/query/ir/OrderByNode.java       |   4 +-
 .../persistence/query/ir/QuerySlice.java        |   7 +-
 .../persistence/query/ir/SearchVisitor.java     |  14 +-
 .../persistence/query/ir/SliceNode.java         |   4 +-
 .../query/ir/result/AbstractScanColumn.java     |   3 +-
 .../ir/result/ConnectionIndexSliceParser.java   |   7 +-
 .../query/ir/result/ConnectionRefLoader.java    |   8 +-
 .../ir/result/ConnectionTypesIterator.java      |  13 +-
 .../query/ir/result/EmptyIterator.java          |   4 +-
 .../query/ir/result/EntityRefLoader.java        |   6 +-
 .../query/ir/result/EntityResultsLoader.java    |   4 +-
 .../query/ir/result/GeoIterator.java            |  15 +-
 .../persistence/query/ir/result/IDLoader.java   |   4 +-
 .../query/ir/result/IntersectionIterator.java   |   7 +-
 .../query/ir/result/OrderByIterator.java        |  20 +--
 .../query/ir/result/ResultIterator.java         |   4 +-
 .../query/ir/result/ResultsLoader.java          |   4 +-
 .../ir/result/SecondaryIndexSliceParser.java    |   4 +-
 .../query/ir/result/SliceIterator.java          |  11 +-
 .../query/ir/result/StaticIdIterator.java       |   4 +-
 .../query/ir/result/SubtractionIterator.java    |   7 +-
 .../query/ir/result/UUIDIndexSliceParser.java   |   4 +-
 .../query/ir/result/UnionIterator.java          |  14 +-
 .../persistence/query/tree/UUIDLiteral.java     |   4 +-
 .../persistence/schema/CollectionInfo.java      |   6 +-
 .../usergrid/persistence/schema/EntityInfo.java |   4 +-
 .../usergrid/system/UsergridSystemMonitor.java  |   7 +-
 .../main/java/org/usergrid/utils/AESUtils.java  |   9 +-
 .../java/org/usergrid/utils/CodecUtils.java     |   4 +-
 .../java/org/usergrid/utils/CompositeUtils.java |   6 +-
 .../org/usergrid/utils/ConversionUtils.java     |  16 +--
 .../main/java/org/usergrid/utils/HttpUtils.java |   6 +-
 .../java/org/usergrid/utils/IndexUtils.java     |  29 ++--
 .../main/java/org/usergrid/utils/JsonUtils.java |  22 ++-
 .../main/java/org/usergrid/utils/ListUtils.java |   9 +-
 .../main/java/org/usergrid/utils/MailUtils.java |  18 +--
 .../main/java/org/usergrid/utils/MapUtils.java  |  12 +-
 .../java/org/usergrid/utils/StringUtils.java    |   5 +-
 .../main/java/org/usergrid/utils/UUIDUtils.java |  18 +--
 .../main/java/org/usergrid/utils/Version.java   |   4 +-
 .../src/test/java/org/usergrid/Application.java |   6 +-
 .../org/usergrid/ConcurrentCoreITSuite.java     |  10 +-
 .../usergrid/ConcurrentCoreIteratorITSuite.java |  30 +---
 .../org/usergrid/ConcurrentCoreTestSuite.java   |   6 +-
 .../test/java/org/usergrid/CoreApplication.java |   8 +-
 .../src/test/java/org/usergrid/CoreITSetup.java |   4 +-
 .../test/java/org/usergrid/CoreITSetupImpl.java |   4 +-
 .../src/test/java/org/usergrid/CoreITSuite.java |  10 +-
 .../test/java/org/usergrid/CoreTestSuite.java   |   6 +-
 .../java/org/usergrid/batch/AppArgsTest.java    |   3 +-
 .../batch/BulkJobExecutionUnitTest.java         |   4 +-
 .../java/org/usergrid/batch/BulkTestUtils.java  |   6 +-
 .../batch/ConcurrentSchedulerITSuite.java       |   9 +-
 .../batch/ConcurrentSchedulerTestSuite.java     |   3 -
 .../org/usergrid/batch/SchedulerITSuite.java    |   9 +-
 .../org/usergrid/batch/SchedulerTestSuite.java  |   3 -
 .../usergrid/batch/UsergridJobFactoryTest.java  |   6 +-
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   6 +-
 .../usergrid/batch/job/CountdownLatchJob.java   |   6 +-
 .../org/usergrid/batch/job/DelayExecution.java  |   6 +-
 .../org/usergrid/batch/job/DelayHeartbeat.java  |   6 +-
 .../batch/job/FailureJobExceuction.java         |   6 +-
 .../usergrid/batch/job/OnlyOnceExceution.java   |   6 +-
 .../job/OnlyOnceUnlockOnFailExceution.java      |   6 +-
 .../usergrid/batch/job/SchedulerRuntime1IT.java |  10 +-
 .../usergrid/batch/job/SchedulerRuntime2IT.java |  10 +-
 .../usergrid/batch/job/SchedulerRuntime3IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime4IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime5IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime6IT.java |  10 +-
 .../usergrid/batch/job/SchedulerRuntime7IT.java |   3 +-
 .../usergrid/batch/job/SchedulerRuntime8IT.java |   5 +-
 .../org/usergrid/batch/job/TestJobListener.java |   4 +-
 .../usergrid/batch/job/TestJobListenerTest.java |   7 +-
 .../clustering/hazelcast/HazelcastTest.java     |  13 +-
 .../count/BatchCountParallelismTest.java        |  19 +--
 .../org/usergrid/count/SimpleBatcherTest.java   |   1 -
 .../locking/cassandra/HectorLockManagerIT.java  |  12 +-
 .../SingleNodeLockTestSingleNode.java           |  11 +-
 .../zookeeper/AbstractZooKeeperTest.java        |   9 +-
 .../org/usergrid/locking/zookeeper/ZooPut.java  |  11 +-
 .../zookeeper/ZookeeperLockManagerTest.java     |  17 +--
 .../test/java/org/usergrid/mq/MessagesIT.java   |  13 +-
 .../org/usergrid/persistence/CollectionIT.java  |  15 +-
 .../usergrid/persistence/CoreSchemaManager.java |   3 +-
 .../org/usergrid/persistence/CounterIT.java     |  11 +-
 .../persistence/EntityConnectionsIT.java        |  13 +-
 .../persistence/EntityDictionaryIT.java         |  12 +-
 .../usergrid/persistence/EntityManagerIT.java   |  17 +--
 .../org/usergrid/persistence/EntityTest.java    |   8 +-
 .../java/org/usergrid/persistence/GeoIT.java    |   9 +-
 .../java/org/usergrid/persistence/IndexIT.java  |  19 ++-
 .../org/usergrid/persistence/PathQueryIT.java   |  10 +-
 .../org/usergrid/persistence/PermissionsIT.java |  12 +-
 .../org/usergrid/persistence/QueryTest.java     |  27 +---
 .../usergrid/persistence/QueryUtilsTest.java    |   6 +-
 .../org/usergrid/persistence/SchemaTest.java    |   5 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |  19 +--
 .../cassandra/QueryProcessorTest.java           |  20 +--
 .../SimpleIndexBucketLocatorImplTest.java       |  15 +-
 .../persistence/entities/SampleEntity.java      |   9 +-
 ...EntityLocationRefDistanceComparatorTest.java |   4 +-
 .../query/AbstractIteratingQueryIT.java         |  11 +-
 .../query/IntersectionUnionPagingIT.java        |   8 +-
 .../query/ir/result/InOrderIterator.java        |  11 +-
 .../ir/result/IntersectionIteratorTest.java     |  12 +-
 .../ir/result/SubtractionIteratorTest.java      |  10 +-
 .../query/ir/result/UnionIteratorTest.java      |  11 +-
 .../persistence/query/tree/GrammarTreeTest.java |  14 +-
 .../system/UsergridSystemMonitorIT.java         |   5 +-
 .../org/usergrid/utils/ConversionUtilsTest.java |   4 +-
 .../java/org/usergrid/utils/IndexUtilsTest.java |  11 +-
 .../java/org/usergrid/utils/JsonUtilsTest.java  |  10 +-
 .../java/org/usergrid/utils/ListUtilsTest.java  |   6 +-
 .../java/org/usergrid/utils/MailUtilsTest.java  |   9 +-
 .../java/org/usergrid/utils/MapUtilsTest.java   |   4 +-
 .../java/org/usergrid/utils/UUIDUtilsTest.java  |  24 +---
 .../main/java/org/usergrid/launcher/App.java    |  20 +--
 .../java/org/usergrid/launcher/AppleUtils.java  |   3 +-
 .../org/usergrid/launcher/LauncherFrame.java    |  36 +----
 .../org/usergrid/launcher/LogViewerFrame.java   |  13 +-
 .../org/usergrid/mongo/MongoChannelHandler.java |   9 +-
 .../org/usergrid/mongo/MongoMessageDecoder.java |  10 +-
 .../java/org/usergrid/mongo/MongoServer.java    |  15 +-
 .../mongo/MongoServerPipelineFactory.java       |   3 +-
 .../usergrid/mongo/commands/ListDatabases.java  |  10 +-
 .../usergrid/mongo/commands/MongoCommand.java   |   4 +-
 .../org/usergrid/mongo/commands/Whatsmyuri.java |   4 +-
 .../org/usergrid/mongo/protocol/Message.java    |  12 +-
 .../org/usergrid/mongo/protocol/OpDelete.java   |  16 +--
 .../org/usergrid/mongo/protocol/OpGetMore.java  |   6 +-
 .../org/usergrid/mongo/protocol/OpInsert.java   |  12 +-
 .../usergrid/mongo/protocol/OpKillCursors.java  |   4 +-
 .../java/org/usergrid/mongo/protocol/OpMsg.java |   4 +-
 .../org/usergrid/mongo/protocol/OpQuery.java    |  26 ++--
 .../org/usergrid/mongo/protocol/OpReply.java    |  12 +-
 .../org/usergrid/mongo/protocol/OpUpdate.java   |  14 +-
 .../usergrid/mongo/query/MongoQueryParser.java  |  13 +-
 .../testproxy/MongoProxyInboundHandler.java     |  15 +-
 .../mongo/testproxy/MongoProxyServer.java       |  10 +-
 .../org/usergrid/mongo/AbstractMongoTest.java   |  13 +-
 .../java/org/usergrid/mongo/BasicMongoTest.java |  32 ++---
 .../org/usergrid/mongo/DatabaseInitializer.java |   6 +-
 .../java/org/usergrid/mongo/MongoQueryTest.java |  20 +--
 .../query/validator/ApiServerRunner.java        |   5 +-
 .../usergrid/query/validator/QueryRunner.java   |   3 +-
 .../query/validator/QueryValidationTest.java    |   2 +-
 .../usergrid/rest/AbstractContextResource.java  |  25 ++--
 .../java/org/usergrid/rest/ApiResponse.java     |  17 +--
 .../rest/JacksonCustomMapperProvider.java       |  10 +-
 .../java/org/usergrid/rest/RootResource.java    |  60 +++-----
 .../java/org/usergrid/rest/SwaggerServlet.java  |  27 ++--
 .../java/org/usergrid/rest/SystemResource.java  |  15 +-
 .../org/usergrid/rest/TextToJsonSwapWriter.java |  23 ++-
 .../rest/applications/ApplicationResource.java  |  45 ++----
 .../rest/applications/AuthResource.java         |  29 ++--
 .../rest/applications/ServiceResource.java      |  57 ++------
 .../applications/assets/AssetsResource.java     |  32 ++---
 .../applications/events/EventsResource.java     |  17 ++-
 .../rest/applications/queues/QueueResource.java |  32 ++---
 .../queues/QueueSubscriberResource.java         |  30 ++--
 .../queues/QueueSubscriptionResource.java       |  30 ++--
 .../queues/QueueTransactionsResource.java       |  20 +--
 .../rest/applications/users/UserResource.java   |  48 ++-----
 .../rest/applications/users/UsersResource.java  |  38 ++---
 .../exceptions/AbstractExceptionMapper.java     |   9 +-
 .../AuthorizationExceptionMapper.java           |   4 +-
 ...cateUniquePropertyExistsExceptionMapper.java |   4 +-
 .../EntityNotFoundExceptionMapper.java          |   4 +-
 ...orbiddenServiceOperationExceptionMapper.java |   4 +-
 .../exceptions/JsonReadExceptionMapper.java     |   4 +-
 .../exceptions/JsonWriteExceptionMapper.java    |   4 +-
 .../exceptions/ManagementExceptionMapper.java   |   4 +-
 .../NotImplementedExceptionMapper.java          |   4 +-
 .../exceptions/OAuthProblemExceptionMapper.java |   8 +-
 ...rganizationApplicationNotFoundException.java |   4 +-
 .../exceptions/PersistenceExceptionMapper.java  |   4 +-
 .../exceptions/QueryParseExceptionMapper.java   |   5 +-
 .../exceptions/QueryTokenExceptionMapper.java   |   7 +-
 .../RecentlyUsedPasswordExceptionMapper.java    |   4 +-
 ...RequiredPropertyNotFoundExceptionMapper.java |   4 +-
 .../rest/exceptions/SecurityException.java      |   3 +-
 .../rest/exceptions/ServiceExceptionMapper.java |   4 +-
 .../ServiceResourceNotFoundExceptionMapper.java |   6 +-
 .../TransactionNotFoundExceptionMapper.java     |   4 +-
 .../rest/filters/ContentTypeFilter.java         |  30 +---
 .../rest/filters/JSONPCallbackFilter.java       |   9 +-
 .../usergrid/rest/filters/MeteringFilter.java   |  36 ++---
 .../usergrid/rest/filters/TracingFilter.java    |  13 +-
 .../rest/management/ManagementResource.java     |  48 +++----
 .../management/metrics/MetricsResource.java     |  13 +-
 .../organizations/OrganizationResource.java     |  23 +--
 .../organizations/OrganizationsResource.java    |  28 ++--
 .../applications/ApplicationResource.java       |  28 ++--
 .../applications/ApplicationsResource.java      |  30 ++--
 .../organizations/users/UsersResource.java      |  30 ++--
 .../rest/management/users/UserResource.java     |  31 ++---
 .../rest/management/users/UsersResource.java    |  33 ++---
 .../organizations/OrganizationsResource.java    |  28 ++--
 .../organizations/OrganizationResource.java     |  24 ++--
 .../rest/security/CrossOriginRequestFilter.java |   7 +-
 .../security/SecuredResourceFilterFactory.java  |  29 ++--
 .../security/shiro/RestSecurityManager.java     |   9 +-
 .../ShiroAuthenticationExceptionMapper.java     |  11 +-
 .../shiro/filters/BasicAuthSecurityFilter.java  |  13 +-
 .../ClientCredentialsSecurityFilter.java        |  10 +-
 .../OAuth2AccessTokenSecurityFilter.java        |  27 ++--
 .../security/shiro/filters/SecurityFilter.java  |  23 ++-
 .../session/HttpRequestSessionManager.java      |   6 +-
 .../session/HttpServletRequestSession.java      |  11 +-
 .../usergrid/rest/test/PropertiesResource.java  |  21 ++-
 .../java/org/usergrid/rest/utils/CORSUtils.java |   7 +-
 .../org/usergrid/rest/utils/JSONPUtils.java     |  11 +-
 .../java/org/usergrid/rest/AbstractRestIT.java  |  36 +++--
 .../test/java/org/usergrid/rest/BasicIT.java    |  16 +--
 .../usergrid/rest/ConcurrentRestITSuite.java    |   7 +-
 .../org/usergrid/rest/DatabaseInitializer.java  |   6 +-
 .../test/java/org/usergrid/rest/ITSetup.java    |   9 +-
 .../java/org/usergrid/rest/RestITSuite.java     |   7 +-
 .../org/usergrid/rest/TestContextSetup.java     |   3 +-
 .../java/org/usergrid/rest/TomcatResource.java  |  10 +-
 .../ApplicationRequestCounterIT.java            |  13 +-
 .../applications/ApplicationResourceIT.java     |  21 ++-
 .../rest/applications/DevicesResourceIT.java    |  13 +-
 .../applications/assets/AssetResourceIT.java    |  17 +--
 .../collection/BadGrammarQueryTest.java         |   9 +-
 .../collection/BrowserCompatibilityTest.java    |   6 +-
 .../collection/PagingResourceIT.java            |  13 +-
 .../collection/activities/AndOrQueryTest.java   |   6 +-
 .../collection/activities/OrderByTest.java      |  10 +-
 .../activities/PagingEntitiesTest.java          |   7 +-
 .../collection/activities/PutTest.java          |   6 +-
 .../collection/groups/GeoPagingTest.java        |   6 +-
 .../collection/groups/UpdateGroupIT.java        |  20 ++-
 .../applications/events/EventsResourceIT.java   |   9 +-
 .../queues/AbstractQueueResourceIT.java         |  20 +--
 .../queues/QueueResourceLong1IT.java            |   9 +-
 .../queues/QueueResourceLong2IT.java            |   7 +-
 .../queues/QueueResourceLong3IT.java            |  14 +-
 .../queues/QueueResourceShortIT.java            |  23 ++-
 .../users/CollectionsResourceIT.java            |  16 +--
 .../users/ConnectionResourceTest.java           |  14 +-
 .../applications/users/GroupResourceIT.java     |  12 +-
 .../applications/users/OwnershipResourceIT.java |   6 +-
 .../users/PermissionsResourceIT.java            |  21 ++-
 .../applications/users/RetrieveUsersTest.java   |   6 +-
 .../rest/applications/users/UserResourceIT.java |  22 +--
 .../users/extensions/TestResource.java          |   8 +-
 .../rest/applications/utils/TestUtils.java      |   4 +-
 .../rest/applications/utils/UserRepo.java       |  12 +-
 .../rest/filters/ContentTypeResourceIT.java     |  37 ++---
 .../rest/management/ManagementResourceIT.java   |  22 ++-
 .../rest/management/RegistrationIT.java         |  46 ++----
 .../organizations/OrganizationResourceIT.java   |  10 +-
 .../organizations/OrganizationsResourceIT.java  |  32 ++---
 .../rest/management/users/MUUserResourceIT.java |  45 ++----
 .../UsersOrganizationsResourceIT.java           |   7 +-
 .../rest/test/PropertiesResourceIT.java         |   9 +-
 .../usergrid/rest/test/resource/Connection.java |   4 +-
 .../rest/test/resource/EntityResource.java      |   9 +-
 .../rest/test/resource/NamedResource.java       |  12 +-
 .../rest/test/resource/SetResource.java         |   4 +-
 .../rest/test/resource/TestContext.java         |   5 +-
 .../rest/test/resource/ValueResource.java       |   7 +-
 .../rest/test/resource/app/Application.java     |   4 +-
 .../usergrid/rest/test/resource/app/Device.java |   4 +-
 .../usergrid/rest/test/resource/app/User.java   |   4 +-
 .../rest/test/resource/app/UsersCollection.java |   6 +-
 .../rest/test/resource/app/queue/Queue.java     |   7 +-
 .../test/resource/app/queue/Transaction.java    |   3 +-
 .../rest/test/resource/mgmt/Application.java    |   4 +-
 .../resource/mgmt/ApplicationsCollection.java   |   4 +-
 .../rest/test/resource/mgmt/Management.java     |   7 +-
 .../rest/test/resource/mgmt/Organization.java   |   4 +-
 .../resource/mgmt/OrganizationsCollection.java  |   4 +-
 .../usergrid/rest/test/security/TestUser.java   |   4 +-
 .../usergrid/management/ApplicationInfo.java    |   6 +-
 .../usergrid/management/ManagementService.java  |   9 +-
 .../usergrid/management/OrganizationInfo.java   |   6 +-
 .../java/org/usergrid/management/UserInfo.java  |  15 +-
 .../cassandra/AccountCreationPropsImpl.java     |   7 +-
 .../cassandra/ApplicationCreatorImpl.java       |   7 +-
 .../cassandra/ManagementServiceImpl.java        | 127 +++--------------
 .../usergrid/security/AuthPrincipalType.java    |   6 +-
 .../security/crypto/EncryptionService.java      |   4 +-
 .../security/crypto/EncryptionServiceImpl.java  |  15 +-
 .../security/crypto/command/BcryptCommand.java  |   6 +-
 .../crypto/command/EncryptionCommand.java       |   4 +-
 .../security/crypto/command/Md5HashCommand.java |   5 +-
 .../crypto/command/PlainTextCommand.java        |   4 +-
 .../crypto/command/SaltedHasherCommand.java     |   6 +-
 .../crypto/command/Sha1HashCommand.java         |   6 +-
 .../org/usergrid/security/oauth/AccessInfo.java |   9 +-
 .../security/oauth/ClientCredentialsInfo.java   |   4 +-
 .../security/providers/AbstractProvider.java    |   9 +-
 .../security/providers/FacebookProvider.java    |   9 +-
 .../security/providers/FoursquareProvider.java  |  20 ++-
 .../providers/PingIdentityProvider.java         |  11 +-
 .../security/providers/SignInAsProvider.java    |   4 +-
 .../security/shiro/CustomPermission.java        |  11 +-
 .../shiro/PrincipalCredentialsToken.java        |  15 +-
 .../java/org/usergrid/security/shiro/Realm.java |  66 +++------
 .../principals/ApplicationGuestPrincipal.java   |   4 +-
 .../shiro/principals/ApplicationPrincipal.java  |   4 +-
 .../principals/ApplicationUserPrincipal.java    |   4 +-
 .../shiro/principals/OrganizationPrincipal.java |   4 +-
 .../shiro/principals/UserPrincipal.java         |   4 +-
 .../security/shiro/utils/SubjectUtils.java      |  24 ++--
 .../org/usergrid/security/tokens/TokenInfo.java |   4 +-
 .../usergrid/security/tokens/TokenService.java  |   4 +-
 .../tokens/cassandra/TokenServiceImpl.java      |  32 ++---
 .../services/AbstractCollectionService.java     |  14 +-
 .../services/AbstractConnectionsService.java    |  16 +--
 .../AbstractPathBasedColllectionService.java    |  10 +-
 .../org/usergrid/services/AbstractService.java  |  20 +--
 .../java/org/usergrid/services/Service.java     |   4 +-
 .../org/usergrid/services/ServiceContext.java   |   8 +-
 .../java/org/usergrid/services/ServiceInfo.java |  17 +--
 .../org/usergrid/services/ServiceManager.java   |  18 ++-
 .../services/ServiceManagerFactory.java         |   8 +-
 .../org/usergrid/services/ServiceParameter.java |  15 +-
 .../org/usergrid/services/ServicePayload.java   |  12 +-
 .../org/usergrid/services/ServiceRequest.java   |  13 +-
 .../org/usergrid/services/ServiceResults.java   |  12 +-
 .../applications/ApplicationsService.java       |  11 +-
 .../usergrid/services/assets/AssetsService.java |   4 +-
 .../services/assets/data/AssetMimeHandler.java  |  18 +--
 .../services/assets/data/AssetUtils.java        |  16 +--
 .../services/assets/data/BinaryStore.java       |   4 +-
 .../assets/data/LocalFileBinaryStore.java       |   7 +-
 .../services/assets/data/S3BinaryStore.java     |  30 ++--
 .../services/devices/DevicesService.java        |   4 +-
 .../usergrid/services/groups/GroupsService.java |  11 +-
 .../groups/activities/ActivitiesService.java    |   6 +-
 .../users/activities/ActivitiesService.java     |   6 +-
 .../usergrid/services/roles/RolesService.java   |   8 +-
 .../services/roles/users/UsersService.java      |   4 +-
 .../usergrid/services/users/UsersService.java   |  22 +--
 .../users/activities/ActivitiesService.java     |  10 +-
 .../services/users/roles/RolesService.java      |   4 +-
 .../org/usergrid/ConcurrentServiceITSuite.java  |  11 +-
 .../java/org/usergrid/ServiceApplication.java   |  10 +-
 .../test/java/org/usergrid/ServiceITSetup.java  |   4 +-
 .../java/org/usergrid/ServiceITSetupImpl.java   |   4 +-
 .../test/java/org/usergrid/ServiceITSuite.java  |  11 +-
 .../org/usergrid/management/EmailFlowIT.java    |  48 ++-----
 .../management/ManagementTestHelper.java        |   4 +-
 .../org/usergrid/management/MockImapClient.java |  13 +-
 .../org/usergrid/management/OrganizationIT.java |  15 +-
 .../java/org/usergrid/management/RoleIT.java    |   9 +-
 .../cassandra/ApplicationCreatorIT.java         |   8 +-
 .../cassandra/ManagementServiceIT.java          |  17 +--
 .../cassandra/ManagementTestHelperImpl.java     |   4 +-
 .../usergrid/security/CustomResolverTest.java   |  19 ++-
 .../crypto/EncryptionServiceImplTest.java       |   8 +-
 .../crypto/command/BcryptCommandTest.java       |  11 +-
 .../crypto/command/Md5HashCommandTest.java      |   5 +-
 .../crypto/command/Sha1HashCommandTest.java     |   6 +-
 .../security/providers/FacebookProviderIT.java  |  12 +-
 .../providers/PingIdentityProviderIT.java       |  12 +-
 .../security/tokens/TokenServiceIT.java         |  11 +-
 .../usergrid/services/CollectionServiceIT.java  |   4 +-
 .../usergrid/services/ConnectionsServiceIT.java |   8 +-
 .../org/usergrid/services/RolesServiceIT.java   |  14 +-
 .../org/usergrid/services/ServiceFactoryIT.java |   5 +-
 .../org/usergrid/services/ServiceInfoTest.java  |   4 +-
 .../usergrid/services/ServiceInvocationIT.java  |   8 +-
 .../org/usergrid/services/ServiceRequestIT.java |   8 +-
 .../services/assets/data/AssetUtilsTest.java    |   4 +-
 .../org/usergrid/NoExitSecurityManager.java     |   4 +-
 .../usergrid/cassandra/AvailablePortFinder.java |   6 +-
 .../usergrid/cassandra/CassandraResource.java   |  21 ++-
 .../usergrid/cassandra/ClearShiroSubject.java   |   7 +-
 .../cassandra/ConcurrentJunitRunner.java        |  15 +-
 .../org/usergrid/cassandra/ConcurrentSuite.java |  19 +--
 .../cassandra/CassandraResourceTest.java        |   4 +-
 .../main/java/org/usergrid/tools/ApiDoc.java    |  30 ++--
 .../main/java/org/usergrid/tools/AppAudit.java  |  35 ++---
 .../java/org/usergrid/tools/AppNameFix.java     |  13 +-
 .../src/main/java/org/usergrid/tools/Cli.java   |  30 ++--
 .../main/java/org/usergrid/tools/Command.java   |   7 +-
 .../java/org/usergrid/tools/CredExport.java     |  11 +-
 .../java/org/usergrid/tools/DupAdminRepair.java |  29 ++--
 .../java/org/usergrid/tools/DupOrgRepair.java   |  30 ++--
 .../java/org/usergrid/tools/EntityCleanup.java  |  26 ++--
 .../usergrid/tools/EntityInsertBenchMark.java   |  32 ++---
 .../org/usergrid/tools/EntityReadBenchMark.java |  41 +++---
 .../java/org/usergrid/tools/EntityUpdate.java   |  24 ++--
 .../main/java/org/usergrid/tools/Export.java    |  24 +---
 .../org/usergrid/tools/ExportDataCreator.java   |   4 +-
 .../org/usergrid/tools/ExportingToolBase.java   |  17 ++-
 .../main/java/org/usergrid/tools/Import.java    |  21 ++-
 .../main/java/org/usergrid/tools/ImportFB.java  |  17 ++-
 .../java/org/usergrid/tools/IndexRebuild.java   |  20 +--
 .../main/java/org/usergrid/tools/Metrics.java   |  29 ++--
 .../org/usergrid/tools/OrganizationExport.java  |  20 ++-
 .../java/org/usergrid/tools/PopulateSample.java |  15 +-
 .../java/org/usergrid/tools/ResetSuperUser.java |  17 +--
 .../main/java/org/usergrid/tools/SetupDB.java   |   5 +-
 .../src/main/java/org/usergrid/tools/Test.java  |   5 +-
 .../main/java/org/usergrid/tools/ToolBase.java  |  17 +--
 .../org/usergrid/tools/UniqueIndexCleanup.java  |  40 ++----
 .../java/org/usergrid/tools/UserManager.java    |   3 +-
 .../org/usergrid/tools/WarehouseExport.java     |  57 +++-----
 .../org/usergrid/tools/WarehouseUpsert.java     |  11 +-
 .../org/usergrid/tools/apidoc/swagger/Api.java  |   4 +-
 .../tools/apidoc/swagger/ApiListing.java        |  13 +-
 .../tools/apidoc/swagger/ApiOperation.java      |   4 +-
 .../apidoc/swagger/ApiParamAllowableValues.java |   4 +-
 .../java/org/usergrid/tools/bean/ExportOrg.java |   4 +-
 .../org/usergrid/tools/bean/MetricLine.java     |   9 +-
 .../org/usergrid/tools/bean/MetricQuery.java    |  12 +-
 .../websocket/WebSocketChannelHandler.java      |  44 ++----
 .../org/usergrid/websocket/WebSocketServer.java |  13 +-
 .../WebSocketServerPipelineFactory.java         |   5 +-
 .../websocket/WebSocketSslContextFactory.java   |   5 +-
 .../websocket/SimpleMessageProducer.java        |  13 +-
 533 files changed, 2463 insertions(+), 4729 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobExecution.java b/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
index 150de17..6b09f0e 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
@@ -16,11 +16,11 @@
 package org.usergrid.batch;
 
 
-import java.util.UUID;
-
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
+import java.util.UUID;
+
 
 /**
  * Interface to define all operations possible during a job execution. The job execution has several states.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java b/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
index d5aecfc..4cbed78 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
@@ -1,14 +1,13 @@
 package org.usergrid.batch;
 
 
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
 import org.usergrid.batch.repository.JobDescriptor;
 import org.usergrid.batch.service.JobRuntimeService;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import com.google.common.base.Preconditions;
+import java.util.UUID;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobFactory.java b/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
index 6154858..a9e6409 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
@@ -1,10 +1,10 @@
 package org.usergrid.batch;
 
 
-import java.util.List;
-
 import org.usergrid.batch.repository.JobDescriptor;
 
+import java.util.List;
+
 
 /**
  * It is up to the implementation how many BulkJob instances to return, but this should be controled by the

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java b/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
index 951d10d..0204a6c 100644
--- a/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
+++ b/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
@@ -1,15 +1,15 @@
 package org.usergrid.batch;
 
 
-import java.util.Collections;
-import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.usergrid.batch.repository.JobDescriptor;
 
+import java.util.Collections;
+import java.util.List;
+
 
 /** @author tnine */
 public class UsergridJobFactory implements JobFactory {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
index 4b1c3c3..a689ad4 100644
--- a/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
@@ -16,8 +16,6 @@
 package org.usergrid.batch.job;
 
 
-import java.util.concurrent.TimeUnit;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.usergrid.batch.Job;
@@ -25,6 +23,8 @@ import org.usergrid.batch.JobExecution;
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 
+import java.util.concurrent.TimeUnit;
+
 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/main/java/org/usergrid/batch/repository/JobAccessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java b/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
index bc6e7dd..0e91abd 100644
--- a/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
+++ b/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
@@ -18,10 +18,10 @@
 package org.usergrid.batch.repository;
 
 
-import java.util.List;
-
 import org.usergrid.batch.JobExecution;
 
+import java.util.List;
+
 
 public interface JobAccessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java b/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
index b245a89..e203f24 100644
--- a/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
+++ b/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
@@ -1,14 +1,13 @@
 package org.usergrid.batch.repository;
 
 
-import java.util.UUID;
-
+import me.prettyprint.cassandra.utils.Assert;
 import org.usergrid.batch.service.JobRuntimeService;
 import org.usergrid.persistence.TypedEntity;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
-import me.prettyprint.cassandra.utils.Assert;
+import java.util.UUID;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/App.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/App.java b/stack/core/src/main/java/org/usergrid/batch/service/App.java
index ba7eb09..23c1f17 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/App.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/App.java
@@ -1,14 +1,13 @@
 package org.usergrid.batch.service;
 
 
+import com.google.common.base.CharMatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
-import com.google.common.base.CharMatcher;
-
 
 /**
  * Entry point for CLI functions of Usergrid batch framework

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java b/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
index c35a9c8..6631167 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
@@ -18,34 +18,23 @@
 package org.usergrid.batch.service;
 
 
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.util.concurrent.AbstractScheduledService;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningScheduledExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.*;
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.annotation.Timed;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.usergrid.batch.Job;
-import org.usergrid.batch.JobExecution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.batch.*;
 import org.usergrid.batch.JobExecution.Status;
-import org.usergrid.batch.JobExecutionImpl;
-import org.usergrid.batch.JobFactory;
-import org.usergrid.batch.JobNotFoundException;
 import org.usergrid.batch.repository.JobAccessor;
 import org.usergrid.batch.repository.JobDescriptor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
index 92d5161..e711432 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
@@ -17,13 +17,13 @@
 package org.usergrid.batch.service;
 
 
-import java.util.UUID;
-
 import org.usergrid.persistence.Query;
 import org.usergrid.persistence.Results;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 
+import java.util.UUID;
+
 
 /**
  * Simple interface for performing job scheduling

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
index 0c875f3..9940d6f 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
@@ -17,37 +17,28 @@
 package org.usergrid.batch.service;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 import org.usergrid.batch.JobExecution;
 import org.usergrid.batch.JobExecution.Status;
 import org.usergrid.batch.JobRuntime;
 import org.usergrid.batch.JobRuntimeException;
 import org.usergrid.batch.repository.JobAccessor;
 import org.usergrid.batch.repository.JobDescriptor;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.QueueManager;
-import org.usergrid.mq.QueueManagerFactory;
-import org.usergrid.mq.QueueQuery;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
+import org.usergrid.mq.*;
+import org.usergrid.persistence.*;
 import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
 import org.usergrid.persistence.cassandra.CassandraService;
 import org.usergrid.persistence.entities.JobData;
 import org.usergrid.persistence.entities.JobStat;
 import org.usergrid.persistence.exceptions.TransactionNotFoundException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java b/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
index 9221fa3..8f73cc6 100644
--- a/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
+++ b/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
@@ -16,16 +16,10 @@
 package org.usergrid.clustering.hazelcast;
 
 
+import com.hazelcast.core.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.Instance;
-import com.hazelcast.core.InstanceEvent;
-import com.hazelcast.core.InstanceListener;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
-
 
 public class HazelcastLifecycleMonitor implements InstanceListener, MembershipListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java b/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
index f682ab3..a7d1624 100644
--- a/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
+++ b/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
@@ -16,6 +16,12 @@
 package org.usergrid.count;
 
 
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
+import org.usergrid.count.common.Count;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -26,12 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.usergrid.count.common.Count;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
-
 
 /**
  * Base batcher implementation, handles concurrency and locking throughput throttling.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java b/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
index bb44709..3f4e423 100644
--- a/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
@@ -16,11 +16,11 @@
 package org.usergrid.count;
 
 
+import org.usergrid.count.common.Count;
+
 import java.util.Collection;
 import java.util.concurrent.Future;
 
-import org.usergrid.count.common.Count;
-
 
 /** @author zznate */
 public interface BatchSubmitter {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java b/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
index 216d80f..bd3db3b 100644
--- a/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
+++ b/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
@@ -16,22 +16,20 @@
 package org.usergrid.count;
 
 
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
-
 import me.prettyprint.cassandra.model.HCounterColumnImpl;
 import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.factory.HFactory;
 import me.prettyprint.hector.api.mutation.Mutator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java b/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
index 8fd6d01..532320c 100644
--- a/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
@@ -16,20 +16,15 @@
 package org.usergrid.count;
 
 
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Timer;
 import com.yammer.metrics.core.TimerContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.util.Collection;
+import java.util.concurrent.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CounterStore.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CounterStore.java b/stack/core/src/main/java/org/usergrid/count/CounterStore.java
index afa9678..709ac63 100644
--- a/stack/core/src/main/java/org/usergrid/count/CounterStore.java
+++ b/stack/core/src/main/java/org/usergrid/count/CounterStore.java
@@ -16,10 +16,10 @@
 package org.usergrid.count;
 
 
-import java.util.Collection;
-
 import org.usergrid.count.common.Count;
 
+import java.util.Collection;
+
 
 /** @author zznate */
 public interface CounterStore {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java b/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
index bd73466..4e28add 100644
--- a/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
+++ b/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
@@ -18,7 +18,6 @@ package org.usergrid.count;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.usergrid.count.common.Count;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java b/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
index 34162f1..5fe98a1 100644
--- a/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
@@ -16,20 +16,15 @@
 package org.usergrid.count;
 
 
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Timer;
 import com.yammer.metrics.core.TimerContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.util.Collection;
+import java.util.concurrent.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/common/Count.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/common/Count.java b/stack/core/src/main/java/org/usergrid/count/common/Count.java
index 243ee90..9fb0b12 100644
--- a/stack/core/src/main/java/org/usergrid/count/common/Count.java
+++ b/stack/core/src/main/java/org/usergrid/count/common/Count.java
@@ -16,19 +16,17 @@
 package org.usergrid.count.common;
 
 
-import java.nio.ByteBuffer;
-
+import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.Serializer;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonCreator;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
 
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
-
-import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.Serializer;
+import java.nio.ByteBuffer;
 
 import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java b/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
index 719c0cc..63ad66a 100644
--- a/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
+++ b/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
@@ -16,12 +16,12 @@
 package org.usergrid.count.common;
 
 
-import java.io.IOException;
-
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonMethod;
 import org.codehaus.jackson.map.ObjectMapper;
 
+import java.io.IOException;
+
 
 /** @author zznate */
 public class CountSerDeUtils {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/Lock.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/Lock.java b/stack/core/src/main/java/org/usergrid/locking/Lock.java
index 01bd471..99dc13c 100644
--- a/stack/core/src/main/java/org/usergrid/locking/Lock.java
+++ b/stack/core/src/main/java/org/usergrid/locking/Lock.java
@@ -16,10 +16,10 @@
 package org.usergrid.locking;
 
 
-import java.util.concurrent.TimeUnit;
-
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * The lock object to acquire

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/LockHelper.java b/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
index 47c1c61..b5b576a 100644
--- a/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
+++ b/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
@@ -16,12 +16,11 @@
 package org.usergrid.locking;
 
 
-import java.util.UUID;
-
+import org.apache.commons.codec.binary.Hex;
 import org.usergrid.locking.exception.UGLockException;
 import org.usergrid.locking.noop.NoOpLockImpl;
 
-import org.apache.commons.codec.binary.Hex;
+import java.util.UUID;
 
 import static org.usergrid.locking.LockPathBuilder.buildPath;
 import static org.usergrid.utils.ConversionUtils.bytes;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/LockManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/LockManager.java b/stack/core/src/main/java/org/usergrid/locking/LockManager.java
index cd023b8..77c3efe 100644
--- a/stack/core/src/main/java/org/usergrid/locking/LockManager.java
+++ b/stack/core/src/main/java/org/usergrid/locking/LockManager.java
@@ -16,10 +16,10 @@
 package org.usergrid.locking;
 
 
-import java.util.UUID;
-
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.UUID;
+
 
 /**
  * This Interface to a class responsible for distributed lock across system.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
index af69781..784a70e 100644
--- a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
@@ -16,15 +16,14 @@
 package org.usergrid.locking.cassandra;
 
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.usergrid.locking.Lock;
-import org.usergrid.locking.exception.UGLockException;
-
 import me.prettyprint.hector.api.locking.HLock;
 import me.prettyprint.hector.api.locking.HLockManager;
 import me.prettyprint.hector.api.locking.HLockTimeoutException;
+import org.usergrid.locking.Lock;
+import org.usergrid.locking.exception.UGLockException;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 /** @author tnine */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
index 9d8e9a7..1339a1a 100644
--- a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
@@ -16,21 +16,19 @@
 package org.usergrid.locking.cassandra;
 
 
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
 import me.prettyprint.cassandra.locking.HLockManagerImpl;
 import me.prettyprint.hector.api.Cluster;
 import me.prettyprint.hector.api.ConsistencyLevelPolicy;
 import me.prettyprint.hector.api.locking.HLockManager;
 import me.prettyprint.hector.api.locking.HLockManagerConfigurator;
-
 import org.springframework.util.Assert;
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.LockPathBuilder;
 
+import javax.annotation.PostConstruct;
+import java.util.UUID;
+
 
 /**
  * Uses the hector based locking implementation to obtain locks

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
index 4af8bd9..32015a8 100644
--- a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
@@ -16,11 +16,11 @@
 package org.usergrid.locking.noop;
 
 
-import java.util.concurrent.TimeUnit;
-
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.concurrent.TimeUnit;
+
 
 /** @author tnine */
 public class NoOpLockImpl implements Lock {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
index e451228..0ed7ded 100644
--- a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
@@ -16,11 +16,11 @@
 package org.usergrid.locking.noop;
 
 
-import java.util.UUID;
-
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 
+import java.util.UUID;
+
 
 /** This is a no-op manager used for testing. */
 public class NoOpLockManagerImpl implements LockManager {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
index 56e0f9f..c693bdc 100644
--- a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
@@ -16,12 +16,12 @@
 package org.usergrid.locking.singlenode;
 
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.exception.UGLockException;
 
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
 
 /** @author tnine */
 public class SingleNodeLockImpl implements Lock {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
index acf53bb..8d5c1ca 100644
--- a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
@@ -16,22 +16,17 @@
 package org.usergrid.locking.singlenode;
 
 
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
+import com.google.common.cache.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.LockPathBuilder;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
index 96b599f..3be836b 100644
--- a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
@@ -16,21 +16,19 @@
 package org.usergrid.locking.zookeeper;
 
 
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
+import com.netflix.curator.RetryPolicy;
+import com.netflix.curator.framework.CuratorFramework;
+import com.netflix.curator.framework.CuratorFrameworkFactory;
+import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
+import com.netflix.curator.retry.ExponentialBackoffRetry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.LockPathBuilder;
 
-import com.netflix.curator.RetryPolicy;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
+import javax.annotation.PostConstruct;
+import java.util.UUID;
 
 
 /** Implementation for Zookeeper service that handles global locks. */

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
index 1e33422..838825f 100644
--- a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
@@ -16,12 +16,11 @@
 package org.usergrid.locking.zookeeper;
 
 
-import java.util.concurrent.TimeUnit;
-
+import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
 import org.usergrid.locking.Lock;
 import org.usergrid.locking.exception.UGLockException;
 
-import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
+import java.util.concurrent.TimeUnit;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java b/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
index adb5cd1..3958f64 100644
--- a/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
+++ b/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
@@ -16,21 +16,18 @@
 package org.usergrid.mq;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.mq.Query.CounterFilterPredicate;
 import org.usergrid.persistence.CounterResolution;
 import org.usergrid.utils.JsonUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
 import static org.usergrid.utils.MapUtils.toMapList;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Message.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Message.java b/stack/core/src/main/java/org/usergrid/mq/Message.java
index 644f9b4..cc89648 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Message.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Message.java
@@ -16,19 +16,7 @@
 package org.usergrid.mq;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
+import com.fasterxml.uuid.UUIDComparator;
 import org.codehaus.jackson.annotate.JsonAnyGetter;
 import org.codehaus.jackson.annotate.JsonAnySetter;
 import org.codehaus.jackson.annotate.JsonIgnore;
@@ -36,26 +24,16 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 import org.usergrid.utils.UUIDUtils;
 
-import com.fasterxml.uuid.UUIDComparator;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
 
 import static org.apache.commons.collections.IteratorUtils.asEnumeration;
-import static org.apache.commons.collections.MapUtils.getBooleanValue;
-import static org.apache.commons.collections.MapUtils.getByteValue;
-import static org.apache.commons.collections.MapUtils.getDoubleValue;
-import static org.apache.commons.collections.MapUtils.getFloatValue;
-import static org.apache.commons.collections.MapUtils.getIntValue;
-import static org.apache.commons.collections.MapUtils.getLongValue;
-import static org.apache.commons.collections.MapUtils.getShortValue;
-import static org.apache.commons.collections.MapUtils.getString;
+import static org.apache.commons.collections.MapUtils.*;
 import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ConversionUtils.bytes;
-import static org.usergrid.utils.ConversionUtils.coerceMap;
-import static org.usergrid.utils.ConversionUtils.getInt;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
 import static org.usergrid.utils.MapUtils.hashMap;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.isTimeBased;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
+import static org.usergrid.utils.UUIDUtils.*;
 
 
 @XmlRootElement

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Query.java b/stack/core/src/main/java/org/usergrid/mq/Query.java
index cf1e39c..9439586 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Query.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Query.java
@@ -16,23 +16,9 @@
 package org.usergrid.mq;
 
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CommonTokenStream;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.CounterResolution;
@@ -42,7 +28,10 @@ import org.usergrid.persistence.Results;
 import org.usergrid.persistence.Results.Level;
 import org.usergrid.utils.JsonUtils;
 
-import org.apache.commons.lang.StringUtils;
+import java.io.Serializable;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.apache.commons.lang.StringUtils.isBlank;
@@ -51,12 +40,7 @@ import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
 import static org.usergrid.persistence.Schema.PROPERTY_UUID;
 import static org.usergrid.utils.ClassUtils.cast;
 import static org.usergrid.utils.ConversionUtils.uuid;
-import static org.usergrid.utils.ListUtils.first;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.firstUuid;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
 import static org.usergrid.utils.MapUtils.toMapList;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
index a7eccd7..5b6f339 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
@@ -3,15 +3,7 @@
 package org.usergrid.mq;
 
 
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.Lexer;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
index dea193b..60c6423 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
@@ -3,15 +3,7 @@
 package org.usergrid.mq;
 
 
-import org.antlr.runtime.BitSet;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.Parser;
-import org.antlr.runtime.ParserRuleReturnScope;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.mq.Query.FilterPredicate;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
index 16e3afc..87c9643 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
@@ -1,14 +1,7 @@
 package org.usergrid.mq;
 
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
+import org.apache.commons.collections.comparators.ComparatorChain;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.mq.Query.FilterOperator;
@@ -20,15 +13,12 @@ import org.usergrid.utils.ListUtils;
 import org.usergrid.utils.NumberUtils;
 import org.usergrid.utils.StringUtils;
 
-import org.apache.commons.collections.comparators.ComparatorChain;
+import java.nio.ByteBuffer;
+import java.util.*;
 
 import static java.lang.Integer.parseInt;
-
 import static org.apache.commons.codec.binary.Base64.decodeBase64;
-import static org.apache.commons.lang.StringUtils.isBlank;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.split;
+import static org.apache.commons.lang.StringUtils.*;
 import static org.usergrid.mq.Query.SortDirection.DESCENDING;
 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/2e35e490/stack/core/src/main/java/org/usergrid/mq/Queue.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Queue.java b/stack/core/src/main/java/org/usergrid/mq/Queue.java
index deb5745..af75ead 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Queue.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Queue.java
@@ -16,27 +16,18 @@
 package org.usergrid.mq;
 
 
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.jackson.annotate.JsonAnyGetter;
 import org.codehaus.jackson.annotate.JsonAnySetter;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.usergrid.utils.UUIDUtils;
 
-import org.apache.commons.lang.StringUtils;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
 
 import static java.util.UUID.nameUUIDFromBytes;
-
-import static org.apache.commons.collections.MapUtils.getBooleanValue;
-import static org.apache.commons.collections.MapUtils.getByteValue;
-import static org.apache.commons.collections.MapUtils.getDoubleValue;
-import static org.apache.commons.collections.MapUtils.getFloatValue;
-import static org.apache.commons.collections.MapUtils.getIntValue;
-import static org.apache.commons.collections.MapUtils.getLongValue;
-import static org.apache.commons.collections.MapUtils.getShortValue;
-import static org.apache.commons.collections.MapUtils.getString;
+import static org.apache.commons.collections.MapUtils.*;
 import static org.usergrid.utils.MapUtils.hashMap;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueManager.java b/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
index a656425..4ba0a61 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
@@ -16,15 +16,15 @@
 package org.usergrid.mq;
 
 
+import org.usergrid.persistence.CounterResolution;
+import org.usergrid.persistence.Results;
+import org.usergrid.persistence.exceptions.TransactionNotFoundException;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-
 
 public interface QueueManager {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java b/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
index a689437..f5d6b86 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
@@ -16,14 +16,13 @@
 package org.usergrid.mq;
 
 
+import org.usergrid.utils.ConversionUtils;
+
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.usergrid.utils.ConversionUtils;
-
 import static java.util.UUID.nameUUIDFromBytes;
-
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 import static org.usergrid.utils.ConversionUtils.getLong;
 import static org.usergrid.utils.ListUtils.first;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueResults.java b/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
index f150cad..1cda104 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
@@ -16,15 +16,14 @@
 package org.usergrid.mq;
 
 
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 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;
-
 
 @XmlRootElement
 public class QueueResults {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueSet.java b/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
index b1fc63d..63e31c7 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
@@ -16,17 +16,12 @@
 package org.usergrid.mq;
 
 
-import java.util.ArrayList;
-import java.util.HashSet;
-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 javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
 
 @XmlRootElement
 public class QueueSet {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
index 266a15d..4d6cf42 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
@@ -16,13 +16,9 @@
 package org.usergrid.mq.cassandra;
 
 
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.usergrid.mq.Message;
@@ -32,26 +28,18 @@ import org.usergrid.utils.ConversionUtils;
 import org.usergrid.utils.JsonUtils;
 import org.usergrid.utils.UUIDUtils;
 
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
 
 import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static org.usergrid.mq.Message.MESSAGE_ID;
-import static org.usergrid.mq.Message.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.Message.MESSAGE_TYPE;
-import static org.usergrid.mq.Queue.QUEUE_NEWEST;
-import static org.usergrid.mq.Queue.QUEUE_OLDEST;
-import static org.usergrid.mq.Queue.QUEUE_PROPERTIES;
+import static org.usergrid.mq.Message.*;
+import static org.usergrid.mq.Queue.*;
 import static org.usergrid.mq.QueuePosition.CONSUMER;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.object;
+import static org.usergrid.utils.ConversionUtils.*;
 
 
 public class CassandraMQUtils {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
index 8626174..30aff4d 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
@@ -16,6 +16,11 @@
 package org.usergrid.mq.cassandra;
 
 
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.usergrid.mq.Message;
+
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
@@ -23,22 +28,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 
-import org.usergrid.mq.Message;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
-
 import static me.prettyprint.hector.api.factory.HFactory.createColumn;
 import static org.usergrid.mq.Message.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.indexValueCode;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValueOrJson;
+import static org.usergrid.mq.cassandra.QueueIndexUpdate.*;
 import static org.usergrid.mq.cassandra.QueueManagerImpl.DICTIONARY_MESSAGE_INDEXES;
 import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX;
 import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_DICTIONARIES;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
index e1c31a0..59d790c 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
@@ -16,26 +16,17 @@
 package org.usergrid.mq.cassandra;
 
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.codehaus.jackson.JsonNode;
-
 import com.fasterxml.uuid.UUIDComparator;
-
 import me.prettyprint.hector.api.beans.DynamicComposite;
 import me.prettyprint.hector.api.mutation.Mutator;
+import org.codehaus.jackson.JsonNode;
 
-import static java.nio.ByteBuffer.wrap;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
 
+import static java.nio.ByteBuffer.wrap;
 import static org.usergrid.utils.JsonUtils.toJsonNode;
 import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
 


Mime
View raw message