You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/03/30 21:58:21 UTC
[17/50] incubator-usergrid git commit: Merge branch 'USERGRID-405'
into USERGRID-448-appinfofix
Merge branch 'USERGRID-405' into USERGRID-448-appinfofix
Conflicts:
stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/guice/MapModule.java
stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapManagerFactoryImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9eeb2b58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9eeb2b58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9eeb2b58
Branch: refs/heads/two-dot-o-dev
Commit: 9eeb2b589e92c46d7fae759c8d06ef63bc192f73
Parents: a095681 5c7a5f8
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 11 09:48:58 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 11 09:48:58 2015 -0400
----------------------------------------------------------------------
.../persistence/map/guice/MapModule.java | 4 +-
.../index/impl/EsEntityIndexBatchImpl.java | 14 +--
.../index/impl/EsEntityIndexImpl.java | 37 +++++--
.../persistence/index/impl/IndexingUtils.java | 109 ++++++++++---------
.../persistence/index/impl/EntityIndexTest.java | 74 ++++++++++++-
5 files changed, 158 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9eeb2b58/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/guice/MapModule.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/guice/MapModule.java
index 56f8770,22d37c7..ec28106
--- a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/guice/MapModule.java
+++ b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/guice/MapModule.java
@@@ -42,8 -42,8 +42,8 @@@ public class MapModule extends Abstract
@Override
protected void configure() {
- bind(MapManagerFactory.class).to( MapManagerFactoryImpl.class );
- bind(MapManagerFactory.class).to(MapManagerFactoryImpl.class);
-- bind(MapSerialization.class).to( MapSerializationImpl.class );
++ bind( MapManagerFactory.class ).to( MapManagerFactoryImpl.class );
++ bind( MapSerialization.class ).to( MapSerializationImpl.class );
Multibinder<Migration> migrationBinding = Multibinder.newSetBinder( binder(), Migration.class );
migrationBinding.addBinding().to( Key.get( MapSerialization.class ) );