http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java index 4783452..8f225cc 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java @@ -16,8 +16,7 @@ package org.usergrid.mq.cassandra; -import java.util.UUID; - +import me.prettyprint.cassandra.serializers.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.locking.LockManager; @@ -26,12 +25,7 @@ import org.usergrid.mq.QueueManagerFactory; import org.usergrid.persistence.cassandra.CassandraService; import org.usergrid.persistence.cassandra.CounterUtils; -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 java.util.UUID; public class QueueManagerFactoryImpl implements QueueManagerFactory { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java index fd18e55..1ef29f4 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java @@ -16,41 +16,27 @@ package org.usergrid.mq.cassandra; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.UUID; - +import com.fasterxml.uuid.UUIDComparator; +import me.prettyprint.cassandra.serializers.*; +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality; +import me.prettyprint.hector.api.beans.*; +import me.prettyprint.hector.api.factory.HFactory; +import me.prettyprint.hector.api.mutation.Mutator; +import me.prettyprint.hector.api.query.MultigetSliceCounterQuery; +import me.prettyprint.hector.api.query.QueryResult; +import me.prettyprint.hector.api.query.SliceCounterQuery; +import me.prettyprint.hector.api.query.SliceQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.locking.LockManager; -import org.usergrid.mq.CounterQuery; -import org.usergrid.mq.Message; -import org.usergrid.mq.Query; +import org.usergrid.mq.*; import org.usergrid.mq.Query.CounterFilterPredicate; -import org.usergrid.mq.QueryProcessor; import org.usergrid.mq.QueryProcessor.QuerySlice; import org.usergrid.mq.Queue; -import org.usergrid.mq.QueueManager; -import org.usergrid.mq.QueueQuery; -import org.usergrid.mq.QueueResults; -import org.usergrid.mq.QueueSet; import org.usergrid.mq.QueueSet.QueueInfo; -import org.usergrid.mq.cassandra.QueueIndexUpdate.QueueIndexEntry; -import org.usergrid.mq.cassandra.io.ConsumerTransaction; -import org.usergrid.mq.cassandra.io.EndSearch; -import org.usergrid.mq.cassandra.io.FilterSearch; -import org.usergrid.mq.cassandra.io.NoTransactionSearch; -import org.usergrid.mq.cassandra.io.QueueBounds; -import org.usergrid.mq.cassandra.io.QueueSearch; -import org.usergrid.mq.cassandra.io.StartSearch; +import org.usergrid.mq.cassandra.QueueIndexUpdate.*; +import org.usergrid.mq.cassandra.io.*; import org.usergrid.persistence.AggregateCounter; import org.usergrid.persistence.AggregateCounterSet; import org.usergrid.persistence.CounterResolution; @@ -62,62 +48,17 @@ import org.usergrid.persistence.cassandra.CounterUtils.AggregateCounterSelection import org.usergrid.persistence.exceptions.TransactionNotFoundException; import org.usergrid.utils.UUIDUtils; -import com.fasterxml.uuid.UUIDComparator; - -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.Keyspace; -import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality; -import me.prettyprint.hector.api.beans.ColumnSlice; -import me.prettyprint.hector.api.beans.CounterRow; -import me.prettyprint.hector.api.beans.CounterRows; -import me.prettyprint.hector.api.beans.CounterSlice; -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.beans.HCounterColumn; -import me.prettyprint.hector.api.factory.HFactory; -import me.prettyprint.hector.api.mutation.Mutator; -import me.prettyprint.hector.api.query.MultigetSliceCounterQuery; -import me.prettyprint.hector.api.query.QueryResult; -import me.prettyprint.hector.api.query.SliceCounterQuery; -import me.prettyprint.hector.api.query.SliceQuery; +import java.nio.ByteBuffer; +import java.util.*; -import static me.prettyprint.hector.api.factory.HFactory.createColumn; -import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery; -import static me.prettyprint.hector.api.factory.HFactory.createMutator; -import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery; -import static org.usergrid.mq.Queue.QUEUE_CREATED; -import static org.usergrid.mq.Queue.QUEUE_MODIFIED; -import static org.usergrid.mq.Queue.QUEUE_NEWEST; -import static org.usergrid.mq.Queue.QUEUE_OLDEST; +import static me.prettyprint.hector.api.factory.HFactory.*; +import static org.usergrid.mq.Queue.*; import static org.usergrid.mq.Queue.getQueueId; -import static org.usergrid.mq.Queue.normalizeQueuePath; -import static org.usergrid.mq.QueuePosition.CONSUMER; -import static org.usergrid.mq.QueuePosition.END; -import static org.usergrid.mq.QueuePosition.LAST; -import static org.usergrid.mq.QueuePosition.START; -import static org.usergrid.mq.cassandra.CassandraMQUtils.addMessageToMutator; -import static org.usergrid.mq.cassandra.CassandraMQUtils.addQueueToMutator; -import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeMessage; -import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeQueue; -import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueShardRowKey; -import static org.usergrid.mq.cassandra.QueueIndexUpdate.indexValueCode; -import static org.usergrid.mq.cassandra.QueueIndexUpdate.toIndexableValue; -import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValue; -import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValueOrJson; -import static org.usergrid.mq.cassandra.QueuesCF.COUNTERS; -import static org.usergrid.mq.cassandra.QueuesCF.MESSAGE_PROPERTIES; -import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX; -import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX_ENTRIES; -import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_DICTIONARIES; -import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_INBOX; +import static org.usergrid.mq.QueuePosition.*; +import static org.usergrid.mq.cassandra.CassandraMQUtils.*; +import static org.usergrid.mq.cassandra.QueueIndexUpdate.*; +import static org.usergrid.mq.cassandra.QueuesCF.*; import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_PROPERTIES; -import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_SUBSCRIBERS; -import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_SUBSCRIPTIONS; import static org.usergrid.persistence.Schema.DICTIONARY_COUNTERS; import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS; import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java index 96e25e3..b8c8c43 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java @@ -16,11 +16,10 @@ package org.usergrid.mq.cassandra; -import java.util.List; - +import me.prettyprint.hector.api.ddl.ColumnDefinition; import org.usergrid.persistence.cassandra.CFEnum; -import me.prettyprint.hector.api.ddl.ColumnDefinition; +import java.util.List; import static me.prettyprint.hector.api.ddl.ComparatorType.COUNTERTYPE; import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getIndexMetadata; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java index 089d025..efb376d 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java @@ -16,24 +16,6 @@ package org.usergrid.mq.cassandra.io; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.usergrid.mq.Message; -import org.usergrid.mq.QueueResults; -import org.usergrid.mq.cassandra.io.NoTransactionSearch.SearchParam; -import org.usergrid.persistence.exceptions.QueueException; -import org.usergrid.utils.UUIDUtils; - import me.prettyprint.cassandra.serializers.ByteBufferSerializer; import me.prettyprint.cassandra.serializers.UUIDSerializer; import me.prettyprint.hector.api.Keyspace; @@ -44,26 +26,26 @@ import me.prettyprint.hector.api.beans.Rows; import me.prettyprint.hector.api.factory.HFactory; import me.prettyprint.hector.api.mutation.Mutator; import me.prettyprint.hector.api.query.SliceQuery; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.usergrid.mq.Message; +import org.usergrid.mq.QueueResults; +import org.usergrid.mq.cassandra.io.NoTransactionSearch.SearchParam; +import org.usergrid.persistence.exceptions.QueueException; +import org.usergrid.utils.UUIDUtils; + +import java.nio.ByteBuffer; +import java.util.*; -import static me.prettyprint.hector.api.factory.HFactory.createColumn; -import static me.prettyprint.hector.api.factory.HFactory.createMultigetSliceQuery; -import static me.prettyprint.hector.api.factory.HFactory.createMutator; -import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery; +import static me.prettyprint.hector.api.factory.HFactory.*; import static org.usergrid.mq.Queue.QUEUE_NEWEST; import static org.usergrid.mq.Queue.QUEUE_OLDEST; import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeMessage; import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueShardRowKey; -import static org.usergrid.mq.cassandra.QueueManagerImpl.ALL_COUNT; -import static org.usergrid.mq.cassandra.QueueManagerImpl.QUEUE_SHARD_INTERVAL; -import static org.usergrid.mq.cassandra.QueueManagerImpl.se; -import static org.usergrid.mq.cassandra.QueuesCF.CONSUMERS; -import static org.usergrid.mq.cassandra.QueuesCF.MESSAGE_PROPERTIES; -import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_INBOX; -import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_PROPERTIES; +import static org.usergrid.mq.cassandra.QueueManagerImpl.*; +import static org.usergrid.mq.cassandra.QueuesCF.*; import static org.usergrid.utils.NumberUtils.roundLong; -import static org.usergrid.utils.UUIDUtils.MAX_TIME_UUID; -import static org.usergrid.utils.UUIDUtils.MIN_TIME_UUID; -import static org.usergrid.utils.UUIDUtils.getTimestampInMillis; +import static org.usergrid.utils.UUIDUtils.*; /** @author tnine */ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java index 6466c47..cd8b0d3 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java @@ -16,13 +16,10 @@ package org.usergrid.mq.cassandra.io; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.HColumn; +import me.prettyprint.hector.api.mutation.Mutator; +import me.prettyprint.hector.api.query.SliceQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.locking.Lock; @@ -36,17 +33,15 @@ import org.usergrid.persistence.exceptions.QueueException; import org.usergrid.persistence.exceptions.TransactionNotFoundException; import org.usergrid.utils.UUIDUtils; -import me.prettyprint.hector.api.Keyspace; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.mutation.Mutator; -import me.prettyprint.hector.api.query.SliceQuery; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeUnit; -import static me.prettyprint.hector.api.factory.HFactory.createColumn; -import static me.prettyprint.hector.api.factory.HFactory.createMutator; -import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery; -import static org.usergrid.mq.cassandra.CassandraMQUtils.getConsumerId; -import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueClientTransactionKey; -import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueId; +import static me.prettyprint.hector.api.factory.HFactory.*; +import static org.usergrid.mq.cassandra.CassandraMQUtils.*; import static org.usergrid.mq.cassandra.QueuesCF.CONSUMER_QUEUE_TIMEOUTS; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java index 4ca09aa..caf62f6 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java @@ -16,11 +16,10 @@ package org.usergrid.mq.cassandra.io; -import java.util.UUID; - +import me.prettyprint.hector.api.Keyspace; import org.usergrid.mq.QueueQuery; -import me.prettyprint.hector.api.Keyspace; +import java.util.UUID; /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java index 0f629a3..8d43d4f 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java @@ -16,13 +16,11 @@ package org.usergrid.mq.cassandra.io; -import java.nio.ByteBuffer; -import java.util.Iterator; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.UUID; - +import com.fasterxml.uuid.UUIDComparator; +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality; +import me.prettyprint.hector.api.beans.DynamicComposite; +import me.prettyprint.hector.api.beans.HColumn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.mq.Message; @@ -31,12 +29,8 @@ import org.usergrid.mq.QueryProcessor.QuerySlice; import org.usergrid.mq.QueueQuery; import org.usergrid.mq.QueueResults; -import com.fasterxml.uuid.UUIDComparator; - -import me.prettyprint.hector.api.Keyspace; -import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality; -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.beans.HColumn; +import java.nio.ByteBuffer; +import java.util.*; import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery; import static org.usergrid.mq.Queue.getQueueId; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java index 3ac4f6f..ad06355 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java @@ -16,16 +16,15 @@ package org.usergrid.mq.cassandra.io; -import java.util.List; -import java.util.UUID; - +import me.prettyprint.hector.api.Keyspace; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.mq.Message; import org.usergrid.mq.QueueQuery; import org.usergrid.mq.QueueResults; -import me.prettyprint.hector.api.Keyspace; +import java.util.List; +import java.util.UUID; import static org.usergrid.mq.cassandra.CassandraMQUtils.getConsumerId; import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueId; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java index fbef8dd..e0522ef 100644 --- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java +++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java @@ -16,11 +16,10 @@ package org.usergrid.mq.cassandra.io; -import java.util.UUID; - +import me.prettyprint.hector.api.Keyspace; import org.usergrid.mq.QueueQuery; -import me.prettyprint.hector.api.Keyspace; +import java.util.UUID; /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java b/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java index 4c7e9c3..f7d3bac 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java +++ b/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java @@ -16,16 +16,6 @@ package org.usergrid.persistence; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -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.annotate.JsonIgnore; @@ -33,6 +23,10 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import org.usergrid.persistence.annotations.EntityProperty; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.*; +import java.util.Map.Entry; + import static org.usergrid.persistence.Schema.PROPERTY_NAME; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java b/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java index 44c1d34..1356cfe 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java +++ b/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java @@ -16,12 +16,12 @@ package org.usergrid.persistence; -import java.util.List; -import java.util.UUID; - import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import java.util.List; +import java.util.UUID; + public class AggregateCounterSet { private String name; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java b/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java index 9c645ce..93711d0 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java +++ b/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java @@ -16,20 +16,17 @@ package org.usergrid.persistence; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.persistence.Query.CounterFilterPredicate; 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/persistence/CredentialsInfo.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java index f8a635d..35c14ff 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java +++ b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java @@ -16,16 +16,15 @@ package org.usergrid.persistence; -import java.util.Map; -import java.util.TreeMap; - -import javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.annotate.JsonAnyGetter; import org.codehaus.jackson.annotate.JsonAnySetter; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.Map; +import java.util.TreeMap; + @XmlRootElement public class CredentialsInfo implements Comparable { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java b/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java index 455cfbc..66bf07b 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java +++ b/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java @@ -16,14 +16,13 @@ package org.usergrid.persistence; -import java.util.Map; -import java.util.UUID; - -import javax.xml.bind.annotation.XmlRootElement; - import org.usergrid.persistence.annotations.EntityProperty; import org.usergrid.utils.UUIDUtils; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.Map; +import java.util.UUID; + /** * Dynamic entities can represent any entity type whether specified in the Schema or not. http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Entity.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/Entity.java b/stack/core/src/main/java/org/usergrid/persistence/Entity.java index 2b47060..4dded5d 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/Entity.java +++ b/stack/core/src/main/java/org/usergrid/persistence/Entity.java @@ -16,22 +16,18 @@ package org.usergrid.persistence; -import java.util.List; -import java.util.Map; -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.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.usergrid.persistence.annotations.EntityProperty; -import static org.usergrid.persistence.Schema.PROPERTY_NAME; -import static org.usergrid.persistence.Schema.PROPERTY_TYPE; -import static org.usergrid.persistence.Schema.PROPERTY_URI; -import static org.usergrid.persistence.Schema.PROPERTY_UUID; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import static org.usergrid.persistence.Schema.*; /** Entities are the base object type in the service. */ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java b/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java index e4c4ae9..5f9f928 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java +++ b/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java @@ -16,11 +16,11 @@ package org.usergrid.persistence; -import java.util.UUID; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.UUID; + /** A factory for creating Entity objects. */ public class EntityFactory { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java b/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java index 29f9019..6575159 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java +++ b/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java @@ -16,17 +16,13 @@ package org.usergrid.persistence; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - import org.usergrid.persistence.Results.Level; import org.usergrid.persistence.cassandra.GeoIndexManager; import org.usergrid.persistence.entities.Application; import org.usergrid.persistence.entities.Role; +import java.util.*; + /** * The interface class for the data access object for Applications. Each application contains a set of users as well as http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Identifier.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java index 226ded0..59d9697 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java +++ b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java @@ -16,6 +16,9 @@ package org.usergrid.persistence; +import org.codehaus.jackson.annotate.JsonIgnore; +import org.usergrid.utils.UUIDUtils; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -23,9 +26,6 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.usergrid.utils.UUIDUtils; - public class Identifier implements Serializable { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Query.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/Query.java b/stack/core/src/main/java/org/usergrid/persistence/Query.java index b6ef324..c743dbe 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/Query.java +++ b/stack/core/src/main/java/org/usergrid/persistence/Query.java @@ -16,42 +16,21 @@ package org.usergrid.persistence; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.UUID; - -import org.antlr.runtime.ANTLRStringStream; -import org.antlr.runtime.ClassicToken; -import org.antlr.runtime.CommonTokenStream; -import org.antlr.runtime.RecognitionException; -import org.antlr.runtime.Token; -import org.antlr.runtime.TokenRewriteStream; +import org.antlr.runtime.*; +import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.annotate.JsonIgnore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.persistence.Results.Level; import org.usergrid.persistence.exceptions.QueryParseException; -import org.usergrid.persistence.query.tree.AndOperand; -import org.usergrid.persistence.query.tree.ContainsOperand; -import org.usergrid.persistence.query.tree.Equal; -import org.usergrid.persistence.query.tree.EqualityOperand; -import org.usergrid.persistence.query.tree.GreaterThan; -import org.usergrid.persistence.query.tree.GreaterThanEqual; -import org.usergrid.persistence.query.tree.LessThan; -import org.usergrid.persistence.query.tree.LessThanEqual; -import org.usergrid.persistence.query.tree.Operand; -import org.usergrid.persistence.query.tree.QueryFilterLexer; -import org.usergrid.persistence.query.tree.QueryFilterParser; +import org.usergrid.persistence.query.tree.*; import org.usergrid.utils.JsonUtils; -import org.apache.commons.lang.StringUtils; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.*; +import java.util.Map.Entry; import static org.apache.commons.codec.binary.Base64.decodeBase64; import static org.apache.commons.lang.StringUtils.isBlank; @@ -59,12 +38,7 @@ import static org.apache.commons.lang.StringUtils.split; 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/persistence/QueryUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java b/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java index 892aeff..a4183f6 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java +++ b/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java @@ -1,11 +1,11 @@ package org.usergrid.persistence; +import org.usergrid.utils.ListUtils; + import java.util.List; import java.util.Map; -import org.usergrid.utils.ListUtils; - /** * Utilities to deal with query extraction and generation http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java b/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java index dab436d..afd0082 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java +++ b/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java @@ -16,13 +16,13 @@ package org.usergrid.persistence; +import org.usergrid.persistence.Results.Level; + import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; -import org.usergrid.persistence.Results.Level; - public interface RelationManager { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Results.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/Results.java b/stack/core/src/main/java/org/usergrid/persistence/Results.java index ea7da45..52294ec 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/Results.java +++ b/stack/core/src/main/java/org/usergrid/persistence/Results.java @@ -16,19 +16,6 @@ package org.usergrid.persistence; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -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 javax.xml.bind.annotation.XmlRootElement; - import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import org.usergrid.persistence.cassandra.QueryProcessor; @@ -36,6 +23,10 @@ import org.usergrid.persistence.query.ir.SearchVisitor; import org.usergrid.utils.MapUtils; import org.usergrid.utils.StringUtils; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.*; +import java.util.Map.Entry; + import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString; import static org.usergrid.persistence.SimpleEntityRef.ref; import static org.usergrid.utils.ClassUtils.cast; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Schema.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/Schema.java b/stack/core/src/main/java/org/usergrid/persistence/Schema.java index 2d233c1..f89ce56 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/Schema.java +++ b/stack/core/src/main/java/org/usergrid/persistence/Schema.java @@ -16,30 +16,14 @@ package org.usergrid.persistence; -import java.beans.PropertyDescriptor; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.nio.ByteBuffer; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; - -import javax.crypto.Cipher; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; - +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import me.prettyprint.hector.api.beans.ColumnSlice; +import me.prettyprint.hector.api.beans.HColumn; +import me.prettyprint.hector.api.beans.Row; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.reflect.FieldUtils; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; @@ -65,21 +49,23 @@ import org.usergrid.utils.InflectionUtils; import org.usergrid.utils.JsonUtils; import org.usergrid.utils.MapUtils; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.reflect.FieldUtils; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; - -import me.prettyprint.hector.api.beans.ColumnSlice; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.beans.Row; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.beans.PropertyDescriptor; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.security.SecureRandom; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.usergrid.utils.ConversionUtils.bytebuffer; -import static org.usergrid.utils.ConversionUtils.string; -import static org.usergrid.utils.ConversionUtils.uuid; +import static org.usergrid.utils.ConversionUtils.*; import static org.usergrid.utils.InflectionUtils.pluralize; import static org.usergrid.utils.InflectionUtils.singularize; import static org.usergrid.utils.JsonUtils.toJsonNode; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java b/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java index dab819b..8e7114c 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java +++ b/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java @@ -16,10 +16,10 @@ package org.usergrid.persistence; -import java.util.UUID; - import org.usergrid.persistence.cassandra.CassandraPersistenceUtils; +import java.util.UUID; + public class SimpleCollectionRef implements CollectionRef { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java b/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java index d77b23c..a34414d 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java +++ b/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java @@ -16,14 +16,14 @@ package org.usergrid.persistence; -import java.util.UUID; - import org.springframework.util.Assert; import org.usergrid.persistence.cassandra.CassandraPersistenceUtils; import org.usergrid.persistence.entities.Group; import org.usergrid.utils.StringUtils; import org.usergrid.utils.UUIDUtils; +import java.util.UUID; + public class SimpleRoleRef implements RoleRef { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java index 0cca4c5..b33e80b 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java @@ -16,10 +16,10 @@ package org.usergrid.persistence.cassandra; -import java.util.List; - import me.prettyprint.hector.api.ddl.ColumnDefinition; +import java.util.List; + import static me.prettyprint.hector.api.ddl.ComparatorType.COUNTERTYPE; import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getIndexMetadata; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java index 859dd1a..ad34b4c 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java @@ -16,10 +16,10 @@ package org.usergrid.persistence.cassandra; -import java.util.List; - import me.prettyprint.hector.api.ddl.ColumnDefinition; +import java.util.List; + public interface CFEnum { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java index 0046397..9363e8b 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java @@ -16,27 +16,6 @@ package org.usergrid.persistence.cassandra; -import java.io.IOException; -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; -import java.util.UUID; - -import org.codehaus.jackson.JsonNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.usergrid.utils.JsonUtils; - -import org.apache.cassandra.thrift.ColumnDef; -import org.apache.cassandra.thrift.IndexType; -import org.apache.commons.lang.StringUtils; - import me.prettyprint.cassandra.serializers.ByteBufferSerializer; import me.prettyprint.cassandra.serializers.StringSerializer; import me.prettyprint.cassandra.serializers.UUIDSerializer; @@ -51,19 +30,26 @@ import me.prettyprint.hector.api.ddl.KeyspaceDefinition; import me.prettyprint.hector.api.factory.HFactory; import me.prettyprint.hector.api.mutation.MutationResult; import me.prettyprint.hector.api.mutation.Mutator; +import org.apache.cassandra.thrift.ColumnDef; +import org.apache.cassandra.thrift.IndexType; +import org.apache.commons.lang.StringUtils; +import org.codehaus.jackson.JsonNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.usergrid.utils.JsonUtils; -import static java.nio.ByteBuffer.wrap; +import java.io.IOException; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.util.*; +import java.util.Map.Entry; +import static java.nio.ByteBuffer.wrap; import static me.prettyprint.hector.api.factory.HFactory.createClockResolution; import static me.prettyprint.hector.api.factory.HFactory.createColumn; import static org.apache.commons.beanutils.MethodUtils.invokeStaticMethod; -import static org.apache.commons.lang.StringUtils.removeEnd; -import static org.apache.commons.lang.StringUtils.removeStart; -import static org.apache.commons.lang.StringUtils.split; -import static org.apache.commons.lang.StringUtils.substringAfterLast; -import static org.usergrid.persistence.Schema.PROPERTY_TYPE; -import static org.usergrid.persistence.Schema.PROPERTY_UUID; -import static org.usergrid.persistence.Schema.serializeEntityProperty; +import static org.apache.commons.lang.StringUtils.*; +import static org.usergrid.persistence.Schema.*; import static org.usergrid.utils.ClassUtils.isBasicType; import static org.usergrid.utils.ConversionUtils.bytebuffer; import static org.usergrid.utils.JsonUtils.toJsonNode; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java index c471294..256e61e 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java @@ -16,68 +16,34 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.usergrid.locking.LockManager; -import org.usergrid.persistence.IndexBucketLocator; -import org.usergrid.persistence.IndexBucketLocator.IndexType; -import org.usergrid.persistence.cassandra.index.IndexBucketScanner; -import org.usergrid.persistence.cassandra.index.IndexScanner; - import me.prettyprint.cassandra.connection.HConnectionManager; import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel; -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.cassandra.serializers.*; import me.prettyprint.cassandra.service.CassandraHostConfigurator; import me.prettyprint.cassandra.service.ThriftKsDef; -import me.prettyprint.hector.api.Cluster; -import me.prettyprint.hector.api.ConsistencyLevelPolicy; -import me.prettyprint.hector.api.HConsistencyLevel; -import me.prettyprint.hector.api.Keyspace; -import me.prettyprint.hector.api.Serializer; -import me.prettyprint.hector.api.beans.ColumnSlice; -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.beans.OrderedRows; -import me.prettyprint.hector.api.beans.Row; -import me.prettyprint.hector.api.beans.Rows; +import me.prettyprint.hector.api.*; +import me.prettyprint.hector.api.beans.*; import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition; import me.prettyprint.hector.api.ddl.KeyspaceDefinition; import me.prettyprint.hector.api.factory.HFactory; import me.prettyprint.hector.api.mutation.Mutator; -import me.prettyprint.hector.api.query.ColumnQuery; -import me.prettyprint.hector.api.query.CountQuery; -import me.prettyprint.hector.api.query.MultigetSliceQuery; -import me.prettyprint.hector.api.query.QueryResult; -import me.prettyprint.hector.api.query.RangeSlicesQuery; -import me.prettyprint.hector.api.query.SliceQuery; +import me.prettyprint.hector.api.query.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.usergrid.locking.LockManager; +import org.usergrid.persistence.IndexBucketLocator; +import org.usergrid.persistence.IndexBucketLocator.IndexType; +import org.usergrid.persistence.cassandra.index.IndexBucketScanner; +import org.usergrid.persistence.cassandra.index.IndexScanner; + +import java.nio.ByteBuffer; +import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import static me.prettyprint.cassandra.service.FailoverPolicy.ON_FAIL_TRY_ALL_AVAILABLE; -import static me.prettyprint.hector.api.factory.HFactory.createColumn; -import static me.prettyprint.hector.api.factory.HFactory.createMultigetSliceQuery; -import static me.prettyprint.hector.api.factory.HFactory.createMutator; -import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery; -import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery; -import static me.prettyprint.hector.api.factory.HFactory.createVirtualKeyspace; +import static me.prettyprint.hector.api.factory.HFactory.*; import static org.apache.commons.collections.MapUtils.getIntValue; import static org.apache.commons.collections.MapUtils.getString; import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java index c093329..9c92eaf 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java @@ -16,12 +16,12 @@ package org.usergrid.persistence.cassandra; -import java.util.UUID; - import org.usergrid.persistence.ConnectedEntityRef; import org.usergrid.persistence.EntityRef; import org.usergrid.persistence.SimpleEntityRef; +import java.util.UUID; + public class ConnectedEntityRefImpl extends SimpleEntityRef implements ConnectedEntityRef { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java index c37d45d..36562ff 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java @@ -16,14 +16,8 @@ package org.usergrid.persistence.cassandra; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.UUID; - +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.persistence.ConnectedEntityRef; @@ -31,8 +25,9 @@ import org.usergrid.persistence.ConnectionRef; import org.usergrid.persistence.EntityRef; import org.usergrid.persistence.SimpleEntityRef; -import org.apache.commons.codec.binary.Hex; -import org.apache.commons.lang.StringUtils; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.*; import static org.usergrid.persistence.SimpleEntityRef.ref; import static org.usergrid.utils.ConversionUtils.ascii; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java index 4962fb6..d76bede 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java @@ -16,40 +16,27 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.HashSet; -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.HCounterColumn; +import me.prettyprint.hector.api.mutation.Mutator; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.usergrid.count.Batcher; +import org.usergrid.count.common.Count; import org.usergrid.mq.Message; import org.usergrid.mq.cassandra.QueuesCF; import org.usergrid.persistence.CounterResolution; import org.usergrid.persistence.entities.Event; -import org.apache.commons.lang.StringUtils; - -import org.usergrid.count.Batcher; -import org.usergrid.count.common.Count; - -import me.prettyprint.cassandra.serializers.ByteBufferSerializer; -import me.prettyprint.cassandra.serializers.LongSerializer; -import me.prettyprint.cassandra.serializers.PrefixedSerializer; -import me.prettyprint.cassandra.serializers.StringSerializer; -import me.prettyprint.cassandra.serializers.UUIDSerializer; -import me.prettyprint.hector.api.beans.HCounterColumn; -import me.prettyprint.hector.api.mutation.Mutator; +import java.nio.ByteBuffer; +import java.util.*; +import java.util.Map.Entry; import static me.prettyprint.hector.api.factory.HFactory.createColumn; import static me.prettyprint.hector.api.factory.HFactory.createCounterColumn; import static org.usergrid.persistence.Schema.DICTIONARY_COUNTERS; -import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COUNTERS; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES; +import static org.usergrid.persistence.cassandra.ApplicationCF.*; import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator; import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key; import static org.usergrid.utils.ConversionUtils.bytebuffer; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java index 7b29a2b..2614e39 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.Map.Entry; import static java.lang.Integer.parseInt; - import static org.apache.commons.codec.binary.Base64.decodeBase64; import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString; import static org.apache.commons.lang.StringUtils.split; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java index 1868f9a..5b5b26d 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java @@ -16,11 +16,17 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.TreeMap; -import java.util.UUID; - +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.yammer.metrics.annotation.Metered; +import me.prettyprint.cassandra.serializers.*; +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.*; +import me.prettyprint.hector.api.mutation.Mutator; +import me.prettyprint.hector.api.query.QueryResult; +import me.prettyprint.hector.api.query.RangeSlicesQuery; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -33,42 +39,17 @@ import org.usergrid.persistence.entities.Application; import org.usergrid.persistence.exceptions.ApplicationAlreadyExistsException; import org.usergrid.utils.UUIDUtils; -import org.apache.commons.lang.StringUtils; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.yammer.metrics.annotation.Metered; - -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.Keyspace; -import me.prettyprint.hector.api.beans.ColumnSlice; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.beans.OrderedRows; -import me.prettyprint.hector.api.beans.Row; -import me.prettyprint.hector.api.beans.Rows; -import me.prettyprint.hector.api.mutation.Mutator; -import me.prettyprint.hector.api.query.QueryResult; -import me.prettyprint.hector.api.query.RangeSlicesQuery; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.TreeMap; +import java.util.UUID; import static java.lang.String.CASE_INSENSITIVE_ORDER; - import static me.prettyprint.hector.api.factory.HFactory.createMutator; import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery; -import static org.usergrid.persistence.Schema.PROPERTY_NAME; -import static org.usergrid.persistence.Schema.PROPERTY_UUID; -import static org.usergrid.persistence.Schema.TYPE_APPLICATION; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.asMap; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute; -import static org.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF; -import static org.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF; -import static org.usergrid.persistence.cassandra.CassandraService.RETRY_COUNT; +import static org.usergrid.persistence.Schema.*; +import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*; +import static org.usergrid.persistence.cassandra.CassandraService.*; import static org.usergrid.utils.ConversionUtils.uuid; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java index fda492d..8dd10bc 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java @@ -16,25 +16,20 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.UUID; - -import javax.annotation.Resource; - +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import com.yammer.metrics.annotation.Metered; +import me.prettyprint.cassandra.serializers.ByteBufferSerializer; +import me.prettyprint.cassandra.serializers.LongSerializer; +import me.prettyprint.cassandra.serializers.StringSerializer; +import me.prettyprint.cassandra.serializers.UUIDSerializer; +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.*; +import me.prettyprint.hector.api.factory.HFactory; +import me.prettyprint.hector.api.mutation.Mutator; +import me.prettyprint.hector.api.query.MultigetSliceCounterQuery; +import me.prettyprint.hector.api.query.QueryResult; +import me.prettyprint.hector.api.query.SliceCounterQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; @@ -43,37 +38,13 @@ import org.usergrid.locking.Lock; import org.usergrid.mq.Message; import org.usergrid.mq.QueueManager; import org.usergrid.mq.cassandra.QueueManagerFactoryImpl; -import org.usergrid.persistence.AggregateCounter; -import org.usergrid.persistence.AggregateCounterSet; -import org.usergrid.persistence.CollectionRef; -import org.usergrid.persistence.ConnectedEntityRef; -import org.usergrid.persistence.ConnectionRef; -import org.usergrid.persistence.CounterResolution; -import org.usergrid.persistence.DynamicEntity; -import org.usergrid.persistence.Entity; -import org.usergrid.persistence.EntityFactory; -import org.usergrid.persistence.EntityManager; -import org.usergrid.persistence.EntityRef; -import org.usergrid.persistence.Identifier; -import org.usergrid.persistence.IndexBucketLocator; +import org.usergrid.persistence.*; import org.usergrid.persistence.IndexBucketLocator.IndexType; -import org.usergrid.persistence.Query; import org.usergrid.persistence.Query.CounterFilterPredicate; -import org.usergrid.persistence.Results; import org.usergrid.persistence.Results.Level; -import org.usergrid.persistence.RoleRef; -import org.usergrid.persistence.Schema; -import org.usergrid.persistence.SimpleCollectionRef; -import org.usergrid.persistence.SimpleEntityRef; -import org.usergrid.persistence.SimpleRoleRef; -import org.usergrid.persistence.TypedEntity; import org.usergrid.persistence.cassandra.CounterUtils.AggregateCounterSelection; import org.usergrid.persistence.cassandra.util.TraceParticipant; -import org.usergrid.persistence.entities.Application; -import org.usergrid.persistence.entities.Event; -import org.usergrid.persistence.entities.Group; -import org.usergrid.persistence.entities.Role; -import org.usergrid.persistence.entities.User; +import org.usergrid.persistence.entities.*; import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException; import org.usergrid.persistence.exceptions.EntityNotFoundException; import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException; @@ -83,33 +54,12 @@ import org.usergrid.utils.ClassUtils; import org.usergrid.utils.CompositeUtils; import org.usergrid.utils.UUIDUtils; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import com.yammer.metrics.annotation.Metered; - -import me.prettyprint.cassandra.serializers.ByteBufferSerializer; -import me.prettyprint.cassandra.serializers.LongSerializer; -import me.prettyprint.cassandra.serializers.StringSerializer; -import me.prettyprint.cassandra.serializers.UUIDSerializer; -import me.prettyprint.hector.api.Keyspace; -import me.prettyprint.hector.api.beans.ColumnSlice; -import me.prettyprint.hector.api.beans.CounterRow; -import me.prettyprint.hector.api.beans.CounterRows; -import me.prettyprint.hector.api.beans.CounterSlice; -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.beans.HCounterColumn; -import me.prettyprint.hector.api.beans.Row; -import me.prettyprint.hector.api.beans.Rows; -import me.prettyprint.hector.api.factory.HFactory; -import me.prettyprint.hector.api.mutation.Mutator; -import me.prettyprint.hector.api.query.MultigetSliceCounterQuery; -import me.prettyprint.hector.api.query.QueryResult; -import me.prettyprint.hector.api.query.SliceCounterQuery; +import javax.annotation.Resource; +import java.nio.ByteBuffer; +import java.util.*; import static java.lang.String.CASE_INSENSITIVE_ORDER; import static java.util.Arrays.asList; - import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery; import static me.prettyprint.hector.api.factory.HFactory.createMutator; import static org.apache.commons.lang.StringUtils.capitalize; @@ -117,59 +67,18 @@ import static org.apache.commons.lang.StringUtils.isBlank; import static org.usergrid.locking.LockHelper.getUniqueUpdateLock; import static org.usergrid.persistence.Results.Level.REFS; import static org.usergrid.persistence.Results.fromEntities; -import static org.usergrid.persistence.Schema.COLLECTION_ROLES; -import static org.usergrid.persistence.Schema.COLLECTION_USERS; -import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS; -import static org.usergrid.persistence.Schema.DICTIONARY_PERMISSIONS; -import static org.usergrid.persistence.Schema.DICTIONARY_PROPERTIES; -import static org.usergrid.persistence.Schema.DICTIONARY_ROLENAMES; -import static org.usergrid.persistence.Schema.DICTIONARY_ROLETIMES; -import static org.usergrid.persistence.Schema.DICTIONARY_SETS; -import static org.usergrid.persistence.Schema.PROPERTY_ASSOCIATED; -import static org.usergrid.persistence.Schema.PROPERTY_CREATED; -import static org.usergrid.persistence.Schema.PROPERTY_INACTIVITY; -import static org.usergrid.persistence.Schema.PROPERTY_MODIFIED; -import static org.usergrid.persistence.Schema.PROPERTY_NAME; -import static org.usergrid.persistence.Schema.PROPERTY_TIMESTAMP; -import static org.usergrid.persistence.Schema.PROPERTY_TYPE; -import static org.usergrid.persistence.Schema.PROPERTY_UUID; -import static org.usergrid.persistence.Schema.TYPE_APPLICATION; -import static org.usergrid.persistence.Schema.TYPE_CONNECTION; -import static org.usergrid.persistence.Schema.TYPE_ENTITY; -import static org.usergrid.persistence.Schema.TYPE_MEMBER; -import static org.usergrid.persistence.Schema.TYPE_ROLE; -import static org.usergrid.persistence.Schema.defaultCollectionName; -import static org.usergrid.persistence.Schema.deserializeEntityProperties; -import static org.usergrid.persistence.Schema.getDefaultSchema; +import static org.usergrid.persistence.Schema.*; import static org.usergrid.persistence.SimpleEntityRef.getUuid; import static org.usergrid.persistence.SimpleEntityRef.ref; import static org.usergrid.persistence.SimpleRoleRef.getIdForGroupIdAndRoleName; import static org.usergrid.persistence.SimpleRoleRef.getIdForRoleName; -import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COUNTERS; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_PROPERTIES; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addPropertyToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.toStorableBinaryValue; +import static org.usergrid.persistence.cassandra.ApplicationCF.*; +import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*; import static org.usergrid.persistence.cassandra.CassandraService.ALL_COUNT; import static org.usergrid.utils.ClassUtils.cast; -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.string; -import static org.usergrid.utils.ConversionUtils.uuid; +import static org.usergrid.utils.ConversionUtils.*; import static org.usergrid.utils.InflectionUtils.singularize; -import static org.usergrid.utils.UUIDUtils.getTimestampInMicros; -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.*; /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java index d4b13e7..4ebaaaf 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java @@ -16,12 +16,12 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.List; - import me.prettyprint.cassandra.serializers.AbstractSerializer; import me.prettyprint.hector.api.beans.DynamicComposite; +import java.nio.ByteBuffer; +import java.util.List; + import static org.usergrid.utils.ConversionUtils.bytebuffer; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java index 1f83422..b21093c 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java @@ -16,10 +16,11 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.UUID; - +import me.prettyprint.cassandra.serializers.ByteBufferSerializer; +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.DynamicComposite; +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.persistence.EntityRef; @@ -29,21 +30,16 @@ import org.usergrid.persistence.geo.EntityLocationRef; import org.usergrid.persistence.geo.GeocellManager; import org.usergrid.persistence.geo.model.Point; -import me.prettyprint.cassandra.serializers.ByteBufferSerializer; -import me.prettyprint.hector.api.Keyspace; -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.mutation.Mutator; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.UUID; import static me.prettyprint.hector.api.factory.HFactory.createColumn; import static me.prettyprint.hector.api.factory.HFactory.createMutator; import static org.usergrid.persistence.Schema.DICTIONARY_GEOCELL; import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS; import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.logBatchOperation; +import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*; import static org.usergrid.utils.ConversionUtils.bytebuffer; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java index 0a3f578..3f5ab2c 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java @@ -16,30 +16,21 @@ package org.usergrid.persistence.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 com.fasterxml.uuid.UUIDComparator; +import me.prettyprint.hector.api.beans.DynamicComposite; +import me.prettyprint.hector.api.mutation.Mutator; import org.codehaus.jackson.JsonNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.persistence.Entity; -import com.fasterxml.uuid.UUIDComparator; - -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.mutation.Mutator; +import java.io.IOException; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.util.*; import static java.nio.ByteBuffer.wrap; import static java.util.Arrays.asList; - import static org.usergrid.utils.JsonUtils.toJsonNode; import static org.usergrid.utils.UUIDUtils.getTimestampInMicros; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java index b5d77a3..cd80803 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java @@ -16,61 +16,26 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Stack; -import java.util.UUID; - +import me.prettyprint.cassandra.serializers.UUIDSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.usergrid.persistence.EntityManager; -import org.usergrid.persistence.Identifier; -import org.usergrid.persistence.Query; +import org.usergrid.persistence.*; import org.usergrid.persistence.Query.SortDirection; import org.usergrid.persistence.Query.SortPredicate; -import org.usergrid.persistence.Results; -import org.usergrid.persistence.Schema; import org.usergrid.persistence.entities.User; import org.usergrid.persistence.exceptions.NoFullTextIndexException; import org.usergrid.persistence.exceptions.NoIndexException; import org.usergrid.persistence.exceptions.PersistenceException; -import org.usergrid.persistence.query.ir.AllNode; -import org.usergrid.persistence.query.ir.AndNode; -import org.usergrid.persistence.query.ir.EmailIdentifierNode; -import org.usergrid.persistence.query.ir.NameIdentifierNode; -import org.usergrid.persistence.query.ir.NotNode; -import org.usergrid.persistence.query.ir.OrNode; -import org.usergrid.persistence.query.ir.OrderByNode; -import org.usergrid.persistence.query.ir.QueryNode; -import org.usergrid.persistence.query.ir.QuerySlice; -import org.usergrid.persistence.query.ir.SearchVisitor; -import org.usergrid.persistence.query.ir.SliceNode; -import org.usergrid.persistence.query.ir.UuidIdentifierNode; -import org.usergrid.persistence.query.ir.WithinNode; +import org.usergrid.persistence.query.ir.*; import org.usergrid.persistence.query.ir.result.ResultIterator; import org.usergrid.persistence.query.ir.result.ResultsLoader; import org.usergrid.persistence.query.ir.result.ResultsLoaderFactory; import org.usergrid.persistence.query.ir.result.ScanColumn; -import org.usergrid.persistence.query.tree.AndOperand; -import org.usergrid.persistence.query.tree.ContainsOperand; -import org.usergrid.persistence.query.tree.Equal; -import org.usergrid.persistence.query.tree.EqualityOperand; -import org.usergrid.persistence.query.tree.GreaterThan; -import org.usergrid.persistence.query.tree.GreaterThanEqual; -import org.usergrid.persistence.query.tree.LessThan; -import org.usergrid.persistence.query.tree.LessThanEqual; -import org.usergrid.persistence.query.tree.Literal; -import org.usergrid.persistence.query.tree.NotOperand; -import org.usergrid.persistence.query.tree.Operand; -import org.usergrid.persistence.query.tree.OrOperand; -import org.usergrid.persistence.query.tree.QueryVisitor; -import org.usergrid.persistence.query.tree.StringLiteral; -import org.usergrid.persistence.query.tree.WithinOperand; +import org.usergrid.persistence.query.tree.*; import org.usergrid.persistence.schema.CollectionInfo; -import me.prettyprint.cassandra.serializers.UUIDSerializer; +import java.nio.ByteBuffer; +import java.util.*; import static org.usergrid.persistence.Schema.getDefaultSchema; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java index d56a1ed..52983b4 100644 --- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java +++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java @@ -16,41 +16,21 @@ package org.usergrid.persistence.cassandra; -import java.nio.ByteBuffer; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.UUID; - +import com.yammer.metrics.annotation.Metered; +import me.prettyprint.cassandra.serializers.ByteBufferSerializer; +import me.prettyprint.cassandra.serializers.StringSerializer; +import me.prettyprint.cassandra.serializers.UUIDSerializer; +import me.prettyprint.hector.api.Keyspace; +import me.prettyprint.hector.api.beans.DynamicComposite; +import me.prettyprint.hector.api.beans.HColumn; +import me.prettyprint.hector.api.mutation.Mutator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.Assert; -import org.usergrid.persistence.CollectionRef; -import org.usergrid.persistence.ConnectedEntityRef; -import org.usergrid.persistence.ConnectionRef; -import org.usergrid.persistence.Entity; -import org.usergrid.persistence.EntityRef; -import org.usergrid.persistence.IndexBucketLocator; +import org.usergrid.persistence.*; import org.usergrid.persistence.IndexBucketLocator.IndexType; -import org.usergrid.persistence.PagingResultsIterator; -import org.usergrid.persistence.Query; -import org.usergrid.persistence.RelationManager; -import org.usergrid.persistence.Results; import org.usergrid.persistence.Results.Level; -import org.usergrid.persistence.RoleRef; -import org.usergrid.persistence.Schema; -import org.usergrid.persistence.SimpleCollectionRef; -import org.usergrid.persistence.SimpleEntityRef; -import org.usergrid.persistence.SimpleRoleRef; -import org.usergrid.persistence.cassandra.IndexUpdate.IndexEntry; +import org.usergrid.persistence.cassandra.IndexUpdate.*; import org.usergrid.persistence.cassandra.index.ConnectedIndexScanner; import org.usergrid.persistence.cassandra.index.IndexBucketScanner; import org.usergrid.persistence.cassandra.index.IndexScanner; @@ -60,77 +40,26 @@ import org.usergrid.persistence.geo.CollectionGeoSearch; import org.usergrid.persistence.geo.ConnectionGeoSearch; import org.usergrid.persistence.geo.EntityLocationRef; import org.usergrid.persistence.geo.model.Point; -import org.usergrid.persistence.query.ir.AllNode; -import org.usergrid.persistence.query.ir.NameIdentifierNode; -import org.usergrid.persistence.query.ir.QueryNode; -import org.usergrid.persistence.query.ir.QuerySlice; -import org.usergrid.persistence.query.ir.SearchVisitor; -import org.usergrid.persistence.query.ir.WithinNode; -import org.usergrid.persistence.query.ir.result.CollectionResultsLoaderFactory; -import org.usergrid.persistence.query.ir.result.ConnectionIndexSliceParser; -import org.usergrid.persistence.query.ir.result.ConnectionResultsLoaderFactory; -import org.usergrid.persistence.query.ir.result.ConnectionTypesIterator; -import org.usergrid.persistence.query.ir.result.EmptyIterator; -import org.usergrid.persistence.query.ir.result.GeoIterator; -import org.usergrid.persistence.query.ir.result.SliceIterator; -import org.usergrid.persistence.query.ir.result.StaticIdIterator; -import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser; +import org.usergrid.persistence.query.ir.*; +import org.usergrid.persistence.query.ir.result.*; import org.usergrid.persistence.schema.CollectionInfo; import org.usergrid.utils.IndexUtils; import org.usergrid.utils.MapUtils; -import com.yammer.metrics.annotation.Metered; - -import me.prettyprint.cassandra.serializers.ByteBufferSerializer; -import me.prettyprint.cassandra.serializers.StringSerializer; -import me.prettyprint.cassandra.serializers.UUIDSerializer; -import me.prettyprint.hector.api.Keyspace; -import me.prettyprint.hector.api.beans.DynamicComposite; -import me.prettyprint.hector.api.beans.HColumn; -import me.prettyprint.hector.api.mutation.Mutator; +import java.nio.ByteBuffer; +import java.util.*; +import java.util.Map.Entry; import static java.lang.String.CASE_INSENSITIVE_ORDER; import static java.util.Arrays.asList; - import static me.prettyprint.hector.api.factory.HFactory.createMutator; -import static org.usergrid.persistence.Schema.COLLECTION_ROLES; -import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS; -import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_ENTITIES; -import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_TYPES; -import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_ENTITIES; -import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_TYPES; -import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS; -import static org.usergrid.persistence.Schema.PROPERTY_COLLECTION_NAME; -import static org.usergrid.persistence.Schema.PROPERTY_INACTIVITY; -import static org.usergrid.persistence.Schema.PROPERTY_ITEM; -import static org.usergrid.persistence.Schema.PROPERTY_ITEM_TYPE; -import static org.usergrid.persistence.Schema.PROPERTY_NAME; -import static org.usergrid.persistence.Schema.PROPERTY_TITLE; -import static org.usergrid.persistence.Schema.PROPERTY_TYPE; -import static org.usergrid.persistence.Schema.TYPE_APPLICATION; -import static org.usergrid.persistence.Schema.TYPE_ENTITY; -import static org.usergrid.persistence.Schema.TYPE_MEMBER; -import static org.usergrid.persistence.Schema.TYPE_ROLE; -import static org.usergrid.persistence.Schema.defaultCollectionName; -import static org.usergrid.persistence.Schema.getDefaultSchema; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX; -import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX_ENTRIES; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute; -import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key; +import static org.usergrid.persistence.Schema.*; +import static org.usergrid.persistence.cassandra.ApplicationCF.*; +import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*; import static org.usergrid.persistence.cassandra.CassandraService.INDEX_ENTRY_LIST_COUNT; import static org.usergrid.persistence.cassandra.ConnectionRefImpl.CONNECTION_ENTITY_CONNECTION_TYPE; -import static org.usergrid.persistence.cassandra.GeoIndexManager.batchDeleteLocationInConnectionsIndex; -import static org.usergrid.persistence.cassandra.GeoIndexManager.batchRemoveLocationFromCollectionIndex; -import static org.usergrid.persistence.cassandra.GeoIndexManager.batchStoreLocationInCollectionIndex; -import static org.usergrid.persistence.cassandra.GeoIndexManager.batchStoreLocationInConnectionsIndex; -import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode; -import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue; -import static org.usergrid.persistence.cassandra.IndexUpdate.validIndexableValue; +import static org.usergrid.persistence.cassandra.GeoIndexManager.*; +import static org.usergrid.persistence.cassandra.IndexUpdate.*; import static org.usergrid.utils.ClassUtils.cast; import static org.usergrid.utils.CompositeUtils.setGreaterThanEqualityFlag; import static org.usergrid.utils.ConversionUtils.string;