You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/05/28 14:53:39 UTC
[34/50] [abbrv] incubator-usergrid git commit: Merge branch 'pr/254'
into two-dot-o-dev
Merge branch 'pr/254' 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/1396ebe1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1396ebe1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1396ebe1
Branch: refs/heads/USERGRID-669
Commit: 1396ebe1bc2db937744bf077101dc977c1a917a9
Parents: 5bb9aff f67961d
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue May 26 15:17:26 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue May 26 15:17:26 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 28 +-
.../corepersistence/CpEntityManagerFactory.java | 7 +-
.../corepersistence/CpRelationManager.java | 219 ++++++++------
.../corepersistence/index/IndexServiceImpl.java | 46 +--
.../corepersistence/pipeline/Pipeline.java | 93 +++---
.../pipeline/PipelineBuilderFactory.java | 39 ---
.../pipeline/PipelineModule.java | 20 +-
.../pipeline/PipelineOperation.java | 2 +-
.../pipeline/PipelineOperations.java | 30 ++
.../pipeline/builder/CandidateBuilder.java | 67 +++++
.../pipeline/builder/ConnectionRefBuilder.java | 53 ++++
.../pipeline/builder/EntityBuilder.java | 54 ++++
.../pipeline/builder/IdBuilder.java | 151 ++++++++++
.../pipeline/builder/PipelineBuilder.java | 100 +++++++
.../builder/PipelineBuilderFactory.java | 35 +++
.../pipeline/read/AbstractFilter.java | 2 +-
.../pipeline/read/AbstractPathFilter.java | 2 +-
.../pipeline/read/Collector.java | 38 ---
.../pipeline/read/CollectorFactory.java | 38 ---
.../corepersistence/pipeline/read/Filter.java | 31 --
.../pipeline/read/FilterFactory.java | 74 +++--
.../pipeline/read/ReadFilterFactoryImpl.java | 136 ---------
.../pipeline/read/ReadPipelineBuilder.java | 104 -------
.../pipeline/read/ReadPipelineBuilderImpl.java | 296 -------------------
.../pipeline/read/ResultsPage.java | 10 +-
.../read/collect/AbstractCollector.java | 46 ---
.../read/collect/ConnectionRefFilter.java | 68 +++++
.../read/collect/ConnectionRefResumeFilter.java | 86 ++++++
.../pipeline/read/collect/EntityFilter.java | 68 -----
.../read/collect/EntityResumeFilter.java | 67 +++++
.../pipeline/read/collect/IdResumeFilter.java | 61 ++++
.../read/collect/ResultsPageCollector.java | 35 ++-
.../AbstractElasticSearchFilter.java | 171 -----------
.../pipeline/read/elasticsearch/Candidate.java | 55 ----
.../elasticsearch/CandidateEntityFilter.java | 234 ---------------
.../read/elasticsearch/CandidateIdFilter.java | 201 -------------
.../ElasticSearchCollectionFilter.java | 77 -----
.../ElasticSearchConnectionFilter.java | 73 -----
.../ElasticsearchCursorSerializer.java | 42 ---
.../read/elasticsearch/Elasticsearchdiagram.jpg | Bin 316655 -> 0 bytes
.../graph/AbstractReadGraphEdgeByIdFilter.java | 82 -----
.../read/graph/AbstractReadGraphFilter.java | 147 ---------
.../read/graph/EdgeCursorSerializer.java | 42 ---
.../pipeline/read/graph/EntityIdFilter.java | 54 ----
.../pipeline/read/graph/EntityLoadFilter.java | 155 ----------
.../pipeline/read/graph/GraphDiagram.jpg | Bin 347711 -> 0 bytes
.../graph/ReadGraphCollectionByIdFilter.java | 49 ---
.../read/graph/ReadGraphCollectionFilter.java | 53 ----
.../graph/ReadGraphConnectionByIdFilter.java | 50 ----
.../graph/ReadGraphConnectionByTypeFilter.java | 100 -------
.../read/graph/ReadGraphConnectionFilter.java | 53 ----
.../search/AbstractElasticSearchFilter.java | 169 +++++++++++
.../pipeline/read/search/Candidate.java | 55 ++++
.../read/search/CandidateEntityFilter.java | 232 +++++++++++++++
.../pipeline/read/search/CandidateIdFilter.java | 190 ++++++++++++
.../search/ElasticsearchCursorSerializer.java | 40 +++
.../read/search/Elasticsearchdiagram.jpg | Bin 0 -> 316655 bytes
.../read/search/SearchCollectionFilter.java | 77 +++++
.../read/search/SearchConnectionFilter.java | 72 +++++
.../AbstractReadGraphEdgeByIdFilter.java | 82 +++++
.../read/traverse/AbstractReadGraphFilter.java | 146 +++++++++
.../read/traverse/EdgeCursorSerializer.java | 42 +++
.../pipeline/read/traverse/EntityIdFilter.java | 53 ++++
.../read/traverse/EntityLoadVerifyFilter.java | 154 ++++++++++
.../pipeline/read/traverse/GraphDiagram.jpg | Bin 0 -> 347711 bytes
.../traverse/ReadGraphCollectionByIdFilter.java | 49 +++
.../traverse/ReadGraphCollectionFilter.java | 53 ++++
.../traverse/ReadGraphConnectionByIdFilter.java | 50 ++++
.../ReadGraphConnectionByTypeFilter.java | 99 +++++++
.../traverse/ReadGraphConnectionFilter.java | 53 ++++
.../results/ConnectionRefQueryExecutor.java | 60 ++++
.../results/EntityQueryExecutor.java | 84 ++++++
.../results/ObservableQueryExecutor.java | 52 ++--
.../corepersistence/results/QueryExecutor.java | 1 +
.../pipeline/cursor/CursorTest.java | 4 +-
75 files changed, 2830 insertions(+), 2731 deletions(-)
----------------------------------------------------------------------