Revert all changes to ServiceManager
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7d2de990 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7d2de990 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7d2de990 Branch: refs/heads/release-2.1.1 Commit: 7d2de990705c0fb8380a03620862815854e9fd73 Parents: 6daba1d Author: Dave Johnson <[email protected]> Authored: Wed May 25 10:20:24 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed May 25 10:20:24 2016 -0400 ---------------------------------------------------------------------- .../usergrid/services/ServiceManager.java | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/7d2de990/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java index e5ef407..a9892f5 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java @@ -17,29 +17,32 @@ package org.apache.usergrid.services; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import org.apache.commons.lang.StringUtils; +import java.lang.reflect.Modifier; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; import org.apache.usergrid.batch.service.SchedulerService; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.mq.QueueManager; import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.EntityRef; +import org.apache.usergrid.persistence.cassandra.CassandraService; import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.services.ServiceParameter.IdParameter; import org.apache.usergrid.services.applications.ApplicationsService; import org.apache.usergrid.services.exceptions.UndefinedServiceEntityTypeException; import org.apache.usergrid.utils.ListUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContext; -import java.lang.reflect.Modifier; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; +import org.apache.commons.lang.StringUtils; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import static org.apache.usergrid.persistence.SimpleEntityRef.ref; import static org.apache.usergrid.utils.InflectionUtils.pluralize;
