From beff40f7290a9d4a673fcdde39c9713d0f7fa6e6 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 19 Aug 2020 17:12:02 +0200 Subject: [PATCH] fix some bugs --- .../src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java | 2 +- .../main/java/eu/dnetlib/lbs/elasticsearch/Notification.java | 2 +- .../eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java | 3 ++- .../eu/dnetlib/lbs/openaire/OpenaireBrokerController.java | 5 +++-- .../src/main/resources/application.properties | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java index 91e9cf21..120cc5c4 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java @@ -7,7 +7,7 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -@Document(indexName = "#{elasticSearchProperties.eventsIndexName}", shards = 48, replicas = 0, refreshInterval = "600s") +@Document(indexName = "#{elasticSearchProperties.eventsIndexName}", shards = 48, replicas = 1, refreshInterval = "600s") public class Event { @Id diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java index a49b42a2..f389f91e 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java @@ -11,7 +11,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType; import eu.dnetlib.lbs.subscriptions.Subscription; -@Document(indexName = "#{elasticSearchProperties.notificationsIndexName}", shards = 48, replicas = 0, refreshInterval = "600s") +@Document(indexName = "#{elasticSearchProperties.notificationsIndexName}", shards = 48, replicas = 1, refreshInterval = "600s") public class Notification { @Id diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java index 0bf1fea9..7075deaa 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java @@ -12,6 +12,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.QueryBuilders; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; @@ -106,7 +107,7 @@ public class SubscriptionEventMatcher implements Runnable { final NativeSearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(QueryBuilders.boolQuery() - .must(QueryBuilders.matchQuery("topic", s.getTopic())) + .must(QueryBuilders.matchQuery("topic", s.getTopic()).operator(Operator.AND)) .must(QueryBuilders.rangeQuery("creationDate").from(s.getLastNotificationDate() != null ? s.getLastNotificationDate().getTime() : 0)) .must(QueryBuilders.nestedQuery("map", mapQuery, ScoreMode.None))) .withSearchType(SearchType.DEFAULT) diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java index 23b0eb65..fd10ff86 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java @@ -13,6 +13,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.AggregationBuilders; @@ -125,7 +126,7 @@ public class OpenaireBrokerController extends AbstractLbsController { final NativeSearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(QueryBuilders.boolQuery() - .must(QueryBuilders.matchQuery("topic", topic)) + .must(QueryBuilders.matchQuery("topic", topic).operator(Operator.AND)) .must(QueryBuilders.nestedQuery("map", QueryBuilders.matchQuery("map.targetDatasourceName", ds), ScoreMode.None))) .withSearchType(SearchType.DEFAULT) .withFields("payload") @@ -157,7 +158,7 @@ public class OpenaireBrokerController extends AbstractLbsController { final NativeSearchQuery searchQuery = new NativeSearchQueryBuilder() .withQuery(QueryBuilders.boolQuery() - .must(QueryBuilders.matchQuery("topic", qObj.getTopic())) + .must(QueryBuilders.matchQuery("topic", qObj.getTopic()).operator(Operator.AND)) .must(QueryBuilders.nestedQuery("map", mapQuery, ScoreMode.None))) .withSearchType(SearchType.DEFAULT) .withFields("payload") diff --git a/apps/dhp-broker-application/src/main/resources/application.properties b/apps/dhp-broker-application/src/main/resources/application.properties index 1d1b573e..9e09bfab 100644 --- a/apps/dhp-broker-application/src/main/resources/application.properties +++ b/apps/dhp-broker-application/src/main/resources/application.properties @@ -50,6 +50,6 @@ spring.data.elasticsearch.cluster-name = ${lbs.elastic.clusterName} spring.data.elasticsearch.cluster-nodes = ${lbs.elastic.clusterNodes} - +logging.level.root=DEBUG