Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-608
# By Todd Nine (7) and others # Via Shawn Feldman (2) and others * 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: [USERGRID-642] Remove password properties from user objects in portal Addresses some of George's comments Fixes exception on missing keyspace during bootstrap Updates REST api calls. POST is used to create a re-index job, PUT is used to resume. test fixes fix serviceinvocation it fix serviceinvocation it Change usergrid SDK logging to be set via config. Fixes bugs and cleans up tests Finishes changes before tests fix connections rename connecting to source and connected to target rename vars Refactored observable methods to correct name Update of Apis and tests [USERGRID-572] - ignore sensitive params from QP in response params Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3f8899df Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3f8899df Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3f8899df Branch: refs/heads/USERGRID-669 Commit: 3f8899dfa10a22a4b67f0099d86c19ed22ba6c1e Parents: aa8b20d 53563e8 Author: GERey <gre...@apigee.com> Authored: Tue May 26 10:55:31 2015 -0700 Committer: GERey <gre...@apigee.com> Committed: Tue May 26 10:55:31 2015 -0700 ---------------------------------------------------------------------- portal/config.js | 4 +- portal/js/global/ug-service.js | 4 +- portal/js/users/users-controller.js | 19 +- .../usergrid/corepersistence/CoreModule.java | 4 + .../corepersistence/CpEntityManager.java | 24 +- .../corepersistence/CpEntityManagerFactory.java | 22 +- .../corepersistence/CpRelationManager.java | 123 +++---- .../asyncevents/EventBuilder.java | 6 +- .../asyncevents/EventBuilderImpl.java | 18 +- .../asyncevents/InMemoryAsyncEventService.java | 9 +- .../asyncevents/SQSAsyncEventService.java | 9 +- .../index/EdgeScopeSerializer.java | 41 +++ .../index/EntityIndexOperation.java | 46 +++ .../index/IndexProcessorFig.java | 6 +- .../corepersistence/index/IndexServiceImpl.java | 9 +- .../corepersistence/index/ReIndexAction.java | 6 +- .../index/ReIndexRequestBuilder.java | 86 +++++ .../index/ReIndexRequestBuilderImpl.java | 122 +++++++ .../corepersistence/index/ReIndexService.java | 89 +++-- .../index/ReIndexServiceImpl.java | 251 +++++++++++-- .../cursor/AbstractCursorSerializer.java | 2 +- .../pipeline/cursor/CursorSerializerUtil.java | 54 ++- .../pipeline/cursor/RequestCursor.java | 9 +- .../pipeline/cursor/ResponseCursor.java | 49 +-- .../pipeline/read/AbstractPathFilter.java | 30 -- .../pipeline/read/CursorSeek.java | 53 +++ .../rx/impl/AllEntityIdsObservable.java | 5 +- .../rx/impl/AllEntityIdsObservableImpl.java | 6 +- .../corepersistence/util/CpNamingUtils.java | 3 +- .../util/SerializableMapper.java | 91 ----- .../usergrid/persistence/EntityManager.java | 34 +- .../persistence/EntityManagerFactory.java | 2 - .../persistence/MultiQueryIterator.java | 4 +- .../apache/usergrid/persistence/PathQuery.java | 3 +- .../usergrid/persistence/RelationManager.java | 14 +- .../rx/EdgesToTargetObservableIT.java | 4 +- .../usergrid/persistence/CollectionIT.java | 2 +- .../usergrid/persistence/CountingMutatorIT.java | 6 +- .../persistence/EntityConnectionsIT.java | 26 +- .../org/apache/usergrid/persistence/GeoIT.java | 8 +- .../PerformanceEntityRebuildIndexTest.java | 350 ++++++++----------- .../persistence/query/ConnectionHelper.java | 2 +- .../persistence/query/IteratingQueryIT.java | 2 +- .../data/MigrationInfoSerializationImpl.java | 4 +- .../migration/schema/MigrationManagerImpl.java | 14 +- .../core/migration/util/AstayanxUtils.java | 49 +++ .../graph/serialization/EdgesObservable.java | 24 +- .../serialization/impl/EdgesObservableImpl.java | 12 +- .../impl/TargetIdObservableImpl.java | 2 +- .../impl/migration/EdgeDataMigrationImpl.java | 2 +- .../persistence/index/impl/IndexingUtils.java | 2 + stack/pom.xml | 13 + .../org/apache/usergrid/rest/ApiResponse.java | 16 + .../org/apache/usergrid/rest/IndexResource.java | 342 +++++++++--------- .../main/resources/usergrid-rest-context.xml | 3 - .../resources/usergrid-rest-deploy-context.xml | 1 - .../apache/usergrid/rest/ApiResponseTest.java | 45 +++ .../rest/management/ImportResourceIT.java | 2 +- .../cassandra/ManagementServiceImpl.java | 15 +- .../management/export/ExportServiceImpl.java | 4 +- .../management/importer/FileImportJob.java | 5 +- .../management/importer/ImportServiceImpl.java | 15 +- .../services/AbstractConnectionsService.java | 24 +- .../users/activities/ActivitiesService.java | 4 +- .../users/activities/ActivitiesService.java | 4 +- .../usergrid/management/OrganizationIT.java | 8 +- .../management/importer/ImportCollectionIT.java | 2 +- .../importer/ImportConnectionsTest.java | 9 +- .../management/importer/ImportServiceIT.java | 6 +- .../resources/usergrid-custom-test.properties | 1 + 70 files changed, 1392 insertions(+), 893 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f8899df/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f8899df/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f8899df/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/EventBuilderImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f8899df/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f8899df/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java ----------------------------------------------------------------------
