Merge branch 'unomi-1.3.x'
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/8f44f4be Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/8f44f4be Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/8f44f4be Branch: refs/heads/master Commit: 8f44f4be65e875668dfbbef6459df040d050c9a9 Parents: ea1b788 d9e9a8f Author: dgaillard <[email protected]> Authored: Thu Jul 5 16:13:07 2018 +0200 Committer: dgaillard <[email protected]> Committed: Thu Jul 5 16:13:07 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/unomi/api/Parameter.java | 3 + .../unomi/api/services/DefinitionsService.java | 1 + .../api/services/PersonalizationService.java | 3 +- .../unomi/api/services/PrivacyService.java | 11 +-- .../apache/unomi/api/services/QueryService.java | 16 +++++ .../privacy/internal/PrivacyServiceImpl.java | 2 +- .../ElasticSearchPersistenceServiceImpl.java | 70 ++++++++++++++------ .../persistence/spi/PersistenceService.java | 15 +++++ .../BooleanConditionESQueryBuilder.java | 12 +++- .../PastEventConditionESQueryBuilder.java | 2 +- .../apache/unomi/rest/QueryServiceEndPoint.java | 14 +++- .../apache/unomi/rest/RulesServiceEndPoint.java | 3 +- .../unomi/rest/ScoringServiceEndPoint.java | 5 +- .../unomi/rest/SegmentServiceEndPoint.java | 3 +- .../services/DefinitionsServiceImpl.java | 4 ++ .../services/services/EventServiceImpl.java | 2 +- .../services/services/GoalsServiceImpl.java | 4 +- .../services/services/QueryServiceImpl.java | 67 ++++++++++++------- .../services/services/SegmentServiceImpl.java | 2 +- .../versions/1.1/building-and-deploying.md | 4 +- src/site/markdown/versions/1.1/concepts.md | 2 +- .../markdown/versions/1.1/getting-started.md | 2 +- .../versions/1.2/building-and-deploying.md | 4 +- .../versions/master/building-and-deploying.md | 4 +- src/site/markdown/versions/master/concepts.md | 3 +- .../markdown/versions/master/twitter-sample.md | 2 +- 26 files changed, 186 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
