You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/26 02:08:43 UTC
[07/10] incubator-usergrid git commit: Revert "Removed extraneous CF.
Made the remaining code compile."
Revert "Removed extraneous CF. Made the remaining code compile."
This reverts commit ded674359eccf08509aa4933892018041a1eeda0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/35bae268
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/35bae268
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/35bae268
Branch: refs/heads/USERGRID-273
Commit: 35bae2687bb7edd7779395d5aa4c2ede61292def
Parents: ded6743
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 07:58:05 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 07:58:05 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CpSetup.java | 45 +++---
.../persistence/cassandra/CassandraService.java | 31 ++--
.../cassandra/EntityManagerFactoryImpl.java | 147 ++++++++++++++++---
.../persistence/cassandra/SetupImpl.java | 32 +++-
.../cassandra/EntityManagerFactoryImplIT.java | 5 +
5 files changed, 199 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
index 53123bc..c71c172 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
@@ -39,14 +39,14 @@ import me.prettyprint.hector.api.ddl.ComparatorType;
import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefinition;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
import static org.apache.usergrid.persistence.cassandra.CassandraService.getApplicationKeyspace;
import static org.apache.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
@@ -145,11 +145,11 @@ public class CpSetup implements Setup {
migrate();
-// cass.createColumnFamily( getApplicationKeyspace(),
-// createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
-//
-// cass.createColumnFamily( getApplicationKeyspace(),
-// createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamily( getApplicationKeyspace(),
createColumnFamilyDefinition( getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
@@ -176,18 +176,19 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
+ if ( !USE_VIRTUAL_KEYSPACES ) {
+
+ String app_keyspace = keyspaceForApplication( applicationId );
-// String app_keyspace = keyspaceForApplication( applicationId );
+ logger.info( "Creating application keyspace " + app_keyspace + " for " + applicationName + " application" );
-// logger.info( "Creating application keyspace " + app_keyspace + " for " + applicationName + " application" );
-//
-// cass.createColumnFamily( app_keyspace,
-// createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
-//
-// cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
-//
-// cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ cass.createColumnFamily( app_keyspace,
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
+
+ cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ }
}
@@ -198,20 +199,20 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- // if ( USE_VIRTUAL_KEYSPACES ) {
+ if ( USE_VIRTUAL_KEYSPACES ) {
logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
-// cass.createColumnFamily( getApplicationKeyspace(),
-// createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
-// ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
+ ComparatorType.BYTESTYPE ) );
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
- // }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
index 32174ff..2c74e77 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
@@ -97,10 +97,10 @@ public class CassandraService {
// public static String SYSTEM_KEYSPACE = "Usergrid";
public static String applicationKeyspace;
- //public static final boolean USE_VIRTUAL_KEYSPACES = true;
+ public static final boolean USE_VIRTUAL_KEYSPACES = true;
- //public static final String APPLICATIONS_CF = "Applications";
- //public static final String PROPERTIES_CF = "Properties";
+ public static final String APPLICATIONS_CF = "Applications";
+ public static final String PROPERTIES_CF = "Properties";
public static final String TOKENS_CF = "Tokens";
public static final String PRINCIPAL_TOKEN_CF = "PrincipalTokens";
@@ -238,26 +238,35 @@ public class CassandraService {
/** @return keyspace for application UUID */
public static String keyspaceForApplication( UUID applicationId ) {
- return getApplicationKeyspace();
-
+ if ( USE_VIRTUAL_KEYSPACES ) {
+ return getApplicationKeyspace();
+ }
+ else {
+ return "Application_" + applicationId.toString().replace( '-', '_' );
+ }
}
public static UUID prefixForApplication( UUID applicationId ) {
+ if ( USE_VIRTUAL_KEYSPACES ) {
return applicationId;
+ }
+ else {
+ return null;
+ }
}
public Keyspace getKeyspace( String keyspace, UUID prefix ) {
Keyspace ko = null;
-// if ( USE_VIRTUAL_KEYSPACES && ( prefix != null ) ) {
+ if ( USE_VIRTUAL_KEYSPACES && ( prefix != null ) ) {
ko = createVirtualKeyspace( keyspace, prefix, ue, cluster, consistencyLevelPolicy,
ON_FAIL_TRY_ALL_AVAILABLE, accessMap );
-// }
-// else {
-// ko = HFactory.createKeyspace( keyspace, cluster, consistencyLevelPolicy, ON_FAIL_TRY_ALL_AVAILABLE,
-// accessMap );
-// }
+ }
+ else {
+ ko = HFactory.createKeyspace( keyspace, cluster, consistencyLevelPolicy, ON_FAIL_TRY_ALL_AVAILABLE,
+ accessMap );
+ }
return ko;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index f4a151f..9a90e59 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -62,8 +62,8 @@ import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.asMap;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.RETRY_COUNT;
import static org.apache.usergrid.utils.ConversionUtils.uuid;
import static org.apache.usergrid.persistence.cassandra.Serializers.*;
@@ -189,8 +189,22 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
public UUID createApplication( String organizationName, String name, Map<String, Object> properties )
throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+ String appName = buildAppName( organizationName, name );
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, appName, PROPERTY_UUID );
+ if ( column != null ) {
+ throw new ApplicationAlreadyExistsException( name );
+ // UUID uuid = uuid(column.getValue());
+ // return uuid;
+ }
+
+ UUID applicationId = UUIDUtils.newTimeUUID();
+ logger.info( "New application id " + applicationId.toString() );
+
+ initializeApplication( organizationName, applicationId, appName, properties );
+
+ return applicationId;
}
@@ -206,20 +220,69 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
}
+ public UUID initializeApplication( String organizationName, UUID applicationId, String name,
+ Map<String, Object> properties ) throws Exception {
+
+ String appName = buildAppName( organizationName, name );
+ // check for pre-existing
+ if ( lookupApplication( appName ) != null ) {
+ throw new ApplicationAlreadyExistsException( appName );
+ }
+ if ( properties == null ) {
+ properties = new TreeMap<String, Object>( CASE_INSENSITIVE_ORDER );
+ }
+
+ properties.put( PROPERTY_NAME, appName );
+
+ getSetup().setupApplicationKeyspace( applicationId, appName );
+
+ Keyspace ko = cass.getUsergridApplicationKeyspace();
+ Mutator<ByteBuffer> m = CountingMutator.createFlushingMutator( ko, be );
+
+ long timestamp = cass.createTimestamp();
+
+ addInsertToMutator( m, APPLICATIONS_CF, appName, PROPERTY_UUID, applicationId, timestamp );
+ addInsertToMutator( m, APPLICATIONS_CF, appName, PROPERTY_NAME, appName, timestamp );
+
+ batchExecute( m, RETRY_COUNT );
+
+ EntityManager em = getEntityManager( applicationId );
+ em.create( TYPE_APPLICATION, APPLICATION_ENTITY_CLASS, properties );
+
+ em.resetRoles();
+
+ return applicationId;
+ }
+
+
@Override
public UUID importApplication( String organizationName, UUID applicationId, String name,
Map<String, Object> properties ) throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+ name = buildAppName( organizationName, name );
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ if ( column != null ) {
+ throw new ApplicationAlreadyExistsException( name );
+ // UUID uuid = uuid(column.getValue());
+ // return uuid;
+ }
+
+ return initializeApplication( organizationName, applicationId, name, properties );
}
@Override
@Metered(group = "core", name = "EntityManagerFactory_lookupApplication_byName")
public UUID lookupApplication( String name ) throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ name = name.toLowerCase();
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ if ( column != null ) {
+ return uuid( column.getValue() );
+ }
+ return null;
}
@@ -234,48 +297,86 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
*/
@Metered(group = "core", name = "EntityManagerFactory_getApplication")
public Application getApplication( String name ) throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+ name = name.toLowerCase();
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ if ( column == null ) {
+ return null;
+ }
+ UUID applicationId = uuid( column.getValue() );
+
+ EntityManager em = getEntityManager( applicationId );
+ return ( ( EntityManagerImpl ) em ).getEntity( applicationId, Application.class );
}
@Override
public Map<String, UUID> getApplications() throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ Map<String, UUID> applications = new TreeMap<String, UUID>( CASE_INSENSITIVE_ORDER );
+ Keyspace ko = cass.getUsergridApplicationKeyspace();
+ RangeSlicesQuery<String, String, UUID> q = createRangeSlicesQuery( ko, se, se, ue );
+ q.setKeys( "", "\uFFFF" );
+ q.setColumnFamily( APPLICATIONS_CF );
+ q.setColumnNames( PROPERTY_UUID );
+ q.setRowCount( 10000 );
+ QueryResult<OrderedRows<String, String, UUID>> r = q.execute();
+ Rows<String, String, UUID> rows = r.get();
+ for ( Row<String, String, UUID> row : rows ) {
+ ColumnSlice<String, UUID> slice = row.getColumnSlice();
+ HColumn<String, UUID> column = slice.getColumnByName( PROPERTY_UUID );
+ applications.put( row.getKey(), column.getValue() );
+ }
+ return applications;
}
@Override
public boolean setServiceProperty( String name, String value ) {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ try {
+ cass.setColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name, value );
+ return true;
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to set property " + name + ": " + e.getMessage() );
+ }
+ return false;
}
@Override
public boolean deleteServiceProperty( String name ) {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
- }
-
-
- @Override
- public UUID initializeApplication( final String orgName, final UUID appId, final String appName,
- final Map<String, Object> props ) throws Exception {
- return null;
+ try {
+ cass.deleteColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name );
+ return true;
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to delete property " + name + ": " + e.getMessage() );
+ }
+ return false;
}
@Override
public boolean updateServiceProperties( Map<String, String> properties ) {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ try {
+ cass.setColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF.getBytes(), properties );
+ return true;
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to update properties: " + e.getMessage() );
+ }
+ return false;
}
@Override
public Map<String, String> getServiceProperties() {
-
+ try {
+ return asMap( cass.getAllColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, se, se ) );
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to load properties: " + e.getMessage() );
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
index 62b85de..775f43b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
@@ -23,11 +23,14 @@ import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefin
import org.apache.usergrid.mq.cassandra.QueuesCF;
import org.apache.usergrid.persistence.EntityManagerFactory;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
import static org.apache.usergrid.persistence.cassandra.CassandraService.getApplicationKeyspace;
import static org.apache.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
import org.apache.usergrid.persistence.entities.Application;
@@ -77,6 +80,12 @@ public class SetupImpl implements Setup {
logger.info( "Initialize system keyspace" );
cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
@@ -98,30 +107,36 @@ public class SetupImpl implements Setup {
public void setupApplicationKeyspace(
final UUID applicationId, String applicationName ) throws Exception {
+ if ( !USE_VIRTUAL_KEYSPACES ) {
String app_keyspace = keyspaceForApplication( applicationId );
logger.info( "Creating application keyspace " + app_keyspace + " for "
+ applicationName + " application" );
-
+ cass.createColumnFamily( app_keyspace, createColumnFamilyDefinition(
+ getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace));
cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
-
+ }
}
public void setupStaticKeyspace() throws Exception {
-
+ if ( USE_VIRTUAL_KEYSPACES ) {
logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
+ ComparatorType.BYTESTYPE ) );
+
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
-
+ }
}
@@ -131,7 +146,14 @@ public class SetupImpl implements Setup {
public static void logCFPermissions() {
-
+ System.out.println( getApplicationKeyspace() + "." + APPLICATIONS_CF + ".<rw>=usergrid" );
+ System.out.println( getApplicationKeyspace() + "." + PROPERTIES_CF + ".<rw>=usergrid" );
+ for ( CFEnum cf : ApplicationCF.values() ) {
+ System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
+ }
+ for ( CFEnum cf : QueuesCF.values() ) {
+ System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 42f2af1..850ac6b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -50,6 +50,8 @@ import static org.junit.Assert.assertTrue;
public class EntityManagerFactoryImplIT extends AbstractCoreIT {
+ @SuppressWarnings("PointlessBooleanExpression")
+ public static final boolean USE_DEFAULT_DOMAIN = !CassandraService.USE_VIRTUAL_KEYSPACES;
private static final Logger logger = LoggerFactory.getLogger( EntityManagerFactoryImplIT.class );
@@ -78,6 +80,9 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
public UUID createApplication( String organizationName, String applicationName ) throws Exception {
+ if ( USE_DEFAULT_DOMAIN ) {
+ return emf.getDefaultAppId();
+ }
return emf.createApplication( organizationName, applicationName );
}