Upgrade to ElasticSearch 5.1.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1cd827a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1cd827a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1cd827a1 Branch: refs/heads/master Commit: 1cd827a1252c07e9083aee9ec81104ab66b2881f Parents: 923e491 Author: Serge Huber <[email protected]> Authored: Thu Dec 15 21:55:52 2016 +0100 Committer: Serge Huber <[email protected]> Committed: Thu Dec 15 21:55:52 2016 +0100 ---------------------------------------------------------------------- .../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 4 ++-- .../baseplugin/conditions/PropertyConditionEvaluator.java | 7 +++---- pom.xml | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1cd827a1/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java index 0651c3f..020d1d4 100644 --- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java +++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java @@ -63,7 +63,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.script.Script; -import org.elasticsearch.script.ScriptService; +import org.elasticsearch.script.ScriptType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.aggregations.*; @@ -827,7 +827,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, String index = indexNames.containsKey(itemType) ? indexNames.get(itemType) : (itemsMonthlyIndexed.contains(itemType) && dateHint != null ? getMonthlyIndex(dateHint) : indexName); - Script actualScript = new Script(script, ScriptService.ScriptType.INLINE, null, scriptParams); + Script actualScript = new Script(ScriptType.INLINE, "groovy", script, scriptParams); if (bulkProcessor == null) { client.prepareUpdate(index, itemType, itemId).setScript(actualScript) .execute() http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1cd827a1/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java ---------------------------------------------------------------------- diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java index 67404a8..68e58a6 100644 --- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java +++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.Callable; +import java.util.function.LongSupplier; import java.util.regex.Pattern; /** @@ -282,9 +282,8 @@ public class PropertyConditionEvaluator implements ConditionEvaluator { } else { DateMathParser parser = new DateMathParser(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER); try { - return new Date(parser.parse(value.toString(), new Callable<Long>() { - @Override - public Long call() throws Exception { + return new Date(parser.parse(value.toString(), new LongSupplier() { + public long getAsLong() { return System.currentTimeMillis(); } })); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1cd827a1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 040e382..1aba4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ <version.karaf>3.0.8</version.karaf> <version.karaf.cellar>3.0.3</version.karaf.cellar> <version.pax.exam>4.9.1</version.pax.exam> - <elasticsearch.version>5.0.1</elasticsearch.version> + <elasticsearch.version>5.1.1</elasticsearch.version> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target>
