Merge branch 'collectionClearJob'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8e9eff8d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8e9eff8d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8e9eff8d Branch: refs/heads/asf-site Commit: 8e9eff8d9340fc85b7d4b544fa542e388974525a Parents: 36e28a8 11823f2 Author: Mike Dunker <[email protected]> Authored: Mon Aug 28 16:23:01 2017 -0700 Committer: Mike Dunker <[email protected]> Committed: Mon Aug 28 16:23:01 2017 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 3 +- .../usergrid/corepersistence/CoreModule.java | 1 + .../corepersistence/CpEntityManager.java | 3 +- .../corepersistence/CpEntityManagerFactory.java | 2 +- .../corepersistence/EntityManagerFig.java | 2 +- .../asyncevents/AsyncEventQueueType.java | 35 ++ .../asyncevents/AsyncEventService.java | 7 +- .../asyncevents/AsyncEventServiceImpl.java | 545 +++++++++---------- .../asyncevents/EventBuilder.java | 26 +- .../asyncevents/EventBuilderImpl.java | 205 +++++-- .../asyncevents/model/EntityDeleteEvent.java | 27 +- .../index/CollectionDeleteAction.java | 43 ++ .../index/CollectionDeleteRequestBuilder.java | 92 ++++ .../CollectionDeleteRequestBuilderImpl.java | 146 +++++ .../index/CollectionDeleteService.java | 108 ++++ .../index/CollectionDeleteServiceImpl.java | 299 ++++++++++ .../index/CollectionSettingsImpl.java | 1 - .../index/IndexProcessorFig.java | 27 + .../corepersistence/index/IndexService.java | 16 +- .../corepersistence/index/IndexServiceImpl.java | 56 +- .../corepersistence/index/ReIndexAction.java | 5 +- .../index/ReIndexServiceImpl.java | 5 +- .../read/traverse/AbstractReadGraphFilter.java | 42 +- .../AbstractReadReverseGraphFilter.java | 41 +- .../usergrid/persistence/EntityManager.java | 2 +- .../org/apache/usergrid/persistence/Query.java | 17 + .../persistence/entities/Application.java | 26 + .../rx/EdgesFromSourceObservableIT.java | 2 +- .../rx/EdgesToTargetObservableIT.java | 4 +- .../persistence/CollectionDeleteTest.java | 266 +++++++++ .../usergrid/persistence/CoreSchemaManager.java | 16 +- .../usergrid/persistence/RebuildIndexTest.java | 36 +- .../core/src/test/resources/project.properties | 2 +- .../resources/usergrid-custom-test.properties | 3 +- .../actorsystem/ActorSystemManagerImpl.java | 3 +- .../src/test/resources/dynamic-test.properties | 1 + .../src/test/resources/usergrid-CHOP.properties | 1 + .../src/test/resources/usergrid-UNIT.properties | 1 + .../src/test/resources/usergrid.properties | 1 + .../persistence/graph/GraphManager.java | 2 +- .../graph/impl/GraphManagerImpl.java | 21 +- .../graph/impl/SimpleSearchByEdgeType.java | 9 + .../graph/impl/stage/NodeDeleteListener.java | 6 +- .../impl/stage/NodeDeleteListenerImpl.java | 64 +-- .../graph/serialization/EdgesObservable.java | 6 +- .../impl/EdgeMetadataSerializationV2Impl.java | 1 - .../serialization/impl/EdgesObservableImpl.java | 22 +- .../impl/TargetIdObservableImpl.java | 4 +- .../impl/migration/EdgeDataMigrationImpl.java | 2 +- .../graph/impl/NodeDeleteListenerTest.java | 8 +- .../src/test/resources/usergrid-AWS.properties | 1 + .../src/test/resources/usergrid-CHOP.properties | 1 + .../src/test/resources/usergrid-UNIT.properties | 1 + .../src/test/resources/usergrid.properties | 1 + .../usergrid/persistence/index/EntityIndex.java | 12 +- .../index/impl/EsEntityIndexImpl.java | 65 +-- .../persistence/index/query/Identifier.java | 3 +- .../src/test/resources/dynamic-test.properties | 1 + .../src/test/resources/usergrid-CHOP.properties | 1 + .../src/test/resources/usergrid-UNIT.properties | 1 + stack/corepersistence/queue/pom.xml | 18 +- .../queues/impl/QueueSerializationImpl.java | 2 +- .../persistence/queue/guice/QueueModule.java | 2 +- .../persistence/qakka/KeyspaceDropper.java | 6 +- .../qakka/core/QueueMessageManagerTest.java | 2 +- .../queue/src/test/resources/qakka.properties | 1 + stack/pom.xml | 8 +- .../resources/usergrid-custom-test.properties | 2 + stack/rest/pom.xml | 4 +- .../rest/applications/CollectionResource.java | 130 ++++- .../rest/applications/users/UserResource.java | 9 + .../rest/management/users/UserResource.java | 16 + .../apache/usergrid/rest/TestResource/error.jsp | 4 +- .../apache/usergrid/rest/TestResource/test.jsp | 5 +- .../ApplicationResource/authorize_form.jsp | 15 +- .../applications/ApplicationResource/error.jsp | 4 +- .../users/UserResource/activate.jsp | 4 +- .../applications/users/UserResource/confirm.jsp | 4 +- .../applications/users/UserResource/error.jsp | 4 +- .../users/UserResource/resetpw_email_form.jsp | 7 +- .../UserResource/resetpw_email_success.jsp | 4 +- .../users/UserResource/resetpw_set_form.jsp | 9 +- .../users/UserResource/resetpw_set_success.jsp | 4 +- .../applications/users/UsersResource/error.jsp | 4 +- .../users/UsersResource/resetpw_email_form.jsp | 5 +- .../UsersResource/resetpw_email_success.jsp | 4 +- .../ManagementResource/authorize_form.jsp | 15 +- .../management/ManagementResource/error.jsp | 4 +- .../OrganizationResource/activate.jsp | 4 +- .../OrganizationResource/confirm.jsp | 4 +- .../OrganizationResource/error.jsp | 4 +- .../management/users/UserResource/activate.jsp | 4 +- .../management/users/UserResource/confirm.jsp | 4 +- .../management/users/UserResource/error.jsp | 4 +- .../users/UserResource/resetpw_email_form.jsp | 5 +- .../UserResource/resetpw_email_success.jsp | 4 +- .../users/UserResource/resetpw_set_form.jsp | 8 +- .../users/UserResource/resetpw_set_success.jsp | 4 +- .../management/users/UsersResource/error.jsp | 4 +- .../users/UsersResource/resetpw_email_form.jsp | 4 +- .../UsersResource/resetpw_email_success.jsp | 4 +- .../rest/src/test/resources/project.properties | 2 +- .../resources/usergrid-custom-test.properties | 4 +- stack/services/pom.xml | 4 +- .../usergrid/management/ManagementService.java | 10 +- .../cassandra/ManagementServiceImpl.java | 10 + .../usergrid/services/ActivitiesServiceIT.java | 9 +- .../usergrid/services/ServiceInvocationIT.java | 3 + .../AbstractServiceNotificationIT.java | 4 +- .../gcm/NotificationsServiceIT.java | 2 +- .../src/test/resources/project.properties | 2 +- .../resources/usergrid-custom-test.properties | 2 +- stack/test-utils/pom.xml | 4 +- .../src/test/resources/project.properties | 2 +- stack/tools/pom.xml | 2 +- stack/websocket/pom.xml | 2 +- 116 files changed, 2013 insertions(+), 752 deletions(-) ----------------------------------------------------------------------
