Merge branch 'USERGRID-587' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9b939d15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9b939d15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9b939d15 Branch: refs/heads/USERGRID-609 Commit: 9b939d15ba398c1aa759f17d647bd85ee232ad9e Parents: 4107ef3 5bb7798 Author: Todd Nine <[email protected]> Authored: Mon May 4 11:27:46 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Mon May 4 11:27:46 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 5 +- .../corepersistence/pipeline/Pipeline.java | 12 +- .../pipeline/PipelineContext.java | 16 +- .../pipeline/PipelineOperation.java | 39 ++++ .../pipeline/PipelineResult.java | 57 ----- .../pipeline/cursor/ResponseCursor.java | 81 ++++--- .../pipeline/read/AbstractFilter.java | 45 ++++ .../pipeline/read/AbstractPathFilter.java | 109 +++++++++ .../read/AbstractPipelineOperation.java | 44 ---- .../pipeline/read/AbstractSeekingFilter.java | 102 -------- .../pipeline/read/CandidateResultsFilter.java | 31 --- .../pipeline/read/Collector.java | 13 +- .../pipeline/read/CollectorFactory.java | 12 +- .../corepersistence/pipeline/read/EdgePath.java | 79 +++++++ .../corepersistence/pipeline/read/Filter.java | 9 +- .../pipeline/read/FilterFactory.java | 40 +++- .../pipeline/read/FilterResult.java | 56 +++++ .../pipeline/read/PipelineOperation.java | 38 --- .../pipeline/read/ReadPipelineBuilder.java | 5 +- .../pipeline/read/ReadPipelineBuilderImpl.java | 80 ++++--- .../pipeline/read/ResultsPage.java | 26 ++- .../read/collect/AbstractCollector.java | 46 ++++ .../pipeline/read/collect/EntityFilter.java | 68 ++++++ .../read/collect/IdCursorSerializer.java | 41 ++++ .../read/collect/ResultsPageCollector.java | 80 +++++++ .../AbstractElasticSearchFilter.java | 45 ++-- .../pipeline/read/elasticsearch/Candidate.java | 55 +++++ .../elasticsearch/CandidateEntityFilter.java | 234 +++++++++++++++++++ .../read/elasticsearch/CandidateIdFilter.java | 201 ++++++++++++++++ .../CandidateResultsEntityResultsCollector.java | 217 ----------------- .../CandidateResultsIdVerifyFilter.java | 193 --------------- .../impl/CollectionRefsVerifier.java | 44 ---- .../CollectionResultsLoaderFactoryImpl.java | 65 ------ .../impl/ConnectionRefsVerifier.java | 59 ----- .../ConnectionResultsLoaderFactoryImpl.java | 73 ------ .../impl/ElasticSearchQueryExecutor.java | 224 ------------------ .../read/elasticsearch/impl/EntityVerifier.java | 127 ---------- .../elasticsearch/impl/FilteringLoader.java | 219 ----------------- .../read/elasticsearch/impl/IdsVerifier.java | 46 ---- .../read/elasticsearch/impl/ResultsLoader.java | 43 ---- .../impl/ResultsLoaderFactory.java | 41 ---- .../elasticsearch/impl/ResultsVerifier.java | 52 ----- .../elasticsearch/impl/VersionVerifier.java | 85 ------- .../pipeline/read/entity/EntityIdFilter.java | 53 ----- .../read/entity/EntityLoadCollector.java | 94 -------- .../graph/AbstractReadGraphEdgeByIdFilter.java | 12 +- .../read/graph/AbstractReadGraphFilter.java | 65 +++++- .../pipeline/read/graph/EntityIdFilter.java | 54 +++++ .../pipeline/read/graph/EntityLoadFilter.java | 155 ++++++++++++ .../graph/ReadGraphConnectionByTypeFilter.java | 20 +- .../results/ObservableQueryExecutor.java | 24 +- .../apache/usergrid/persistence/Results.java | 2 +- .../pipeline/cursor/CursorTest.java | 20 +- .../persistence/index/CandidateResults.java | 11 +- .../impl/EsApplicationEntityIndexImpl.java | 7 +- .../persistence/index/usergrid-mappings.json | 1 - 56 files changed, 1575 insertions(+), 2100 deletions(-) ----------------------------------------------------------------------
