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/04/01 00:57:54 UTC
[10/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into
USERGRID-448-appinfofix
Merge branch 'two-dot-o' 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/a0956810
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a0956810
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a0956810
Branch: refs/heads/USERGRID-509
Commit: a0956810593d7aa34280c8e30cf50223574969db
Parents: 2190a5a 06e7ad6
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 11 09:48:08 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 11 09:48:08 2015 -0400
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 111 +++++++++-------
.../usergrid/persistence/map/MapManager.java | 8 ++
.../persistence/map/guice/MapModule.java | 2 +-
.../map/impl/MapManagerFactoryImpl.java | 29 +++--
.../persistence/map/impl/MapManagerImpl.java | 6 +
.../persistence/map/impl/MapSerialization.java | 20 ++-
.../map/impl/MapSerializationImpl.java | 106 +++++++++++++---
.../persistence/map/MapManagerTest.java | 49 +++++++-
stack/corepersistence/queryindex/pom.xml | 16 ++-
.../persistence/index/guice/IndexModule.java | 4 +
.../index/impl/EsEntityIndexFactoryImpl.java | 12 +-
.../index/impl/EsEntityIndexImpl.java | 57 +++++++--
.../index/impl/EsIndexBufferConsumerImpl.java | 15 ++-
.../persistence/index/impl/IndexingUtils.java | 2 +-
.../persistence/index/utils/StringUtils.java | 126 ++-----------------
.../persistence/index/utils/UUIDUtils.java | 4 -
.../persistence/index/impl/EntityIndexTest.java | 99 ++++++++++++++-
17 files changed, 433 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a0956810/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/MapManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a0956810/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 22d37c7,5c46c87..56f8770
--- 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,12 +42,8 @@@ public class MapModule extends Abstract
@Override
protected void configure() {
- bind(MapManagerFactory.class).to(MapManagerFactoryImpl.class);
-
- // create a guice factory for getting our collection manager
+ bind(MapManagerFactory.class).to( MapManagerFactoryImpl.class );
-
- bind( MapSerialization.class).to( MapSerializationImpl.class );
-
+ bind(MapSerialization.class).to( MapSerializationImpl.class );
Multibinder<Migration> migrationBinding = Multibinder.newSetBinder( binder(), Migration.class );
migrationBinding.addBinding().to( Key.get( MapSerialization.class ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a0956810/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------