Merge branch 'USERGRID-451' into USERGRID-405 Upgrade to Java 8 Upgrades RX to latest release
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dcf46937 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dcf46937 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dcf46937 Branch: refs/heads/USERGRID-486 Commit: dcf469378f5d68551cc452368bc6a5378926c7aa Parents: 0a16033 6dc742e Author: Todd Nine <[email protected]> Authored: Fri Mar 20 07:41:23 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Fri Mar 20 07:41:23 2015 -0600 ---------------------------------------------------------------------- stack/core/pom.xml | 26 +- .../corepersistence/CpEntityManager.java | 2 +- .../corepersistence/CpEntityManagerFactory.java | 7 +- .../corepersistence/CpRelationManager.java | 24 +- .../usergrid/corepersistence/CpWalker.java | 81 ++--- .../events/EntityVersionDeletedHandler.java | 72 ++-- .../migration/EntityTypeMappingMigration.java | 41 +-- .../persistence/ObservableIterator.java | 1 + .../migration/EntityTypeMappingMigrationIT.java | 2 +- .../PerformanceEntityRebuildIndexTest.java | 4 +- stack/corepersistence/collection/pom.xml | 14 +- .../impl/EntityCollectionManagerImpl.java | 10 +- .../collection/impl/EntityDeletedTask.java | 20 +- .../impl/EntityVersionCleanupTask.java | 40 +-- .../impl/EntityVersionCreatedTask.java | 26 +- .../mvcc/stage/write/WriteCommit.java | 2 +- .../mvcc/stage/write/WriteUniqueVerify.java | 8 +- .../MvccEntitySerializationStrategyImpl.java | 92 ++--- .../MvccEntitySerializationStrategyV3Impl.java | 94 ++--- .../UniqueValueSerializationStrategyImpl.java | 8 - .../migration/MvccEntityDataMigrationImpl.java | 171 ++++------ .../collection/util/EntityUtils.java | 72 ---- .../mvcc/stage/AbstractEntityStageTest.java | 2 +- .../mvcc/stage/AbstractMvccEntityStageTest.java | 2 +- .../mvcc/stage/TestEntityGenerator.java | 2 +- .../persistence/collection/rx/ParallelTest.java | 10 +- ...MvccEntitySerializationStrategyImplTest.java | 4 +- ...ccEntitySerializationStrategyV1ImplTest.java | 4 +- ...ccEntitySerializationStrategyV2ImplTest.java | 2 +- .../impl/SerializationComparison.java | 4 +- ...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 2 +- .../collection/util/InvalidEntityGenerator.java | 1 + stack/corepersistence/common/pom.xml | 15 +- .../astyanax/MultiKeyColumnNameIterator.java | 4 +- .../MultiKeyColumnNameIteratorTest.java | 187 +++++----- .../astyanax/MultiRowColumnIteratorTest.java | 50 ++- .../graph/impl/GraphManagerImpl.java | 6 +- .../graph/impl/stage/EdgeMetaRepairImpl.java | 2 + .../impl/stage/NodeDeleteListenerImpl.java | 2 +- .../impl/migration/EdgeDataMigrationImpl.java | 87 +++-- .../persistence/graph/GraphManagerIT.java | 17 +- .../graph/GraphManagerShardConsistencyIT.java | 2 +- .../usergrid/persistence/graph/SimpleTest.java | 12 +- .../migration/EdgeDataMigrationImplTest.java | 2 +- stack/corepersistence/model/pom.xml | 1 - .../persistence/model/util/EntityUtils.java | 72 ++++ stack/corepersistence/pom.xml | 8 +- stack/corepersistence/queryindex/pom.xml | 6 - .../index/impl/EsEntityIndexImpl.java | 2 +- .../persistence/index/query/EntityResults.java | 108 ------ .../persistence/index/query/Results.java | 148 -------- .../persistence/index/utils/ListUtils.java | 6 +- .../persistence/index/guice/IndexTestFig.java | 57 ++++ .../index/guice/TestIndexModule.java | 8 +- .../index/impl/CorePerformanceIT.java | 339 ------------------- .../impl/EntityConnectionIndexImplTest.java | 306 ----------------- .../persistence/index/impl/EntityIndexTest.java | 32 +- .../index/impl/IndexLoadTestsIT.java | 138 ++++++++ stack/pom.xml | 8 +- .../management/importer/ImportServiceImpl.java | 34 +- .../impl/ApplicationQueueManagerImpl.java | 195 +++++------ .../setup/ConcurrentProcessSingleton.java | 16 +- 62 files changed, 900 insertions(+), 1820 deletions(-) ----------------------------------------------------------------------
