Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BBF23178B0 for ; Thu, 12 Mar 2015 22:41:09 +0000 (UTC) Received: (qmail 80455 invoked by uid 500); 12 Mar 2015 22:41:09 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 80407 invoked by uid 500); 12 Mar 2015 22:41:09 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 79854 invoked by uid 99); 12 Mar 2015 22:41:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Mar 2015 22:41:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3CE94E1901; Thu, 12 Mar 2015 22:41:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Date: Thu, 12 Mar 2015 22:41:30 -0000 Message-Id: <879881a45b9c42df8df97521970154e5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/38] incubator-usergrid git commit: Merge remote-tracking branch 'origin/USERGRID-454' into USERGRID-416 Merge remote-tracking branch 'origin/USERGRID-454' into USERGRID-416 Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/729c675f Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/729c675f Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/729c675f Branch: refs/heads/USERGRID-396 Commit: 729c675f11aac1c0f77e268df4ccbfee126334f7 Parents: b8f5bf6 5e0ce62 Author: Todd Nine Authored: Fri Mar 6 17:49:20 2015 -0700 Committer: Todd Nine Committed: Fri Mar 6 17:49:20 2015 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 108 ++++++++++++++-- .../corepersistence/CpEntityManagerFactory.java | 8 +- .../corepersistence/CpRelationManager.java | 39 +++++- .../cassandra/CassandraPersistenceUtils.java | 2 +- .../index/impl/EsEntityIndexBatchImpl.java | 15 ++- .../index/impl/EsEntityIndexImpl.java | 125 +++++++++++++++---- 6 files changed, 257 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/729c675f/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ---------------------------------------------------------------------- diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java index 652e084,f7a9f8b..e79ec83 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java @@@ -676,9 -692,8 +692,9 @@@ public class CpEntityManager implement @Override public RelationManager getRelationManager( EntityRef entityRef ) { + Preconditions.checkNotNull( entityRef, "entityRef cannot be null" ); CpRelationManager rmi = new CpRelationManager(); - rmi.init( this, emf, applicationId, entityRef, null ); + rmi.init( this, emf, applicationId, entityRef, null, metricsFactory ); return rmi; } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/729c675f/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java index e0029c1,3f439e6..18c7965 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java @@@ -118,8 -117,8 +120,9 @@@ public class CpEntityManagerFactory imp this.injector = injector; this.managerCache = injector.getInstance( ManagerCache.class ); this.dataMigrationManager = injector.getInstance( DataMigrationManager.class ); + this.metricsFactory = injector.getInstance( MetricsFactory.class ); + this.orgApplicationCache = new OrgApplicationCacheImpl( this ); }