usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [02/35] usergrid git commit: Fix typo in word 'tenant'.
Date Mon, 25 Jan 2016 21:17:54 GMT
Fix typo in word 'tenant'.


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

Branch: refs/heads/USERGRID-1047
Commit: 56eb80f8119324e262eac8fd0a25e4c9a32087cf
Parents: c080b02
Author: Michael Russo <michaelarusso@gmail.com>
Authored: Tue Jan 12 16:18:50 2016 -0800
Committer: Michael Russo <michaelarusso@gmail.com>
Committed: Tue Jan 12 16:18:50 2016 -0800

----------------------------------------------------------------------
 .../impl/ScopedCacheSerializationImpl.java      |  12 +-
 .../MvccEntitySerializationStrategyImpl.java    |  14 +-
 ...vccEntitySerializationStrategyProxyImpl.java |   4 +-
 .../MvccEntitySerializationStrategyV1Impl.java  |   8 +-
 .../MvccEntitySerializationStrategyV2Impl.java  |  13 +-
 .../MvccEntitySerializationStrategyV3Impl.java  |  14 +-
 .../MvccLogEntrySerializationProxyImpl.java     |   4 +-
 .../MvccLogEntrySerializationStrategyImpl.java  |   6 +-
 ...MvccLogEntrySerializationStrategyV1Impl.java |  18 +--
 ...MvccLogEntrySerializationStrategyV2Impl.java |  18 +--
 .../UniqueValueSerializationStrategyImpl.java   |  28 ++--
 ...iqueValueSerializationStrategyProxyImpl.java |   4 +-
 .../UniqueValueSerializationStrategyV1Impl.java |  31 ++---
 .../UniqueValueSerializationStrategyV2Impl.java |  31 ++---
 .../core/astyanax/MultiTenantColumnFamily.java  |  47 +++++++
 .../MultiTenantColumnFamilyDefinition.java      | 138 +++++++++++++++++++
 .../core/astyanax/MultiTennantColumnFamily.java |  47 -------
 .../MultiTennantColumnFamilyDefinition.java     | 138 -------------------
 .../data/MigrationInfoSerializationImpl.java    |  18 +--
 .../core/migration/schema/Migration.java        |   4 +-
 .../migration/schema/MigrationManagerImpl.java  |   9 +-
 .../EdgeMetadataSerializationProxyImpl.java     |   4 +-
 .../impl/EdgeMetadataSerializationV1Impl.java   |  36 ++---
 .../impl/EdgeMetadataSerializationV2Impl.java   |  36 ++---
 .../impl/NodeSerializationImpl.java             |  14 +-
 .../impl/shard/EdgeColumnFamilies.java          |  12 +-
 .../shard/impl/EdgeShardSerializationImpl.java  |  14 +-
 .../impl/ShardedEdgeSerializationImpl.java      |  58 ++++----
 .../impl/shard/impl/ShardsColumnIterator.java   |  15 +-
 .../shard/impl/SizebasedEdgeColumnFamilies.java |  46 +++----
 .../map/impl/MapSerializationImpl.java          |  28 ++--
 31 files changed, 424 insertions(+), 445 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
index 1439bc5..22c304a 100644
--- a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
+++ b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
@@ -71,8 +71,8 @@ public class ScopedCacheSerializationImpl<K,V> implements ScopedCacheSerializati
 
     private static final ObjectSerializer COLUMN_VALUE_SERIALIZER = ObjectSerializer.get();
 
-    public static final MultiTennantColumnFamily<BucketScopedRowKey<String>, String> SCOPED_CACHE
-        = new MultiTennantColumnFamily<>( "SCOPED_CACHE",
+    public static final MultiTenantColumnFamily<BucketScopedRowKey<String>, String> SCOPED_CACHE
+        = new MultiTenantColumnFamily<>( "SCOPED_CACHE",
             BUCKET_ROWKEY_SERIALIZER, COLUMN_NAME_SERIALIZER, COLUMN_VALUE_SERIALIZER );
 
     /** Number of buckets to hash across */
@@ -278,13 +278,13 @@ public class ScopedCacheSerializationImpl<K,V> implements ScopedCacheSerializati
     //------------------------------------------------------------------------------------------
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
-        final MultiTennantColumnFamilyDefinition scopedCache =
-            new MultiTennantColumnFamilyDefinition( SCOPED_CACHE,
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
+        final MultiTenantColumnFamilyDefinition scopedCache =
+            new MultiTenantColumnFamilyDefinition( SCOPED_CACHE,
                 BytesType.class.getSimpleName(),
                 BytesType.class.getSimpleName(),
                 BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
         return Arrays.asList(scopedCache);
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 457664f..fefb303 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -43,8 +43,8 @@ import org.apache.usergrid.persistence.collection.serialization.impl.util.Legacy
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator;
 import org.apache.usergrid.persistence.core.astyanax.ColumnParser;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.scope.ApplicationScope;
 import org.apache.usergrid.persistence.model.entity.Entity;
@@ -81,7 +81,7 @@ public abstract class MvccEntitySerializationStrategyImpl implements MvccEntityS
     protected final Keyspace keyspace;
     protected final SerializationFig serializationFig;
     protected final CassandraFig cassandraFig;
-    private final MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID>  columnFamily;
+    private final MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> columnFamily;
 
 
     @Inject
@@ -333,10 +333,10 @@ public abstract class MvccEntitySerializationStrategyImpl implements MvccEntityS
 
         //create the CF entity data.  We want it reversed b/c we want the most recent version at the top of the
         //row for fast seeks
-        MultiTennantColumnFamilyDefinition cf =
-                new MultiTennantColumnFamilyDefinition( columnFamily, BytesType.class.getSimpleName(),
+        MultiTenantColumnFamilyDefinition cf =
+                new MultiTenantColumnFamilyDefinition( columnFamily, BytesType.class.getSimpleName(),
                         ReversedType.class.getSimpleName() + "(" + UUIDType.class.getSimpleName() + ")",
-                        BytesType.class.getSimpleName(), MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                        BytesType.class.getSimpleName(), MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
 
         return Collections.singleton( cf );
@@ -446,6 +446,6 @@ public abstract class MvccEntitySerializationStrategyImpl implements MvccEntityS
      * Get the column family to perform operations with
      * @return
      */
-    protected abstract MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily();
+    protected abstract MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily();
 
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java
index b45f68b..1fe342e 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java
@@ -26,7 +26,7 @@ import org.apache.usergrid.persistence.collection.EntitySet;
 import org.apache.usergrid.persistence.collection.MvccEntity;
 import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache;
 import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship;
 import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet;
@@ -182,7 +182,7 @@ public class MvccEntitySerializationStrategyProxyImpl implements MvccEntitySeria
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         return Collections.emptyList();
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java
index 40054ec..9e29e9c 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java
@@ -28,7 +28,7 @@ import org.apache.usergrid.persistence.collection.exception.DataCorruptionExcept
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.model.entity.Entity;
 import org.apache.usergrid.persistence.model.entity.Id;
@@ -64,8 +64,8 @@ public class MvccEntitySerializationStrategyV1Impl extends MvccEntitySerializati
             new CollectionScopedRowKeySerializer<>( ID_SER );
 
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> CF_ENTITY_DATA =
-                new MultiTennantColumnFamily<>( "Entity_Version_Data", ROW_KEY_SER, UUIDSerializer.get() );
+    private static final MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> CF_ENTITY_DATA =
+                new MultiTenantColumnFamily<>( "Entity_Version_Data", ROW_KEY_SER, UUIDSerializer.get() );
 
 
 
@@ -82,7 +82,7 @@ public class MvccEntitySerializationStrategyV1Impl extends MvccEntitySerializati
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily() {
+    protected MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily() {
         return CF_ENTITY_DATA;
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
index 26ec5ec..13d9613 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
@@ -25,8 +25,6 @@ import java.util.UUID;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Timer;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.apache.usergrid.persistence.collection.MvccEntity;
 import org.apache.usergrid.persistence.collection.exception.DataCorruptionException;
 import org.apache.usergrid.persistence.collection.exception.EntityTooLargeException;
@@ -37,7 +35,7 @@ import org.apache.usergrid.persistence.core.astyanax.FieldBufferBuilder;
 import org.apache.usergrid.persistence.core.astyanax.FieldBufferParser;
 import org.apache.usergrid.persistence.core.astyanax.FieldBufferSerializer;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
 import org.apache.usergrid.persistence.model.entity.Entity;
@@ -52,9 +50,6 @@ import com.google.inject.Singleton;
 import com.netflix.astyanax.Keyspace;
 import com.netflix.astyanax.serializers.AbstractSerializer;
 import com.netflix.astyanax.serializers.UUIDSerializer;
-import org.apache.usergrid.persistence.model.field.ArrayField;
-import org.apache.usergrid.persistence.model.field.ListField;
-import org.codehaus.jackson.map.deser.CustomDeserializerFactory;
 
 
 /**
@@ -71,8 +66,8 @@ public class MvccEntitySerializationStrategyV2Impl extends MvccEntitySerializati
             new CollectionScopedRowKeySerializer<>( ID_SER );
 
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> CF_ENTITY_DATA =
-            new MultiTennantColumnFamily<>( "Entity_Version_Data_V2", ROW_KEY_SER, UUIDSerializer.get() );
+    private static final MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> CF_ENTITY_DATA =
+            new MultiTenantColumnFamily<>( "Entity_Version_Data_V2", ROW_KEY_SER, UUIDSerializer.get() );
 
     private static final FieldBufferSerializer FIELD_BUFFER_SERIALIZER = FieldBufferSerializer.get();
 
@@ -94,7 +89,7 @@ public class MvccEntitySerializationStrategyV2Impl extends MvccEntitySerializati
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily() {
+    protected MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily() {
         return CF_ENTITY_DATA;
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
index 0fd82cc..f552a97 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
@@ -34,8 +34,8 @@ import org.apache.usergrid.persistence.collection.serialization.SerializationFig
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.astyanax.ColumnParser;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer;
 import org.apache.usergrid.persistence.core.scope.ApplicationScope;
@@ -75,8 +75,8 @@ public class MvccEntitySerializationStrategyV3Impl implements MvccEntitySerializ
     private static final ScopedRowKeySerializer<Id> ROW_KEY_SER =  new ScopedRowKeySerializer<>( ID_SER );
 
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<Id>, Boolean> CF_ENTITY_DATA =
-            new MultiTennantColumnFamily<>( "Entity_Version_Data_V3", ROW_KEY_SER, BooleanSerializer.get() );
+    private static final MultiTenantColumnFamily<ScopedRowKey<Id>, Boolean> CF_ENTITY_DATA =
+            new MultiTenantColumnFamily<>( "Entity_Version_Data_V3", ROW_KEY_SER, BooleanSerializer.get() );
 
 
     private static final Boolean COL_VALUE = Boolean.TRUE;
@@ -295,10 +295,10 @@ public class MvccEntitySerializationStrategyV3Impl implements MvccEntitySerializ
 
         //create the CF entity data.  We want it reversed b/c we want the most recent version at the top of the
         //row for fast seeks
-        MultiTennantColumnFamilyDefinition cf =
-                new MultiTennantColumnFamilyDefinition( CF_ENTITY_DATA, BytesType.class.getSimpleName(),
+        MultiTenantColumnFamilyDefinition cf =
+                new MultiTenantColumnFamilyDefinition( CF_ENTITY_DATA, BytesType.class.getSimpleName(),
                         BooleanType.class.getSimpleName() ,
-                        BytesType.class.getSimpleName(), MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                        BytesType.class.getSimpleName(), MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
 
         return Collections.singleton( cf );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java
index fdef3c3..8e34f01 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java
@@ -29,7 +29,7 @@ import org.apache.usergrid.persistence.collection.MvccLogEntry;
 import org.apache.usergrid.persistence.collection.VersionSet;
 import org.apache.usergrid.persistence.collection.serialization.MvccLogEntrySerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache;
 import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship;
 import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet;
@@ -142,7 +142,7 @@ public class MvccLogEntrySerializationProxyImpl implements MvccLogEntrySerializa
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         return Collections.emptyList();
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
index 0c0d961..7ba6a5e 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
@@ -37,7 +37,7 @@ import org.apache.usergrid.persistence.collection.mvcc.entity.Stage;
 import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccLogEntryImpl;
 import org.apache.usergrid.persistence.collection.serialization.MvccLogEntrySerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.scope.ApplicationScope;
 import org.apache.usergrid.persistence.model.entity.Id;
@@ -64,7 +64,7 @@ public abstract class MvccLogEntrySerializationStrategyImpl<K> implements MvccLo
 
     private static final StageSerializer SER = new StageSerializer();
 
-    private final MultiTennantColumnFamily<ScopedRowKey<K>, UUID> CF_ENTITY_LOG;
+    private final MultiTenantColumnFamily<ScopedRowKey<K>, UUID> CF_ENTITY_LOG;
 
 
     protected final Keyspace keyspace;
@@ -289,7 +289,7 @@ public abstract class MvccLogEntrySerializationStrategyImpl<K> implements MvccLo
     }
 
 
-    protected abstract MultiTennantColumnFamily<ScopedRowKey<K>, UUID> getColumnFamily();
+    protected abstract MultiTenantColumnFamily<ScopedRowKey<K>, UUID> getColumnFamily();
 
 
     protected abstract ScopedRowKey<K> createKey( final Id applicationId, final Id entityId );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java
index 57e7421..e0c0909 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java
@@ -32,8 +32,8 @@ import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
 import org.apache.usergrid.persistence.collection.serialization.impl.util.LegacyScopeUtils;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.model.entity.Id;
 
@@ -56,8 +56,8 @@ public class MvccLogEntrySerializationStrategyV1Impl
     private static final CollectionScopedRowKeySerializer<Id> ROW_KEY_SER =
         new CollectionScopedRowKeySerializer<Id>( ID_SER );
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> CF_ENTITY_LOG =
-        new MultiTennantColumnFamily<>( "Entity_Log", ROW_KEY_SER, UUIDSerializer.get() );
+    private static final MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> CF_ENTITY_LOG =
+        new MultiTenantColumnFamily<>( "Entity_Log", ROW_KEY_SER, UUIDSerializer.get() );
 
 
     @Inject
@@ -73,7 +73,7 @@ public class MvccLogEntrySerializationStrategyV1Impl
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily() {
+    protected MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UUID> getColumnFamily() {
         return CF_ENTITY_LOG;
     }
 
@@ -104,13 +104,13 @@ public class MvccLogEntrySerializationStrategyV1Impl
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         //create the CF entity data.  We want it reversed b/c we want the most recent version at the top of the
         //row for fast seeks
-        MultiTennantColumnFamilyDefinition cf =
-                new MultiTennantColumnFamilyDefinition( CF_ENTITY_LOG, BytesType.class.getSimpleName(),
+        MultiTenantColumnFamilyDefinition cf =
+                new MultiTenantColumnFamilyDefinition( CF_ENTITY_LOG, BytesType.class.getSimpleName(),
                         ReversedType.class.getSimpleName() + "(" + UUIDType.class.getSimpleName() + ")",
-                        IntegerType.class.getSimpleName(), MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                        IntegerType.class.getSimpleName(), MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
 
         return Collections.singleton( cf );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java
index 99cc97f..1bfc289 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java
@@ -31,8 +31,8 @@ import org.apache.cassandra.db.marshal.UUIDType;
 
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer;
 import org.apache.usergrid.persistence.model.entity.Id;
@@ -55,8 +55,8 @@ public class MvccLogEntrySerializationStrategyV2Impl extends MvccLogEntrySeriali
     private static final ScopedRowKeySerializer<Id> ROW_KEY_SER = new ScopedRowKeySerializer<>( ID_SER );
 
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<Id>, UUID> CF_ENTITY_LOG_V2 =
-        new MultiTennantColumnFamily<>( "Entity_Log_V2", ROW_KEY_SER, UUIDSerializer.get() );
+    private static final MultiTenantColumnFamily<ScopedRowKey<Id>, UUID> CF_ENTITY_LOG_V2 =
+        new MultiTenantColumnFamily<>( "Entity_Log_V2", ROW_KEY_SER, UUIDSerializer.get() );
 
 
     @Inject
@@ -72,7 +72,7 @@ public class MvccLogEntrySerializationStrategyV2Impl extends MvccLogEntrySeriali
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<Id>, UUID> getColumnFamily() {
+    protected MultiTenantColumnFamily<ScopedRowKey<Id>, UUID> getColumnFamily() {
         return CF_ENTITY_LOG_V2;
     }
 
@@ -92,13 +92,13 @@ public class MvccLogEntrySerializationStrategyV2Impl extends MvccLogEntrySeriali
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         //create the CF entity data.  We want it reversed b/c we want the most recent version at the top of the
         //row for fast seeks
-        MultiTennantColumnFamilyDefinition cf =
-            new MultiTennantColumnFamilyDefinition( CF_ENTITY_LOG_V2, BytesType.class.getSimpleName(),
+        MultiTenantColumnFamilyDefinition cf =
+            new MultiTenantColumnFamilyDefinition( CF_ENTITY_LOG_V2, BytesType.class.getSimpleName(),
                 ReversedType.class.getSimpleName() + "(" + UUIDType.class.getSimpleName() + ")",
-                IntegerType.class.getSimpleName(), MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                IntegerType.class.getSimpleName(), MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
 
         return Collections.singleton( cf );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
index a1fb4cc..781490d 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
@@ -34,13 +34,12 @@ import org.apache.usergrid.persistence.collection.serialization.SerializationFig
 import org.apache.usergrid.persistence.collection.serialization.UniqueValue;
 import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.UniqueValueSet;
-import org.apache.usergrid.persistence.collection.serialization.impl.util.LegacyScopeUtils;
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator;
 import org.apache.usergrid.persistence.core.astyanax.ColumnParser;
 import org.apache.usergrid.persistence.core.astyanax.ColumnTypes;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.scope.ApplicationScope;
 import org.apache.usergrid.persistence.core.util.ValidationUtils;
@@ -48,7 +47,6 @@ import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.model.field.Field;
 
 import com.google.common.base.Preconditions;
-import com.google.inject.Inject;
 import com.netflix.astyanax.ColumnListMutation;
 import com.netflix.astyanax.Keyspace;
 import com.netflix.astyanax.MutationBatch;
@@ -69,11 +67,11 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
     private static final Logger log = LoggerFactory.getLogger( UniqueValueSerializationStrategyImpl.class );
 
 
-    private final MultiTennantColumnFamily<ScopedRowKey<FieldKey>, EntityVersion>
+    private final MultiTenantColumnFamily<ScopedRowKey<FieldKey>, EntityVersion>
         CF_UNIQUE_VALUES;
 
 
-    private final MultiTennantColumnFamily<ScopedRowKey<EntityKey>, UniqueFieldEntry>
+    private final MultiTenantColumnFamily<ScopedRowKey<EntityKey>, UniqueFieldEntry>
         CF_ENTITY_UNIQUE_VALUE_LOG ;
 
     public static final int COL_VALUE = 0x0;
@@ -367,17 +365,17 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
 
-        final MultiTennantColumnFamilyDefinition uniqueLookupCF =
-            new MultiTennantColumnFamilyDefinition( CF_UNIQUE_VALUES, BytesType.class.getSimpleName(),
+        final MultiTenantColumnFamilyDefinition uniqueLookupCF =
+            new MultiTenantColumnFamilyDefinition( CF_UNIQUE_VALUES, BytesType.class.getSimpleName(),
                 ColumnTypes.DYNAMIC_COMPOSITE_TYPE, BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
-        final MultiTennantColumnFamilyDefinition uniqueLogCF =
-            new MultiTennantColumnFamilyDefinition( CF_ENTITY_UNIQUE_VALUE_LOG, BytesType.class.getSimpleName(),
+        final MultiTenantColumnFamilyDefinition uniqueLogCF =
+            new MultiTenantColumnFamilyDefinition( CF_ENTITY_UNIQUE_VALUE_LOG, BytesType.class.getSimpleName(),
                 ColumnTypes.DYNAMIC_COMPOSITE_TYPE, BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
         return Arrays.asList( uniqueLookupCF, uniqueLogCF );
     }
@@ -386,7 +384,7 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
     /**
      * Get the column family for the unique fields
      */
-    protected abstract MultiTennantColumnFamily<ScopedRowKey<FieldKey>, EntityVersion> getUniqueValuesCF();
+    protected abstract MultiTenantColumnFamily<ScopedRowKey<FieldKey>, EntityVersion> getUniqueValuesCF();
 
 
     /**
@@ -409,7 +407,7 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
     /**
      * Get the column family for the unique field CF
      */
-    protected abstract MultiTennantColumnFamily<ScopedRowKey<EntityKey>, UniqueFieldEntry> getEntityUniqueLogCF();
+    protected abstract MultiTenantColumnFamily<ScopedRowKey<EntityKey>, UniqueFieldEntry> getEntityUniqueLogCF();
 
     /**
      * Generate a key that is compatible with the column family

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java
index 3b15142..1de4052 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java
@@ -28,7 +28,7 @@ import org.apache.usergrid.persistence.collection.serialization.UniqueValue;
 import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.UniqueValueSet;
 import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache;
 import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship;
 import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet;
@@ -167,7 +167,7 @@ public class UniqueValueSerializationStrategyProxyImpl implements UniqueValueSer
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         return Collections.emptyList();
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
index 6551f5d..6a1cb58 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
@@ -26,13 +26,12 @@ import java.util.Collection;
 import org.apache.cassandra.db.marshal.BytesType;
 
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.collection.serialization.UniqueValue;
 import org.apache.usergrid.persistence.collection.serialization.impl.util.LegacyScopeUtils;
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.astyanax.ColumnTypes;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.model.field.Field;
@@ -54,8 +53,8 @@ public class UniqueValueSerializationStrategyV1Impl  extends UniqueValueSerializ
 
     private static final EntityVersionSerializer ENTITY_VERSION_SER = new EntityVersionSerializer();
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Field>>, EntityVersion>
-        CF_UNIQUE_VALUES = new MultiTennantColumnFamily<>( "Unique_Values", ROW_KEY_SER, ENTITY_VERSION_SER );
+    private static final MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Field>>, EntityVersion>
+        CF_UNIQUE_VALUES = new MultiTenantColumnFamily<>( "Unique_Values", ROW_KEY_SER, ENTITY_VERSION_SER );
 
 
     private static final IdRowCompositeSerializer ID_SER = IdRowCompositeSerializer.get();
@@ -65,9 +64,9 @@ public class UniqueValueSerializationStrategyV1Impl  extends UniqueValueSerializ
         new CollectionScopedRowKeySerializer<>( ID_SER );
 
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UniqueFieldEntry>
+    private static final MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UniqueFieldEntry>
         CF_ENTITY_UNIQUE_VALUE_LOG =
-        new MultiTennantColumnFamily<>( "Entity_Unique_Values", ENTITY_ROW_KEY_SER, UniqueFieldEntrySerializer.get() );
+        new MultiTenantColumnFamily<>( "Entity_Unique_Values", ENTITY_ROW_KEY_SER, UniqueFieldEntrySerializer.get() );
 
 
     /**
@@ -85,30 +84,30 @@ public class UniqueValueSerializationStrategyV1Impl  extends UniqueValueSerializ
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
 
-        final MultiTennantColumnFamilyDefinition uniqueLookupCF =
-            new MultiTennantColumnFamilyDefinition( CF_UNIQUE_VALUES, BytesType.class.getSimpleName(),
+        final MultiTenantColumnFamilyDefinition uniqueLookupCF =
+            new MultiTenantColumnFamilyDefinition( CF_UNIQUE_VALUES, BytesType.class.getSimpleName(),
                 ColumnTypes.DYNAMIC_COMPOSITE_TYPE, BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
-        final MultiTennantColumnFamilyDefinition uniqueLogCF =
-            new MultiTennantColumnFamilyDefinition( CF_ENTITY_UNIQUE_VALUE_LOG, BytesType.class.getSimpleName(),
+        final MultiTenantColumnFamilyDefinition uniqueLogCF =
+            new MultiTenantColumnFamilyDefinition( CF_ENTITY_UNIQUE_VALUE_LOG, BytesType.class.getSimpleName(),
                 ColumnTypes.DYNAMIC_COMPOSITE_TYPE, BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
         return Arrays.asList( uniqueLookupCF, uniqueLogCF );
     }
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Field>>, EntityVersion> getUniqueValuesCF() {
+    protected MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Field>>, EntityVersion> getUniqueValuesCF() {
         return CF_UNIQUE_VALUES;
     }
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UniqueFieldEntry>
+    protected MultiTenantColumnFamily<ScopedRowKey<CollectionPrefixedKey<Id>>, UniqueFieldEntry>
     getEntityUniqueLogCF() {
         return CF_ENTITY_UNIQUE_VALUE_LOG;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
index 1e8b389..40622a4 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
@@ -26,12 +26,11 @@ import java.util.Collection;
 import org.apache.cassandra.db.marshal.BytesType;
 
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.collection.serialization.impl.util.LegacyScopeUtils;
 import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.core.astyanax.ColumnTypes;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer;
 import org.apache.usergrid.persistence.model.entity.Id;
@@ -54,8 +53,8 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
 
     private static final EntityVersionSerializer ENTITY_VERSION_SER = new EntityVersionSerializer();
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<TypeField>, EntityVersion>
-        CF_UNIQUE_VALUES = new MultiTennantColumnFamily<>( "Unique_Values_V2", ROW_KEY_SER, ENTITY_VERSION_SER );
+    private static final MultiTenantColumnFamily<ScopedRowKey<TypeField>, EntityVersion>
+        CF_UNIQUE_VALUES = new MultiTenantColumnFamily<>( "Unique_Values_V2", ROW_KEY_SER, ENTITY_VERSION_SER );
 
 
     private static final IdRowCompositeSerializer ID_SER = IdRowCompositeSerializer.get();
@@ -65,9 +64,9 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
         new ScopedRowKeySerializer<>( ID_SER );
 
 
-    private static final MultiTennantColumnFamily<ScopedRowKey<Id>, UniqueFieldEntry>
+    private static final MultiTenantColumnFamily<ScopedRowKey<Id>, UniqueFieldEntry>
         CF_ENTITY_UNIQUE_VALUE_LOG =
-        new MultiTennantColumnFamily<>( "Entity_Unique_Values_V2", ENTITY_ROW_KEY_SER, UniqueFieldEntrySerializer.get() );
+        new MultiTenantColumnFamily<>( "Entity_Unique_Values_V2", ENTITY_ROW_KEY_SER, UniqueFieldEntrySerializer.get() );
 
 
     /**
@@ -85,30 +84,30 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
 
-        final MultiTennantColumnFamilyDefinition uniqueLookupCF =
-            new MultiTennantColumnFamilyDefinition( CF_UNIQUE_VALUES, BytesType.class.getSimpleName(),
+        final MultiTenantColumnFamilyDefinition uniqueLookupCF =
+            new MultiTenantColumnFamilyDefinition( CF_UNIQUE_VALUES, BytesType.class.getSimpleName(),
                 ColumnTypes.DYNAMIC_COMPOSITE_TYPE, BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
-        final MultiTennantColumnFamilyDefinition uniqueLogCF =
-            new MultiTennantColumnFamilyDefinition( CF_ENTITY_UNIQUE_VALUE_LOG, BytesType.class.getSimpleName(),
+        final MultiTenantColumnFamilyDefinition uniqueLogCF =
+            new MultiTenantColumnFamilyDefinition( CF_ENTITY_UNIQUE_VALUE_LOG, BytesType.class.getSimpleName(),
                 ColumnTypes.DYNAMIC_COMPOSITE_TYPE, BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
 
         return Arrays.asList( uniqueLookupCF, uniqueLogCF );
     }
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<TypeField>, EntityVersion> getUniqueValuesCF() {
+    protected MultiTenantColumnFamily<ScopedRowKey<TypeField>, EntityVersion> getUniqueValuesCF() {
         return CF_UNIQUE_VALUES;
     }
 
 
     @Override
-    protected MultiTennantColumnFamily<ScopedRowKey<Id>, UniqueFieldEntry>
+    protected MultiTenantColumnFamily<ScopedRowKey<Id>, UniqueFieldEntry>
     getEntityUniqueLogCF() {
         return CF_ENTITY_UNIQUE_VALUE_LOG;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamily.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamily.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamily.java
new file mode 100644
index 0000000..5526cff
--- /dev/null
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamily.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.usergrid.persistence.core.astyanax;
+
+
+
+import com.netflix.astyanax.Serializer;
+import com.netflix.astyanax.model.ColumnFamily;
+
+
+/**
+ * Simple wrapper to force every column family to use ScopedRowKeys
+ *
+ * @author tnine
+ */
+public class MultiTenantColumnFamily<R extends ScopedRowKey<?>, V >
+    extends ColumnFamily<R, V> {
+
+    public MultiTenantColumnFamily(final String columnFamilyName, final Serializer<R> keySerializer,
+                                   final Serializer<V> columnSerializer ) {
+
+        super( columnFamilyName, keySerializer, columnSerializer );
+    }
+
+
+    public MultiTenantColumnFamily(final String columnFamilyName, final Serializer<R> keySerializer,
+                                   final Serializer<V> columnSerializer, final Serializer<?> defaultValueSerializer ) {
+
+        super( columnFamilyName, keySerializer, columnSerializer, defaultValueSerializer );
+    }
+}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamilyDefinition.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamilyDefinition.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamilyDefinition.java
new file mode 100644
index 0000000..faa7a5b
--- /dev/null
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTenantColumnFamilyDefinition.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.usergrid.persistence.core.astyanax;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.common.base.Preconditions;
+import com.netflix.astyanax.model.ColumnFamily;
+
+
+/**
+ * Bean wrapper for column family information
+ *
+ * @author tnine
+ */
+public class MultiTenantColumnFamilyDefinition {
+
+
+    /**
+     * Options for caching on the CF
+     */
+    public enum CacheOption {
+        /**
+         * Use both row key shard and key shard
+         */
+        ALL( "ALL" ),
+
+        /**
+         * Cache keys only (the default)
+         */
+        KEYS( "KEYS_ONLY" ),
+
+        /**
+         * Cache rows only, no keys
+         */
+        ROWS( "ROWS_ONLY" ),
+
+        /**
+         * Cache neither
+         */
+        NONE( "NONE" );
+
+        private String value;
+
+
+        private CacheOption( String value ) {
+            this.value = value;
+        }
+
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+
+    public static final String COMPARATOR_TYPE = "comparator_type";
+    public static final String READ_REPAIR_CHANCE = "read_repair_chance";
+    public static final String KEY_VALIDATION = "key_validation_class";
+    public static final String VALUE_VALIDATION = "default_validation_class";
+    public static final String CACHE_OPTION = "caching";
+    public static final String COMPACTION_STRATEGY = "compaction_strategy";
+    public static final String COMPACTION_STRATEGY_OPTIONS = "compaction_strategy_options";
+    public static final String COMPACTION_SSTABLE_SIZE = "sstable_size_in_mb";
+    public static final String BLOOM_FILTER_FP = "sstable_size_in_mb";
+
+
+
+    private final ColumnFamily columnFamily;
+    private final String columnComparatorType;
+    private final String keyValidationType;
+    private final String columnValidationType;
+    private final CacheOption cacheOption;
+
+
+    public MultiTenantColumnFamilyDefinition(final ColumnFamily columnFamily, final String keyValidationType,
+                                             final String columnComparatorType, final String columnValidationType, final CacheOption cacheOption ) {
+
+        Preconditions.checkNotNull( columnFamily, "columnFamily is required" );
+        Preconditions.checkNotNull( columnComparatorType, "columnComparatorType is required" );
+        Preconditions.checkNotNull( keyValidationType, "keyValidationType is required" );
+        Preconditions.checkNotNull( columnValidationType, "columnValueValidationType is required" );
+        Preconditions.checkNotNull( cacheOption, "cacheOption is required" );
+
+        this.columnFamily = columnFamily;
+        this.columnComparatorType = columnComparatorType;
+        this.keyValidationType = keyValidationType;
+        this.columnValidationType = columnValidationType;
+        this.cacheOption = cacheOption;
+    }
+
+
+
+    public Map<String, Object> getOptions() {
+
+        Map<String, Object> options = new HashMap<String, Object>();
+        options.put( COMPARATOR_TYPE, columnComparatorType );
+        options.put( KEY_VALIDATION, keyValidationType );
+        options.put( VALUE_VALIDATION, columnValidationType );
+        options.put( CACHE_OPTION, cacheOption.getValue() );
+
+
+        //always use 10% read repair chance!
+        options.put( READ_REPAIR_CHANCE, 0.1d );
+        options.put( BLOOM_FILTER_FP, 0.1d );
+        options.put( COMPACTION_STRATEGY, "LeveledCompactionStrategy");
+
+        Map<String, Object> compactionOptions = new HashMap<>();
+        compactionOptions.put( COMPACTION_SSTABLE_SIZE, "512" );
+
+        options.put( COMPACTION_STRATEGY_OPTIONS, compactionOptions  );
+
+        return options;
+    }
+
+
+    public ColumnFamily getColumnFamily() {
+        return columnFamily;
+    }
+}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
deleted file mode 100644
index 38851a5..0000000
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.core.astyanax;
-
-
-
-import com.netflix.astyanax.Serializer;
-import com.netflix.astyanax.model.ColumnFamily;
-
-
-/**
- * Simple wrapper to force every column family to use ScopedRowKeys
- *
- * @author tnine
- */
-public class MultiTennantColumnFamily<R extends ScopedRowKey<?>, V >
-    extends ColumnFamily<R, V> {
-
-    public MultiTennantColumnFamily( final String columnFamilyName, final Serializer<R> keySerializer,
-                                     final Serializer<V> columnSerializer ) {
-
-        super( columnFamilyName, keySerializer, columnSerializer );
-    }
-
-
-    public MultiTennantColumnFamily( final String columnFamilyName, final Serializer<R> keySerializer,
-                                     final Serializer<V> columnSerializer, final Serializer<?> defaultValueSerializer ) {
-
-        super( columnFamilyName, keySerializer, columnSerializer, defaultValueSerializer );
-    }
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamilyDefinition.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamilyDefinition.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamilyDefinition.java
deleted file mode 100644
index 9ee886e..0000000
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamilyDefinition.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.core.astyanax;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.common.base.Preconditions;
-import com.netflix.astyanax.model.ColumnFamily;
-
-
-/**
- * Bean wrapper for column family information
- *
- * @author tnine
- */
-public class MultiTennantColumnFamilyDefinition {
-
-
-    /**
-     * Options for caching on the CF
-     */
-    public enum CacheOption {
-        /**
-         * Use both row key shard and key shard
-         */
-        ALL( "ALL" ),
-
-        /**
-         * Cache keys only (the default)
-         */
-        KEYS( "KEYS_ONLY" ),
-
-        /**
-         * Cache rows only, no keys
-         */
-        ROWS( "ROWS_ONLY" ),
-
-        /**
-         * Cache neither
-         */
-        NONE( "NONE" );
-
-        private String value;
-
-
-        private CacheOption( String value ) {
-            this.value = value;
-        }
-
-
-        public String getValue() {
-            return value;
-        }
-    }
-
-
-    public static final String COMPARATOR_TYPE = "comparator_type";
-    public static final String READ_REPAIR_CHANCE = "read_repair_chance";
-    public static final String KEY_VALIDATION = "key_validation_class";
-    public static final String VALUE_VALIDATION = "default_validation_class";
-    public static final String CACHE_OPTION = "caching";
-    public static final String COMPACTION_STRATEGY = "compaction_strategy";
-    public static final String COMPACTION_STRATEGY_OPTIONS = "compaction_strategy_options";
-    public static final String COMPACTION_SSTABLE_SIZE = "sstable_size_in_mb";
-    public static final String BLOOM_FILTER_FP = "sstable_size_in_mb";
-
-
-
-    private final ColumnFamily columnFamily;
-    private final String columnComparatorType;
-    private final String keyValidationType;
-    private final String columnValidationType;
-    private final CacheOption cacheOption;
-
-
-    public MultiTennantColumnFamilyDefinition( final ColumnFamily columnFamily, final String keyValidationType,
-                                               final String columnComparatorType, final String columnValidationType, final CacheOption cacheOption ) {
-
-        Preconditions.checkNotNull( columnFamily, "columnFamily is required" );
-        Preconditions.checkNotNull( columnComparatorType, "columnComparatorType is required" );
-        Preconditions.checkNotNull( keyValidationType, "keyValidationType is required" );
-        Preconditions.checkNotNull( columnValidationType, "columnValueValidationType is required" );
-        Preconditions.checkNotNull( cacheOption, "cacheOption is required" );
-
-        this.columnFamily = columnFamily;
-        this.columnComparatorType = columnComparatorType;
-        this.keyValidationType = keyValidationType;
-        this.columnValidationType = columnValidationType;
-        this.cacheOption = cacheOption;
-    }
-
-
-
-    public Map<String, Object> getOptions() {
-
-        Map<String, Object> options = new HashMap<String, Object>();
-        options.put( COMPARATOR_TYPE, columnComparatorType );
-        options.put( KEY_VALIDATION, keyValidationType );
-        options.put( VALUE_VALIDATION, columnValidationType );
-        options.put( CACHE_OPTION, cacheOption.getValue() );
-
-
-        //always use 10% read repair chance!
-        options.put( READ_REPAIR_CHANCE, 0.1d );
-        options.put( BLOOM_FILTER_FP, 0.1d );
-        options.put( COMPACTION_STRATEGY, "LeveledCompactionStrategy");
-
-        Map<String, Object> compactionOptions = new HashMap<>();
-        compactionOptions.put( COMPACTION_SSTABLE_SIZE, "512" );
-
-        options.put( COMPACTION_STRATEGY_OPTIONS, compactionOptions  );
-
-        return options;
-    }
-
-
-    public ColumnFamily getColumnFamily() {
-        return columnFamily;
-    }
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
index 3def798..f1471ac 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
@@ -22,16 +22,12 @@ package org.apache.usergrid.persistence.core.migration.data;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.UTF8Type;
 
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer;
 import org.apache.usergrid.persistence.core.astyanax.StringRowCompositeSerializer;
@@ -63,8 +59,8 @@ public class MigrationInfoSerializationImpl implements MigrationInfoSerializatio
     private static final StringSerializer STRING_SERIALIZER = StringSerializer.get();
 
 
-    public static final MultiTennantColumnFamily<ScopedRowKey<String>, String> CF_MIGRATION_INFO =
-            new MultiTennantColumnFamily<>( "Data_Migration_Info", ROW_KEY_SER, STRING_SERIALIZER );
+    public static final MultiTenantColumnFamily<ScopedRowKey<String>, String> CF_MIGRATION_INFO =
+            new MultiTenantColumnFamily<>( "Data_Migration_Info", ROW_KEY_SER, STRING_SERIALIZER );
 
 
     /**
@@ -207,10 +203,10 @@ public class MigrationInfoSerializationImpl implements MigrationInfoSerializatio
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         return Collections.singletonList(
-                new MultiTennantColumnFamilyDefinition( CF_MIGRATION_INFO, BytesType.class.getSimpleName(),
+                new MultiTenantColumnFamilyDefinition( CF_MIGRATION_INFO, BytesType.class.getSimpleName(),
                         UTF8Type.class.getSimpleName(), BytesType.class.getSimpleName(),
-                        MultiTennantColumnFamilyDefinition.CacheOption.KEYS ) );
+                        MultiTenantColumnFamilyDefinition.CacheOption.KEYS ) );
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/Migration.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/Migration.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/Migration.java
index 7343f07..9938b88 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/Migration.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/Migration.java
@@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.core.migration.schema;
 
 import java.util.Collection;
 
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 
 
 /**
@@ -32,5 +32,5 @@ public interface Migration {
     /**
      * Get the column families required for this implementation.  If one does not exist it will be created.
      */
-    Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies();
+    Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies();
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
index 26351cf..4075437 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
@@ -27,14 +27,13 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.migration.util.AstayanxUtils;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.netflix.astyanax.Keyspace;
-import com.netflix.astyanax.connectionpool.exceptions.BadRequestException;
 import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
 import com.netflix.astyanax.connectionpool.exceptions.NotFoundException;
 import com.netflix.astyanax.ddl.ColumnFamilyDefinition;
@@ -77,7 +76,7 @@ public class MigrationManagerImpl implements MigrationManager {
 
             for ( Migration migration : migrations ) {
 
-                final Collection<MultiTennantColumnFamilyDefinition> columnFamilies = migration.getColumnFamilies();
+                final Collection<MultiTenantColumnFamilyDefinition> columnFamilies = migration.getColumnFamilies();
 
 
                 if ( columnFamilies == null || columnFamilies.size() == 0 ) {
@@ -88,7 +87,7 @@ public class MigrationManagerImpl implements MigrationManager {
                     continue;
                 }
 
-                for ( MultiTennantColumnFamilyDefinition cf : columnFamilies ) {
+                for ( MultiTenantColumnFamilyDefinition cf : columnFamilies ) {
                     testAndCreateColumnFamilyDef( cf );
                 }
             }
@@ -103,7 +102,7 @@ public class MigrationManagerImpl implements MigrationManager {
     /**
      * Check if the column family exists.  If it dosn't create it
      */
-    private void testAndCreateColumnFamilyDef( MultiTennantColumnFamilyDefinition columnFamily )
+    private void testAndCreateColumnFamilyDef( MultiTenantColumnFamilyDefinition columnFamily )
             throws ConnectionException {
         final KeyspaceDefinition keyspaceDefinition = keyspace.describeKeyspace();
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
index a3d48de..44d0b73 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache;
 import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship;
 import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet;
@@ -284,7 +284,7 @@ public class EdgeMetadataSerializationProxyImpl implements EdgeMetadataSerializa
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         return Collections.EMPTY_LIST;
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java
index 5fd270f..da4d044 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java
@@ -31,8 +31,8 @@ import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
 import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator;
 import org.apache.usergrid.persistence.core.astyanax.CompositeFieldSerializer;
 import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily;
-import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily;
+import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer;
 import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey;
 import org.apache.usergrid.persistence.core.astyanax.StringColumnParser;
@@ -85,26 +85,26 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
     /**
      * CFs where the row key contains the source node id
      */
-    private static final MultiTennantColumnFamily<ScopedRowKey<Id>, String> CF_SOURCE_EDGE_TYPES =
-            new MultiTennantColumnFamily<>( "Graph_Source_Edge_Types", ROW_KEY_SER,
+    private static final MultiTenantColumnFamily<ScopedRowKey<Id>, String> CF_SOURCE_EDGE_TYPES =
+            new MultiTenantColumnFamily<>( "Graph_Source_Edge_Types", ROW_KEY_SER,
                     STRING_SERIALIZER );
 
     //all target id types for source edge type
-    private static final MultiTennantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> CF_SOURCE_EDGE_ID_TYPES =
-            new MultiTennantColumnFamily<>( "Graph_Source_Edge_Id_Types",
+    private static final MultiTenantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> CF_SOURCE_EDGE_ID_TYPES =
+            new MultiTenantColumnFamily<>( "Graph_Source_Edge_Id_Types",
                     EDGE_TYPE_ROW_KEY, STRING_SERIALIZER );
 
     /**
      * CFs where the row key is the target node id
      */
-    private static final MultiTennantColumnFamily<ScopedRowKey<Id>, String> CF_TARGET_EDGE_TYPES =
-            new MultiTennantColumnFamily<>( "Graph_Target_Edge_Types", ROW_KEY_SER,
+    private static final MultiTenantColumnFamily<ScopedRowKey<Id>, String> CF_TARGET_EDGE_TYPES =
+            new MultiTenantColumnFamily<>( "Graph_Target_Edge_Types", ROW_KEY_SER,
                     STRING_SERIALIZER );
 
 
     //all source id types for target edge type
-    private static final MultiTennantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> CF_TARGET_EDGE_ID_TYPES =
-            new MultiTennantColumnFamily<>( "Graph_Target_Edge_Id_Types",
+    private static final MultiTenantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> CF_TARGET_EDGE_ID_TYPES =
+            new MultiTenantColumnFamily<>( "Graph_Target_Edge_Id_Types",
                     EDGE_TYPE_ROW_KEY, STRING_SERIALIZER );
 
 
@@ -243,7 +243,7 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
      */
     private MutationBatch removeEdgeType( final ApplicationScope scope, final Id rowKeyId, final String edgeType,
                                           final long version,
-                                          final MultiTennantColumnFamily<ScopedRowKey<Id>, String> cf ) {
+                                          final MultiTenantColumnFamily<ScopedRowKey<Id>, String> cf ) {
 
 
         //write target<--source edge type meta data
@@ -271,7 +271,7 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
      */
     private MutationBatch removeIdType( final ApplicationScope scope, final Id rowId, final String idType,
                                         final String edgeType, final long version,
-                                        final MultiTennantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> cf ) {
+                                        final MultiTenantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> cf ) {
 
 
         final MutationBatch batch = keyspace.prepareMutationBatch().withTimestamp( version );
@@ -314,7 +314,7 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
      * @param cf The column family to execute on
      */
     private Iterator<String> getEdgeTypes( final ApplicationScope scope, final SearchEdgeType search,
-                                           final MultiTennantColumnFamily<ScopedRowKey<Id>, String> cf ) {
+                                           final MultiTenantColumnFamily<ScopedRowKey<Id>, String> cf ) {
         ValidationUtils.validateApplicationScope( scope );
         GraphValidation.validateSearchEdgeType( search );
 
@@ -349,7 +349,7 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
      * @param cf The column family to search
      */
     public Iterator<String> getIdTypes( final ApplicationScope scope, final SearchIdType search,
-                                        final MultiTennantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> cf ) {
+                                        final MultiTenantColumnFamily<ScopedRowKey<EdgeIdTypeKey>, String> cf ) {
         ValidationUtils.validateApplicationScope( scope );
         GraphValidation.validateSearchEdgeIdType( search );
 
@@ -371,7 +371,7 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
 
 
     @Override
-    public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() {
+    public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() {
         return Arrays.asList( graphCf( CF_SOURCE_EDGE_TYPES ), graphCf( CF_TARGET_EDGE_TYPES ),
                 graphCf( CF_SOURCE_EDGE_ID_TYPES ), graphCf( CF_TARGET_EDGE_ID_TYPES ) );
     }
@@ -380,10 +380,10 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio
     /**
      * Helper to generate an edge definition by the type
      */
-    private MultiTennantColumnFamilyDefinition graphCf( MultiTennantColumnFamily cf ) {
-        return new MultiTennantColumnFamilyDefinition( cf, BytesType.class.getSimpleName(),
+    private MultiTenantColumnFamilyDefinition graphCf(MultiTenantColumnFamily cf ) {
+        return new MultiTenantColumnFamilyDefinition( cf, BytesType.class.getSimpleName(),
                 UTF8Type.class.getSimpleName(), BytesType.class.getSimpleName(),
-                MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                MultiTenantColumnFamilyDefinition.CacheOption.KEYS );
     }
 
 


Mime
View raw message