Merge branch 'UNOMI-204'
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/aa82e46a Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/aa82e46a Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/aa82e46a Branch: refs/heads/master Commit: aa82e46a0600908f0c5bf0a7e0081aac07aa0fdc Parents: 55bd603 183ffcf Author: tdraier <dra...@apache.org> Authored: Thu Oct 18 14:23:32 2018 +0200 Committer: tdraier <dra...@apache.org> Committed: Thu Oct 18 14:23:32 2018 +0200 ---------------------------------------------------------------------- .../unomi/api/services/SegmentService.java | 12 +- .../ElasticSearchPersistenceServiceImpl.java | 35 ++++- .../conditions/ConditionESQueryBuilder.java | 3 + .../ConditionESQueryBuilderDispatcher.java | 32 +++++ ...g.apache.unomi.persistence.elasticsearch.cfg | 3 + .../spi/aggregate/TermsAggregate.java | 18 +++ .../PastEventConditionESQueryBuilder.java | 135 ++++++++++++++++--- .../resources/OSGI-INF/blueprint/blueprint.xml | 11 ++ .../services/services/SegmentServiceImpl.java | 92 ++++++++----- .../resources/OSGI-INF/blueprint/blueprint.xml | 8 ++ 10 files changed, 291 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/aa82e46a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/aa82e46a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml ----------------------------------------------------------------------
