Revert all changes to CpEntityManagerFactory
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ba10e7f9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ba10e7f9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ba10e7f9 Branch: refs/heads/master Commit: ba10e7f94a4b55bb0c89fc209d14a7a5687760fe Parents: b0fba68 Author: Dave Johnson <[email protected]> Authored: Wed May 25 10:29:57 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed May 25 10:29:57 2016 -0400 ---------------------------------------------------------------------- .../corepersistence/CpEntityManagerFactory.java | 84 ++++++-------------- 1 file changed, 25 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ba10e7f9/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java index f92fc9e..d2417be 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java @@ -16,16 +16,14 @@ package org.apache.usergrid.corepersistence; -import java.util.*; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - +import com.google.common.base.Optional; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; import org.apache.commons.lang.StringUtils; - import org.apache.usergrid.corepersistence.asyncevents.AsyncEventService; import org.apache.usergrid.corepersistence.index.IndexSchemaCacheFactory; import org.apache.usergrid.corepersistence.index.ReIndexRequestBuilder; @@ -34,15 +32,7 @@ import org.apache.usergrid.corepersistence.service.CollectionService; import org.apache.usergrid.corepersistence.service.ConnectionService; import org.apache.usergrid.corepersistence.util.CpNamingUtils; import org.apache.usergrid.exception.ConflictException; -import org.apache.usergrid.persistence.AbstractEntity; -import org.apache.usergrid.persistence.Entity; -import org.apache.usergrid.persistence.EntityFactory; -import org.apache.usergrid.persistence.EntityManager; -import org.apache.usergrid.persistence.EntityManagerFactory; -import org.apache.usergrid.persistence.EntityRef; -import org.apache.usergrid.persistence.Query; -import org.apache.usergrid.persistence.Results; -import org.apache.usergrid.persistence.SimpleEntityRef; +import org.apache.usergrid.persistence.*; import org.apache.usergrid.persistence.cassandra.CassandraService; import org.apache.usergrid.persistence.cassandra.CounterUtils; import org.apache.usergrid.persistence.cassandra.Setup; @@ -57,30 +47,23 @@ import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.persistence.exceptions.ApplicationAlreadyExistsException; import org.apache.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException; import org.apache.usergrid.persistence.exceptions.EntityNotFoundException; -import org.apache.usergrid.persistence.graph.Edge; -import org.apache.usergrid.persistence.graph.GraphManager; -import org.apache.usergrid.persistence.graph.GraphManagerFactory; -import org.apache.usergrid.persistence.graph.MarkedEdge; -import org.apache.usergrid.persistence.graph.SearchByEdgeType; +import org.apache.usergrid.persistence.graph.*; import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdgeType; import org.apache.usergrid.persistence.index.EntityIndex; import org.apache.usergrid.persistence.model.entity.Id; import org.apache.usergrid.persistence.model.entity.SimpleId; import org.apache.usergrid.persistence.model.util.UUIDGenerator; import org.apache.usergrid.utils.UUIDUtils; - -import com.google.common.base.Optional; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; import rx.Observable; -import static java.lang.String.CASE_INSENSITIVE_ORDER; +import java.util.*; +import static java.lang.String.CASE_INSENSITIVE_ORDER; import static org.apache.usergrid.persistence.Schema.PROPERTY_NAME; import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION; @@ -265,19 +248,9 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application private EntityManager _getEntityManager( UUID applicationId ) { - EntityManager em = new CpEntityManager( - this, - cassandraService, - counterUtils, - indexService, - managerCache, - metricsFactory, - entityManagerFig, - graphManagerFactory, - collectionService, - connectionService, - indexSchemaCacheFactory, - applicationId ); + EntityManager em = new CpEntityManager(cassandraService, counterUtils, indexService, managerCache, + metricsFactory, entityManagerFig, graphManagerFactory, collectionService, connectionService,indexSchemaCacheFactory, applicationId ); + return em; } @@ -289,8 +262,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application @Override public Entity createApplicationV2( - String orgName, String name, UUID applicationId, Map<String, Object> properties, boolean forMigration) - throws Exception { + String orgName, String name, UUID applicationId, Map<String, Object> properties, boolean forMigration) throws Exception { String appName = buildAppName( orgName, name ); @@ -392,9 +364,8 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application // find application_info for application to delete - migrateAppInfo( - applicationId, CpNamingUtils.APPLICATION_INFO, CpNamingUtils.DELETED_APPLICATION_INFOS, - CpNamingUtils.DELETED_APPLICATION_INFO).toBlocking().lastOrDefault( null ); + migrateAppInfo(applicationId, CpNamingUtils.APPLICATION_INFO, CpNamingUtils.DELETED_APPLICATION_INFOS, CpNamingUtils.DELETED_APPLICATION_INFO).toBlocking() + .lastOrDefault( null ); } //TODO: return status for restore @@ -436,13 +407,9 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application * @return * @throws Exception */ - private Observable migrateAppInfo( - final UUID applicationUUID, final String deleteTypeName, final String createCollectionName, - final String createTypeName ) throws Exception { - - final ApplicationScope managementAppScope = - CpNamingUtils.getApplicationScope(CpNamingUtils.MANAGEMENT_APPLICATION_ID); + private Observable migrateAppInfo(final UUID applicationUUID, final String deleteTypeName, final String createCollectionName, final String createTypeName ) throws Exception { + final ApplicationScope managementAppScope = CpNamingUtils.getApplicationScope(CpNamingUtils.MANAGEMENT_APPLICATION_ID); final EntityManager managementEm = getEntityManager(CpNamingUtils.MANAGEMENT_APPLICATION_ID); //the application id we will be removing @@ -497,8 +464,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application final Id managementAppId = CpNamingUtils.getManagementApplicationId(); final EntityIndex aei = getManagementIndex(); final GraphManager managementGraphManager = managerCache.getGraphManager(managementAppScope); - final Edge createEdge = - CpNamingUtils.createCollectionEdge(managementAppId, createCollectionName, createApplicationId); + final Edge createEdge = CpNamingUtils.createCollectionEdge(managementAppId, createCollectionName, createApplicationId); final Observable createNodeGraph = managementGraphManager.writeEdge(createEdge);
