This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 1c50357a10f115da8173aca7642589b9c68c1db1 Merge: 7e077f5 f694fac Author: Serge Huber <[email protected]> AuthorDate: Fri Nov 22 16:14:35 2019 +0100 Merge pull request #111 from apache/UNOMI-225-ES7 UNOMI-225 Support for ElasticSearch 7 .gitignore | 2 +- docker/docker-compose.yml | 1 - .../unomi/geonames/services/GeonameEntry.java | 1 - .../geonames/services/GeonamesServiceImpl.java | 6 +- .../META-INF/cxs/mappings/geonameEntry.json | 47 +- .../resources/META-INF/cxs/mappings/userList.json | 46 +- manual/src/main/asciidoc/configuration.adoc | 4 +- .../main/resources/etc/custom.system.properties | 6 +- persistence-elasticsearch/core/pom.xml | 180 +++-- .../ElasticSearchPersistenceServiceImpl.java | 824 +++++++++------------ .../resources/META-INF/cxs/mappings/_default_.json | 22 - .../META-INF/cxs/mappings/actiontype.json | 20 + .../resources/META-INF/cxs/mappings/campaign.json | 64 +- .../META-INF/cxs/mappings/campaignevent.json | 58 +- .../META-INF/cxs/mappings/conditiontype.json | 20 + .../resources/META-INF/cxs/mappings/event.json | 24 +- .../META-INF/cxs/mappings/exportconfig.json | 20 + .../main/resources/META-INF/cxs/mappings/goal.json | 47 +- .../META-INF/cxs/mappings/importconfig.json | 20 + .../resources/META-INF/cxs/mappings/persona.json | 38 + .../META-INF/cxs/mappings/personaSession.json | 53 +- .../resources/META-INF/cxs/mappings/profile.json | 45 +- .../META-INF/cxs/mappings/propertyType.json | 90 ++- .../main/resources/META-INF/cxs/mappings/rule.json | 64 +- .../resources/META-INF/cxs/mappings/rulestats.json | 20 + .../resources/META-INF/cxs/mappings/scoring.json | 47 +- .../resources/META-INF/cxs/mappings/segment.json | 48 +- .../resources/META-INF/cxs/mappings/session.json | 53 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 22 +- .../org.apache.unomi.persistence.elasticsearch.cfg | 10 +- .../ElasticsearchPersistenceTest.java | 173 +++++ .../unomi/persistence/spi/PersistenceService.java | 12 +- .../conditions/PropertyConditionEvaluator.java | 13 +- plugins/request/pom.xml | 6 +- pom.xml | 2 +- .../services/impl/segments/SegmentServiceImpl.java | 24 +- 36 files changed, 1267 insertions(+), 865 deletions(-)
