Merge branch 'master' into apigee-sso-provider
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d6941b7c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d6941b7c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d6941b7c Branch: refs/heads/master Commit: d6941b7c6037657182cfc81b3df39f99f54978b1 Parents: a22dc92 92554a4 Author: Michael Russo <[email protected]> Authored: Tue Jul 26 14:17:22 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Jul 26 14:17:22 2016 -0700 ---------------------------------------------------------------------- docs/data-storage/collections.md | 144 ++++ docs/orgs-and-apps/application.md | 104 +++ sdks/java/pom.xml | 2 +- .../main/resources/usergrid-default.properties | 44 +- .../src/test/resources/usergrid-test.properties | 20 +- stack/core/pom.xml | 819 ++++++++++--------- .../usergrid/corepersistence/CoreModule.java | 67 +- .../corepersistence/CpEntityManager.java | 399 +++++---- .../corepersistence/CpEntityManagerFactory.java | 64 +- .../corepersistence/CpRelationManager.java | 104 +-- .../corepersistence/EntityManagerFig.java | 9 + .../asyncevents/EventBuilderImpl.java | 7 +- .../index/CollectionSettings.java | 47 ++ .../index/CollectionSettingsCache.java | 59 ++ .../index/CollectionSettingsCacheFig.java | 39 + .../index/CollectionSettingsFactory.java | 73 ++ .../index/CollectionSettingsImpl.java | 92 +++ .../index/CollectionSettingsScope.java | 27 + .../index/CollectionSettingsScopeImpl.java | 73 ++ .../corepersistence/index/IndexSchemaCache.java | 50 -- .../index/IndexSchemaCacheFactory.java | 44 - .../index/IndexSchemaCacheFig.java | 39 - .../index/IndexSchemaCacheImpl.java | 120 --- .../corepersistence/index/IndexServiceImpl.java | 72 +- .../index/ReIndexServiceImpl.java | 41 +- .../service/ApplicationServiceImpl.java | 27 +- .../usergrid/persistence/EntityManager.java | 26 +- .../apache/usergrid/persistence/PathQuery.java | 3 +- .../usergrid/persistence/RelationManager.java | 2 + .../index/AsyncIndexServiceTest.java | 2 +- .../corepersistence/index/IndexServiceTest.java | 88 +- .../resources/usergrid-custom-test.properties | 13 + stack/corepersistence/actorsystem/pom.xml | 106 +++ .../persistence/actorsystem/ActorSystemFig.java | 83 ++ .../actorsystem/ActorSystemManager.java | 79 ++ .../actorsystem/ActorSystemManagerImpl.java | 447 ++++++++++ .../actorsystem/ActorSystemModule.java | 34 + .../persistence/actorsystem/ClientActor.java | 205 +++++ .../actorsystem/GuiceActorProducer.java | 46 ++ .../persistence/actorsystem/RouterProducer.java | 53 ++ .../src/main/resources/application.conf | 50 ++ .../actorsystem/ActorServiceServiceTest.java | 68 ++ .../usergrid/persistence/cache/CacheScope.java | 24 + stack/corepersistence/collection/pom.xml | 120 ++- .../collection/EntityCollectionManager.java | 8 +- .../EntityCollectionManagerFactory.java | 4 +- .../persistence/collection/FieldSet.java | 12 + .../exception/WriteUniqueVerifyException.java | 2 +- .../collection/guice/CollectionModule.java | 9 + .../EntityCollectionManagerFactoryImpl.java | 166 ++-- .../impl/EntityCollectionManagerImpl.java | 180 ++-- .../mvcc/stage/CollectionIoEvent.java | 14 +- .../mvcc/stage/delete/MarkCommit.java | 36 +- .../mvcc/stage/write/WriteCommit.java | 82 +- .../mvcc/stage/write/WriteUniqueVerify.java | 142 +++- .../serialization/SerializationFig.java | 4 - .../UniqueValueSerializationStrategy.java | 25 +- .../serialization/impl/MutableFieldSet.java | 12 + .../impl/UniqueFieldRowKeySerializer.java | 3 +- .../UniqueValueSerializationStrategyImpl.java | 138 +++- ...iqueValueSerializationStrategyProxyImpl.java | 21 +- .../uniquevalues/ReservationCache.java | 87 ++ .../uniquevalues/ReservationCacheActor.java | 87 ++ .../uniquevalues/UniqueValueActor.java | 282 +++++++ .../uniquevalues/UniqueValueException.java | 33 + .../uniquevalues/UniqueValuesFig.java | 67 ++ .../uniquevalues/UniqueValuesRouter.java | 70 ++ .../uniquevalues/UniqueValuesService.java | 74 ++ .../uniquevalues/UniqueValuesServiceImpl.java | 369 +++++++++ .../uniquevalues/UniqueValuesTable.java | 42 + .../uniquevalues/UniqueValuesTableImpl.java | 94 +++ .../collection/AbstractUniqueValueTest.java | 46 ++ .../collection/EntityCollectionManagerIT.java | 171 ++-- .../EntityCollectionManagerStressTest.java | 21 +- .../collection/guice/TestCollectionModule.java | 17 + .../mvcc/stage/delete/MarkCommitTest.java | 10 +- .../mvcc/stage/write/WriteCommitTest.java | 8 +- .../mvcc/stage/write/WriteUniqueVerifyIT.java | 121 ++- .../mvcc/stage/write/WriteUniqueVerifyTest.java | 55 +- ...niqueValueSerializationStrategyImplTest.java | 26 +- .../UniqueValuesServiceDeleteTest.java | 149 ++++ .../uniquevalues/UniqueValuesServiceTest.java | 185 +++++ .../src/test/resources/usergrid-CHOP.properties | 18 + .../src/test/resources/usergrid-UNIT.properties | 19 + .../src/test/resources/usergrid.properties | 32 + stack/corepersistence/common/pom.xml | 23 +- .../core/guice/SettingsValidationCluster.java | 18 + .../core/guice/MigrationManagerRule.java | 18 + .../guice/SettingsValidationClusterTest.java | 19 + .../src/test/resources/usergrid-UNIT.properties | 19 + .../src/test/resources/usergrid.properties | 19 + .../impl/shard/DirectedEdgeMeta.java | 8 +- stack/corepersistence/model/pom.xml | 16 + .../persistence/model/entity/EntityMap.java | 18 + .../persistence/model/field/ArrayField.java | 7 + .../persistence/model/field/ByteArrayField.java | 9 + .../persistence/model/field/DistanceField.java | 9 + .../model/field/EntityObjectField.java | 9 + .../persistence/model/field/FieldTypeName.java | 3 - .../persistence/model/field/ListField.java | 7 + .../persistence/model/field/LocationField.java | 7 + .../persistence/model/field/NullField.java | 7 + .../persistence/model/field/SetField.java | 7 + .../model/field/value/EntityObject.java | 2 +- .../persistence/model/util/EntityUtils.java | 18 + .../persistence/model/util/UUIDGenerator.java | 18 + .../persistence/model/field/EntityTest.java | 18 + .../model/util/UUIDGeneratorTest.java | 18 + stack/corepersistence/pom.xml | 72 ++ stack/corepersistence/queryindex/pom.xml | 18 +- .../index/impl/EsEntityIndexFactoryImpl.java | 2 + .../index/impl/EsEntityIndexImpl.java | 94 +-- .../persistence/index/impl/EntityIndexTest.java | 12 +- stack/pom.xml | 10 +- stack/query-validator/pom.xml | 32 +- .../query/validator/AbstractQueryIT.java | 23 +- .../usergrid/query/validator/QueryITSuite.java | 12 +- .../query/validator/users/UserQueryIT.java | 54 +- .../test/resources/usergrid-test-context.xml | 5 +- .../usergrid/rest/AbstractContextResource.java | 1 + .../apache/usergrid/rest/ShutdownListener.java | 11 + .../rest/applications/CollectionResource.java | 97 +-- .../rest/applications/ServiceResource.java | 8 +- ...ApplicationAlreadyExistsExceptionMapper.java | 32 + .../java/org/apache/usergrid/rest/ITSetup.java | 56 +- .../apache/usergrid/rest/NotificationsIT.java | 6 +- .../org/apache/usergrid/rest/UniqueCatsIT.java | 233 ++++++ .../apache/usergrid/rest/UniqueValuesIT.java | 224 +++++ .../rest/UniqueValuesPerformanceIT.java | 165 ++++ .../rest/applications/ApplicationDeleteIT.java | 115 ++- .../applications/ApplicationResourceIT.java | 2 +- .../collection/CollectionsResourceIT.java | 251 +++--- .../collection/users/PermissionsResourceIT.java | 4 +- .../rest/management/OrganizationsIT.java | 3 - .../resource/endpoints/mgmt/OrgResource.java | 5 - .../resources/corepersistence-UNIT.properties | 2 + .../resources/usergrid-custom-test.properties | 19 +- .../resources/usergrid-rest-deploy-context.xml | 33 +- stack/services/pom.xml | 6 + .../services/AbstractCollectionService.java | 71 +- .../services/AbstractConnectionsService.java | 9 +- .../usergrid/services/AbstractService.java | 53 +- .../applications/ApplicationsService.java | 4 +- .../resources/usergrid-services-context.xml | 2 +- .../usergrid/services/ServiceInvocationIT.java | 28 +- .../usergrid/tools/UniqueValueScanner.java | 124 +-- 146 files changed, 7172 insertions(+), 1999 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/d6941b7c/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/d6941b7c/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/d6941b7c/stack/services/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/d6941b7c/stack/services/src/main/resources/usergrid-services-context.xml ----------------------------------------------------------------------
