From 1bf492b488fe41e879f3ea77210d6440a34487fd Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Fri, 4 Sep 2020 14:33:19 +0200 Subject: [PATCH] change packages --- .../LiteratureBrokerServiceApplication.java | 2 +- .../LiteratureBrokerServiceConfiguration.java | 8 +- .../controllers/AjaxController.java | 31 +++---- .../broker}/controllers/ApiDocController.java | 2 +- .../controllers/EventsController.java | 17 ++-- .../controllers/NotificationsController.java | 9 +- .../controllers/StartMatchingController.java | 11 +-- .../controllers/SubscriptionsController.java | 17 ++-- .../controllers/TopicsController.java | 17 ++-- .../controllers/objects/BufferStatus.java | 2 +- .../controllers/objects/CurrentStatus.java | 8 +- .../controllers/objects/DispatcherStatus.java | 2 +- .../controllers/objects/ThreadStatus.java | 2 +- .../controllers/objects/Tool.java | 2 +- .../cron/ScheduledActions.java | 8 +- .../events/manager/EventManager.java | 40 ++++----- .../events/manager/EventManagerFactory.java | 14 +-- .../AbstractNotificationDispatcher.java | 12 +-- .../events/output/DispatcherManager.java | 12 +-- .../events/output/EmailDispatcher.java | 12 +-- .../events/output/MockDispatcher.java | 8 +- .../events/output/NotificationDispatcher.java | 18 ++++ .../matchers/SubscriptionEventMatcher.java | 24 +++--- .../metrics/MetricInterceptor.java | 2 +- .../metrics/RequestCounterInterceptor.java | 2 +- .../metrics/RequestTimingInterceptor.java | 2 +- .../{lbs => broker}/metrics/WebMvcConfig.java | 2 +- .../openaire/AdvQueryObject.java | 40 ++++----- .../{lbs => broker}/openaire/BrowseEntry.java | 2 +- .../openaire/ElasticSearchQueryUtils.java | 4 +- .../{lbs => broker}/openaire/EventsPage.java | 2 +- .../openaire/HomeController.java | 2 +- .../openaire/OpenaireBrokerController.java | 20 ++--- .../openaire/OpenaireSubscription.java | 12 +-- .../{lbs => broker}/openaire/Range.java | 2 +- .../{lbs => broker}/openaire/ScrollPage.java | 2 +- .../openaire/SimpleSubscriptionDesc.java | 2 +- .../properties/EmailProperties.java | 2 +- .../{lbs => broker}/utils/EventVerifier.java | 8 +- .../{lbs => broker}/utils/LbsQueue.java | 2 +- .../{lbs => broker}/utils/QueueManager.java | 2 +- .../{lbs => broker}/utils/ThreadManager.java | 2 +- .../events/output/NotificationDispatcher.java | 18 ---- ...teratureBrokerServiceApplicationTests.java | 2 +- .../broker}/integration/ScrollTest.java | 4 +- .../tests/OpenaireQueriesTest.java | 10 +-- .../applicationContext-test-queries.xml | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../{lbs => broker}/BrokerConfiguration.java | 8 +- .../BrokerPublicApplication.java | 2 +- .../oa}/controllers/ApiDocController.java | 2 +- .../oa/controllers/NotificationMessage.java | 40 +++++++++ .../OpenairePublicController.java} | 85 ++++++++++++------- .../oa}/controllers/ScrollPage.java | 14 ++- .../src/main/resources/application.properties | 3 - .../broker/oa}/integration/ScrollTest.java | 16 ++-- .../controllers/AbstractLbsController.java | 2 +- .../common}/elasticsearch/Event.java | 2 +- .../elasticsearch/EventRepository.java | 2 +- .../elasticsearch/EventStatsManager.java | 4 +- .../common}/elasticsearch/Notification.java | 4 +- .../elasticsearch/NotificationRepository.java | 2 +- .../properties/DatabaseProperties.java | 2 +- .../properties/ElasticSearchProperties.java | 2 +- .../subscriptions/ConditionOperator.java | 2 +- .../subscriptions/ConditionParams.java | 4 +- .../common}/subscriptions/MapCondition.java | 8 +- .../subscriptions/NotificationFrequency.java | 2 +- .../subscriptions/NotificationMode.java | 5 ++ .../common}/subscriptions/Subscription.java | 4 +- .../subscriptions/SubscriptionRepository.java | 4 +- .../common}/topics/TopicType.java | 4 +- .../common}/topics/TopicTypeRepository.java | 2 +- .../common}/utils/DateParser.java | 2 +- .../common}/utils/MapValue.java | 2 +- .../common}/utils/MapValueType.java | 2 +- .../lbs/subscriptions/NotificationMode.java | 5 -- .../common}/clients/IndexClientTest.java | 14 +-- .../common}/subscriptions/ConditionTest.java | 8 +- .../common}/utils/MapValueTest.java | 6 +- .../applicationContext-test-queries.xml | 2 +- .../src/test/resources/logback-test.xml | 2 +- 82 files changed, 381 insertions(+), 315 deletions(-) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/LiteratureBrokerServiceApplication.java (92%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/LiteratureBrokerServiceConfiguration.java (94%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/AjaxController.java (74%) rename apps/{dhp-broker-public-application/src/main/java/eu/dnetlib/lbs => dhp-broker-application/src/main/java/eu/dnetlib/broker}/controllers/ApiDocController.java (87%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/EventsController.java (89%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/NotificationsController.java (83%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/StartMatchingController.java (83%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/SubscriptionsController.java (90%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/TopicsController.java (82%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/objects/BufferStatus.java (94%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/objects/CurrentStatus.java (87%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/objects/DispatcherStatus.java (91%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/objects/ThreadStatus.java (93%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/controllers/objects/Tool.java (85%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/cron/ScheduledActions.java (83%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/events/manager/EventManager.java (60%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/events/manager/EventManagerFactory.java (61%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/events/output/AbstractNotificationDispatcher.java (88%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/events/output/DispatcherManager.java (79%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/events/output/EmailDispatcher.java (92%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/events/output/MockDispatcher.java (82%) create mode 100644 apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/NotificationDispatcher.java rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/matchers/SubscriptionEventMatcher.java (87%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/metrics/MetricInterceptor.java (53%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/metrics/RequestCounterInterceptor.java (97%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/metrics/RequestTimingInterceptor.java (98%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/metrics/WebMvcConfig.java (95%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/AdvQueryObject.java (76%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/BrowseEntry.java (92%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/ElasticSearchQueryUtils.java (96%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/EventsPage.java (96%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/HomeController.java (92%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/OpenaireBrokerController.java (95%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/OpenaireSubscription.java (84%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/Range.java (94%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/ScrollPage.java (95%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/openaire/SimpleSubscriptionDesc.java (97%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/properties/EmailProperties.java (97%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/utils/EventVerifier.java (88%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/utils/LbsQueue.java (98%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/utils/QueueManager.java (96%) rename apps/dhp-broker-application/src/main/java/eu/dnetlib/{lbs => broker}/utils/ThreadManager.java (92%) delete mode 100644 apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java rename apps/dhp-broker-application/src/test/java/eu/dnetlib/{lbs => broker}/LiteratureBrokerServiceApplicationTests.java (92%) rename apps/{dhp-broker-public-application/src/test/java/eu/dnetlib/lbs => dhp-broker-application/src/test/java/eu/dnetlib/broker}/integration/ScrollTest.java (93%) rename apps/dhp-broker-application/src/test/java/eu/dnetlib/{lbs => broker}/tests/OpenaireQueriesTest.java (93%) rename apps/dhp-broker-public-application/src/main/java/eu/dnetlib/{lbs => broker}/BrokerConfiguration.java (94%) rename apps/dhp-broker-public-application/src/main/java/eu/dnetlib/{lbs => broker}/BrokerPublicApplication.java (91%) rename apps/{dhp-broker-application/src/main/java/eu/dnetlib/lbs => dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa}/controllers/ApiDocController.java (87%) create mode 100644 apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/NotificationMessage.java rename apps/dhp-broker-public-application/src/main/java/eu/dnetlib/{lbs/controllers/OpenaireBrokerController.java => broker/oa/controllers/OpenairePublicController.java} (50%) rename apps/dhp-broker-public-application/src/main/java/eu/dnetlib/{lbs => broker/oa}/controllers/ScrollPage.java (62%) rename apps/{dhp-broker-application/src/test/java/eu/dnetlib/lbs => dhp-broker-public-application/src/test/java/eu/dnetlib/broker/oa}/integration/ScrollTest.java (62%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/controllers/AbstractLbsController.java (95%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/elasticsearch/Event.java (98%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/elasticsearch/EventRepository.java (93%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/elasticsearch/EventStatsManager.java (95%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/elasticsearch/Notification.java (96%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/elasticsearch/NotificationRepository.java (94%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/properties/DatabaseProperties.java (90%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/properties/ElasticSearchProperties.java (97%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/subscriptions/ConditionOperator.java (59%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/subscriptions/ConditionParams.java (96%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/subscriptions/MapCondition.java (96%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/subscriptions/NotificationFrequency.java (62%) create mode 100644 libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationMode.java rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/subscriptions/Subscription.java (97%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/subscriptions/SubscriptionRepository.java (70%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/topics/TopicType.java (96%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/topics/TopicTypeRepository.java (77%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/utils/DateParser.java (93%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/utils/MapValue.java (98%) rename libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/{lbs => broker/common}/utils/MapValueType.java (77%) delete mode 100644 libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java rename libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/{lbs => broker/common}/clients/IndexClientTest.java (90%) rename libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/{lbs => broker/common}/subscriptions/ConditionTest.java (97%) rename libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/{lbs => broker/common}/utils/MapValueTest.java (96%) diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceApplication.java similarity index 92% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceApplication.java index 0940f2f5..435410cb 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplication.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceApplication.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs; +package eu.dnetlib.broker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java similarity index 94% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java index 192e4cc0..6a1e4a22 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/LiteratureBrokerServiceConfiguration.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs; +package eu.dnetlib.broker; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -16,9 +16,9 @@ import org.springframework.data.elasticsearch.repository.config.EnableElasticsea import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; import io.prometheus.client.exporter.MetricsServlet; import io.prometheus.client.hotspot.DefaultExports; import springfox.documentation.builders.RequestHandlerSelectors; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java similarity index 74% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java index 065a79ea..173b25f4 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/AjaxController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import java.util.ArrayList; import java.util.List; @@ -10,20 +10,21 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.lbs.controllers.objects.BufferStatus; -import eu.dnetlib.lbs.controllers.objects.CurrentStatus; -import eu.dnetlib.lbs.controllers.objects.DispatcherStatus; -import eu.dnetlib.lbs.controllers.objects.ThreadStatus; -import eu.dnetlib.lbs.controllers.objects.Tool; -import eu.dnetlib.lbs.elasticsearch.EventRepository; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.events.output.DispatcherManager; -import eu.dnetlib.lbs.events.output.NotificationDispatcher; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; -import eu.dnetlib.lbs.topics.TopicTypeRepository; -import eu.dnetlib.lbs.utils.LbsQueue; -import eu.dnetlib.lbs.utils.QueueManager; -import eu.dnetlib.lbs.utils.ThreadManager; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.elasticsearch.EventRepository; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.common.topics.TopicTypeRepository; +import eu.dnetlib.broker.controllers.objects.BufferStatus; +import eu.dnetlib.broker.controllers.objects.CurrentStatus; +import eu.dnetlib.broker.controllers.objects.DispatcherStatus; +import eu.dnetlib.broker.controllers.objects.ThreadStatus; +import eu.dnetlib.broker.controllers.objects.Tool; +import eu.dnetlib.broker.events.output.DispatcherManager; +import eu.dnetlib.broker.events.output.NotificationDispatcher; +import eu.dnetlib.broker.utils.LbsQueue; +import eu.dnetlib.broker.utils.QueueManager; +import eu.dnetlib.broker.utils.ThreadManager; @RestController @RequestMapping("/ajax") diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java similarity index 87% rename from apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java index f6437bbc..5799e40a 100644 --- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/EventsController.java similarity index 89% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/EventsController.java index 98fb5a27..e993fd9a 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/EventsController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/EventsController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import java.util.Date; import java.util.HashMap; @@ -23,13 +23,14 @@ import org.springframework.web.bind.annotation.RestController; import com.google.common.collect.Lists; -import eu.dnetlib.lbs.LiteratureBrokerServiceConfiguration; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.EventRepository; -import eu.dnetlib.lbs.elasticsearch.EventStatsManager; -import eu.dnetlib.lbs.elasticsearch.EventStatsManager.BrowseEntry; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.LiteratureBrokerServiceConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.EventRepository; +import eu.dnetlib.broker.common.elasticsearch.EventStatsManager; +import eu.dnetlib.broker.common.elasticsearch.EventStatsManager.BrowseEntry; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/NotificationsController.java similarity index 83% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/NotificationsController.java index efc03097..88df5107 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/NotificationsController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/NotificationsController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -9,9 +9,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.lbs.LiteratureBrokerServiceConfiguration; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.LiteratureBrokerServiceConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/StartMatchingController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/StartMatchingController.java similarity index 83% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/StartMatchingController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/StartMatchingController.java index 98bcc3f2..a3757f2e 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/StartMatchingController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/StartMatchingController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import java.util.Arrays; import java.util.List; @@ -11,10 +11,11 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.lbs.LiteratureBrokerServiceConfiguration; -import eu.dnetlib.lbs.matchers.SubscriptionEventMatcher; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.LiteratureBrokerServiceConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.matchers.SubscriptionEventMatcher; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/SubscriptionsController.java similarity index 90% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/SubscriptionsController.java index 0c8ab0aa..2eaaeace 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/SubscriptionsController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/SubscriptionsController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import java.util.Date; import java.util.HashMap; @@ -21,13 +21,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.lbs.LiteratureBrokerServiceConfiguration; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.subscriptions.MapCondition; -import eu.dnetlib.lbs.subscriptions.NotificationFrequency; -import eu.dnetlib.lbs.subscriptions.NotificationMode; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.LiteratureBrokerServiceConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.common.subscriptions.MapCondition; +import eu.dnetlib.broker.common.subscriptions.NotificationFrequency; +import eu.dnetlib.broker.common.subscriptions.NotificationMode; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/TopicsController.java similarity index 82% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/TopicsController.java index 330a9699..979ace07 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/TopicsController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/TopicsController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.controllers; import java.util.Arrays; import java.util.HashMap; @@ -18,9 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.lbs.LiteratureBrokerServiceConfiguration; -import eu.dnetlib.lbs.topics.TopicType; -import eu.dnetlib.lbs.topics.TopicTypeRepository; +import eu.dnetlib.broker.LiteratureBrokerServiceConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.topics.TopicType; +import eu.dnetlib.broker.common.topics.TopicTypeRepository; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,7 +34,7 @@ public class TopicsController extends AbstractLbsController { private TopicTypeRepository topicTypeRepo; private final Predicate verifyExpression = - Pattern.compile("^([a-zA-Z0-9._-]+|<[a-zA-Z0-9._-]+>)(\\/([a-zA-Z0-9._-]+|<[a-zA-Z0-9._-]+>))+$").asPredicate(); + Pattern.compile("^([a-zA-Z0-9._-]+|<[a-zA-Z0-9._-]+>)(\\/([a-zA-Z0-9._-]+|<[a-zA-Z0-9._-]+>))+$").asPredicate(); @ApiOperation("Return the list of topic types") @GetMapping("") @@ -44,9 +45,9 @@ public class TopicsController extends AbstractLbsController { @ApiOperation("Register a new topic type") @PostMapping("/add") public TopicType registerTopicType(@RequestParam final String name, - @RequestParam final String expression, - @RequestParam final String producerId, - @RequestParam final String mapKeys) { + @RequestParam final String expression, + @RequestParam final String producerId, + @RequestParam final String mapKeys) { if (StringUtils.isBlank(name)) { throw new IllegalArgumentException("name is empty"); } if (StringUtils.isBlank(expression)) { throw new IllegalArgumentException("expression is empty"); } diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/BufferStatus.java similarity index 94% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/BufferStatus.java index 4e46fbd0..d2249ef8 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/BufferStatus.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/BufferStatus.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers.objects; +package eu.dnetlib.broker.controllers.objects; public class BufferStatus implements Comparable { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/CurrentStatus.java similarity index 87% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/CurrentStatus.java index 709cbe08..d9a8f667 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/CurrentStatus.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/CurrentStatus.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers.objects; +package eu.dnetlib.broker.controllers.objects; import java.util.ArrayList; import java.util.HashMap; @@ -8,9 +8,9 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.properties.DatabaseProperties; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; -import eu.dnetlib.lbs.properties.EmailProperties; +import eu.dnetlib.broker.common.properties.DatabaseProperties; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; +import eu.dnetlib.broker.properties.EmailProperties; @Component public class CurrentStatus { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/DispatcherStatus.java similarity index 91% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/DispatcherStatus.java index 392ac6ed..2af18580 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/DispatcherStatus.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/DispatcherStatus.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers.objects; +package eu.dnetlib.broker.controllers.objects; public class DispatcherStatus implements Comparable { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/ThreadStatus.java similarity index 93% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/ThreadStatus.java index a5546421..5b3ea95e 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/ThreadStatus.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/ThreadStatus.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers.objects; +package eu.dnetlib.broker.controllers.objects; public class ThreadStatus implements Comparable { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/Tool.java similarity index 85% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/Tool.java index 6abda848..4716979a 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/objects/Tool.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/objects/Tool.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers.objects; +package eu.dnetlib.broker.controllers.objects; public class Tool { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/cron/ScheduledActions.java similarity index 83% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/cron/ScheduledActions.java index 71d2e7e2..561955c9 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/cron/ScheduledActions.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/cron/ScheduledActions.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.cron; +package eu.dnetlib.broker.cron; import java.util.Date; @@ -9,9 +9,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.elasticsearch.EventRepository; -import eu.dnetlib.lbs.matchers.SubscriptionEventMatcher; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.common.elasticsearch.EventRepository; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.matchers.SubscriptionEventMatcher; @Component @Profile("!openaire") diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/manager/EventManager.java similarity index 60% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/manager/EventManager.java index 41af73be..3d08fb61 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManager.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/manager/EventManager.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.events.manager; +package eu.dnetlib.broker.events.manager; import java.util.List; import java.util.stream.StreamSupport; @@ -6,15 +6,15 @@ import java.util.stream.StreamSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.EventRepository; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.events.output.DispatcherManager; -import eu.dnetlib.lbs.subscriptions.NotificationFrequency; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; -import eu.dnetlib.lbs.utils.LbsQueue; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.EventRepository; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.common.subscriptions.NotificationFrequency; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.events.output.DispatcherManager; +import eu.dnetlib.broker.utils.LbsQueue; public class EventManager implements Runnable { @@ -27,9 +27,9 @@ public class EventManager implements Runnable { private static final Log log = LogFactory.getLog(EventManager.class); public EventManager(final EventRepository eventRepository, final NotificationRepository notificationRepository, - final SubscriptionRepository subscriptionRepo, - final DispatcherManager dispatcherManager, - final LbsQueue queue) { + final SubscriptionRepository subscriptionRepo, + final DispatcherManager dispatcherManager, + final LbsQueue queue) { this.eventRepository = eventRepository; this.notificationRepository = notificationRepository; this.subscriptionRepo = subscriptionRepo; @@ -52,13 +52,13 @@ public class EventManager implements Runnable { list.stream().filter(Event::isInstantMessage).forEach(e -> { final Iterable iter = this.subscriptionRepo.findByTopic(e.getTopic()); StreamSupport.stream(iter.spliterator(), false) - .filter(s -> s.verifyEventConditions(e)) - .filter(s -> s.getFrequency() == NotificationFrequency.realtime) - .forEach(s -> { - final Notification n = new Notification(s, e); - this.notificationRepository.save(n); - this.dispatcherManager.dispatch(s, e); - }); + .filter(s -> s.verifyEventConditions(e)) + .filter(s -> s.getFrequency() == NotificationFrequency.realtime) + .forEach(s -> { + final Notification n = new Notification(s, e); + this.notificationRepository.save(n); + this.dispatcherManager.dispatch(s, e); + }); }); } } diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/manager/EventManagerFactory.java similarity index 61% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/manager/EventManagerFactory.java index 645fe837..ec95dfe2 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/manager/EventManagerFactory.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/manager/EventManagerFactory.java @@ -1,14 +1,14 @@ -package eu.dnetlib.lbs.events.manager; +package eu.dnetlib.broker.events.manager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.EventRepository; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.events.output.DispatcherManager; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; -import eu.dnetlib.lbs.utils.LbsQueue; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.EventRepository; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.events.output.DispatcherManager; +import eu.dnetlib.broker.utils.LbsQueue; @Component public class EventManagerFactory { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/AbstractNotificationDispatcher.java similarity index 88% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/AbstractNotificationDispatcher.java index 68bd7a82..edaab3fb 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/AbstractNotificationDispatcher.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/AbstractNotificationDispatcher.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.events.output; +package eu.dnetlib.broker.events.output; import java.util.concurrent.atomic.AtomicLong; @@ -10,11 +10,11 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.annotation.Autowired; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.utils.LbsQueue; -import eu.dnetlib.lbs.utils.QueueManager; -import eu.dnetlib.lbs.utils.ThreadManager; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.utils.LbsQueue; +import eu.dnetlib.broker.utils.QueueManager; +import eu.dnetlib.broker.utils.ThreadManager; public abstract class AbstractNotificationDispatcher implements NotificationDispatcher, BeanNameAware, Runnable { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/DispatcherManager.java similarity index 79% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/DispatcherManager.java index d0fc3adb..09b5ca0c 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/DispatcherManager.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/DispatcherManager.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.events.output; +package eu.dnetlib.broker.events.output; import java.util.ArrayList; import java.util.List; @@ -9,8 +9,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.subscriptions.Subscription; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.subscriptions.Subscription; @Component public class DispatcherManager { @@ -22,9 +22,9 @@ public class DispatcherManager { public void dispatch(final Subscription s, final Event... events) { final Optional dispatcher = this.dispatchers - .stream() - .filter(d -> d.getMode() == s.getMode()) - .findFirst(); + .stream() + .filter(d -> d.getMode() == s.getMode()) + .findFirst(); if (dispatcher.isPresent()) { dispatcher.get().sendNotification(s, events); diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/EmailDispatcher.java similarity index 92% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/EmailDispatcher.java index 281d663f..b73102f2 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/EmailDispatcher.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/EmailDispatcher.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.events.output; +package eu.dnetlib.broker.events.output; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -27,10 +27,10 @@ import org.springframework.stereotype.Component; import com.google.common.base.Splitter; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.properties.EmailProperties; -import eu.dnetlib.lbs.subscriptions.NotificationMode; -import eu.dnetlib.lbs.subscriptions.Subscription; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.subscriptions.NotificationMode; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.properties.EmailProperties; @Component public class EmailDispatcher extends AbstractNotificationDispatcher { @@ -117,7 +117,7 @@ public class EmailDispatcher extends AbstractNotificationDispatcher { return new Authenticator() { private final PasswordAuthentication authentication = - new PasswordAuthentication(props.getSmtpUser(), props.getSmtpPassword()); + new PasswordAuthentication(props.getSmtpUser(), props.getSmtpPassword()); @Override protected PasswordAuthentication getPasswordAuthentication() { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/MockDispatcher.java similarity index 82% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/MockDispatcher.java index d4dd86af..fb1c95a1 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/MockDispatcher.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/MockDispatcher.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.events.output; +package eu.dnetlib.broker.events.output; import java.io.StringWriter; @@ -7,9 +7,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.subscriptions.NotificationMode; -import eu.dnetlib.lbs.subscriptions.Subscription; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.subscriptions.NotificationMode; +import eu.dnetlib.broker.common.subscriptions.Subscription; @Component @Profile("dev") diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/NotificationDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/NotificationDispatcher.java new file mode 100644 index 00000000..f2ec37ea --- /dev/null +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/events/output/NotificationDispatcher.java @@ -0,0 +1,18 @@ +package eu.dnetlib.broker.events.output; + +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.subscriptions.NotificationMode; +import eu.dnetlib.broker.common.subscriptions.Subscription; + +public interface NotificationDispatcher { + + void sendNotification(Subscription subscription, Event... events); + + void resetCount(); + + String getDispatcherName(); + + long count(); + + NotificationMode getMode(); +} 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/broker/matchers/SubscriptionEventMatcher.java similarity index 87% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/matchers/SubscriptionEventMatcher.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/matchers/SubscriptionEventMatcher.java index f9fc76ee..138f4e49 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/broker/matchers/SubscriptionEventMatcher.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.matchers; +package eu.dnetlib.broker.matchers; import java.util.ArrayList; import java.util.Date; @@ -25,17 +25,17 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde import org.springframework.data.util.CloseableIterator; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.events.output.DispatcherManager; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; -import eu.dnetlib.lbs.subscriptions.MapCondition; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; -import eu.dnetlib.lbs.utils.LbsQueue; -import eu.dnetlib.lbs.utils.QueueManager; -import eu.dnetlib.lbs.utils.ThreadManager; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; +import eu.dnetlib.broker.common.subscriptions.MapCondition; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.events.output.DispatcherManager; +import eu.dnetlib.broker.utils.LbsQueue; +import eu.dnetlib.broker.utils.QueueManager; +import eu.dnetlib.broker.utils.ThreadManager; @Profile("!openaire") @Component diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/MetricInterceptor.java similarity index 53% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/MetricInterceptor.java index 0efcd4bd..e7830738 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/MetricInterceptor.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/MetricInterceptor.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.metrics; +package eu.dnetlib.broker.metrics; public interface MetricInterceptor { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/RequestCounterInterceptor.java similarity index 97% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/RequestCounterInterceptor.java index b0d52abc..98112fcc 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestCounterInterceptor.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/RequestCounterInterceptor.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.metrics; +package eu.dnetlib.broker.metrics; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/RequestTimingInterceptor.java similarity index 98% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/RequestTimingInterceptor.java index 066b010a..b9a1ca81 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/RequestTimingInterceptor.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/RequestTimingInterceptor.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.metrics; +package eu.dnetlib.broker.metrics; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/WebMvcConfig.java similarity index 95% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/WebMvcConfig.java index be7fa93f..bc699047 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/metrics/WebMvcConfig.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/metrics/WebMvcConfig.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.metrics; +package eu.dnetlib.broker.metrics; import java.util.List; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/AdvQueryObject.java similarity index 76% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/AdvQueryObject.java index eb3149b2..1fe66c1d 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/AdvQueryObject.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/AdvQueryObject.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.ArrayList; import java.util.Arrays; @@ -7,10 +7,10 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; -import eu.dnetlib.lbs.subscriptions.ConditionOperator; -import eu.dnetlib.lbs.subscriptions.ConditionParams; -import eu.dnetlib.lbs.subscriptions.MapCondition; -import eu.dnetlib.lbs.utils.MapValueType; +import eu.dnetlib.broker.common.subscriptions.ConditionOperator; +import eu.dnetlib.broker.common.subscriptions.ConditionParams; +import eu.dnetlib.broker.common.subscriptions.MapCondition; +import eu.dnetlib.broker.common.utils.MapValueType; public class AdvQueryObject { @@ -25,7 +25,7 @@ public class AdvQueryObject { public AdvQueryObject() {} public AdvQueryObject(final String datasource, final String topic, final List titles, final List subjects, final List authors, - final List dates, final Range trust) { + final List dates, final Range trust) { super(); this.datasource = datasource; this.topic = topic; @@ -96,32 +96,32 @@ public class AdvQueryObject { final List list = new ArrayList<>(); final List list_dates = this.dates.stream() - .filter(Range::isValid) - .map(d -> new ConditionParams(d.getMin(), d.getMax())) - .collect(Collectors.toList()); + .filter(Range::isValid) + .map(d -> new ConditionParams(d.getMin(), d.getMax())) + .collect(Collectors.toList()); final List list_titles = this.titles.stream() - .filter(StringUtils::isNotBlank) - .map(t -> new ConditionParams(t, null)) - .collect(Collectors.toList()); + .filter(StringUtils::isNotBlank) + .map(t -> new ConditionParams(t, null)) + .collect(Collectors.toList()); final List list_authors = this.authors.stream() - .filter(StringUtils::isNotBlank) - .map(aut -> new ConditionParams(aut, null)) - .collect(Collectors.toList()); + .filter(StringUtils::isNotBlank) + .map(aut -> new ConditionParams(aut, null)) + .collect(Collectors.toList()); final List list_subjects = this.subjects.stream() - .filter(StringUtils::isNotBlank) - .map(s -> new ConditionParams(s, null)) - .collect(Collectors.toList()); + .filter(StringUtils::isNotBlank) + .map(s -> new ConditionParams(s, null)) + .collect(Collectors.toList()); if (StringUtils.isNotBlank(this.datasource)) { list.add(new MapCondition("targetDatasourceName", MapValueType.STRING, ConditionOperator.EXACT, - Arrays.asList(new ConditionParams(this.datasource, null)))); + Arrays.asList(new ConditionParams(this.datasource, null)))); } if (this.trust.isValid()) { list.add(new MapCondition("trust", MapValueType.FLOAT, ConditionOperator.RANGE, - Arrays.asList(new ConditionParams(this.trust.getMin(), this.trust.getMax())))); + Arrays.asList(new ConditionParams(this.trust.getMin(), this.trust.getMax())))); } if (!list_dates.isEmpty()) { list.add(new MapCondition("targetDateofacceptance", MapValueType.DATE, ConditionOperator.RANGE, list_dates)); diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/BrowseEntry.java similarity index 92% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/BrowseEntry.java index c2ee24ad..aac164f6 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/BrowseEntry.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/BrowseEntry.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; public class BrowseEntry implements Comparable { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/ElasticSearchQueryUtils.java similarity index 96% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/ElasticSearchQueryUtils.java index ebccd578..d0b7ebd1 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ElasticSearchQueryUtils.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/ElasticSearchQueryUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.Date; import java.util.List; @@ -10,7 +10,7 @@ import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery; -import eu.dnetlib.lbs.utils.DateParser; +import eu.dnetlib.broker.common.utils.DateParser; public class ElasticSearchQueryUtils { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/EventsPage.java similarity index 96% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/EventsPage.java index 0fd9dc18..dd162dd1 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/EventsPage.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/EventsPage.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.List; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/HomeController.java similarity index 92% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/HomeController.java index dc2e414e..5b335f0c 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/HomeController.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/HomeController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; 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/broker/openaire/OpenaireBrokerController.java similarity index 95% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireBrokerController.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/OpenaireBrokerController.java index d6a6b5b0..fff19a27 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/broker/openaire/OpenaireBrokerController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.ArrayList; import java.util.Arrays; @@ -41,16 +41,16 @@ import org.springframework.web.bind.annotation.RestController; import com.google.gson.Gson; +import eu.dnetlib.broker.LiteratureBrokerServiceConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.elasticsearch.NotificationRepository; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; +import eu.dnetlib.broker.common.subscriptions.MapCondition; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; import eu.dnetlib.broker.objects.OaBrokerEventPayload; -import eu.dnetlib.lbs.LiteratureBrokerServiceConfiguration; -import eu.dnetlib.lbs.controllers.AbstractLbsController; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; -import eu.dnetlib.lbs.subscriptions.MapCondition; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/OpenaireSubscription.java similarity index 84% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/OpenaireSubscription.java index c4ce800f..941e2bc9 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/OpenaireSubscription.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/OpenaireSubscription.java @@ -1,13 +1,13 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.Date; import java.util.UUID; import org.apache.commons.lang3.StringUtils; -import eu.dnetlib.lbs.subscriptions.NotificationFrequency; -import eu.dnetlib.lbs.subscriptions.NotificationMode; -import eu.dnetlib.lbs.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.NotificationFrequency; +import eu.dnetlib.broker.common.subscriptions.NotificationMode; +import eu.dnetlib.broker.common.subscriptions.Subscription; public class OpenaireSubscription { @@ -19,7 +19,7 @@ public class OpenaireSubscription { public OpenaireSubscription() {} public OpenaireSubscription(final String subscriber, final NotificationFrequency frequency, final NotificationMode mode, - final AdvQueryObject query) { + final AdvQueryObject query) { this.subscriber = subscriber; this.frequency = frequency; this.mode = mode; @@ -65,7 +65,7 @@ public class OpenaireSubscription { final String subscriptionId = "sub-" + UUID.randomUUID(); return new Subscription(subscriptionId, this.subscriber, this.query.getTopic(), this.frequency, this.mode, null, new Date(), - this.query.asListOfConditions()); + this.query.asListOfConditions()); } } diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/Range.java similarity index 94% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/Range.java index 9a112323..c38d5d05 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/Range.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/Range.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import org.apache.commons.lang3.StringUtils; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/ScrollPage.java similarity index 95% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/ScrollPage.java index afe7f238..2cf24743 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/ScrollPage.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/ScrollPage.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.List; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/SimpleSubscriptionDesc.java similarity index 97% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/SimpleSubscriptionDesc.java index a297db88..04e08f14 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/openaire/SimpleSubscriptionDesc.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/openaire/SimpleSubscriptionDesc.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.openaire; +package eu.dnetlib.broker.openaire; import java.util.Date; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/properties/EmailProperties.java similarity index 97% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/properties/EmailProperties.java index b0adb505..1140559a 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/properties/EmailProperties.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/properties/EmailProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.properties; +package eu.dnetlib.broker.properties; import javax.validation.constraints.NotNull; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/EventVerifier.java similarity index 88% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/EventVerifier.java index e5bf19d9..ff0a0ccb 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/EventVerifier.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/EventVerifier.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.utils; import java.time.Duration; import java.time.Instant; @@ -12,9 +12,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.topics.TopicType; -import eu.dnetlib.lbs.topics.TopicTypeRepository; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.topics.TopicType; +import eu.dnetlib.broker.common.topics.TopicTypeRepository; public class EventVerifier implements Predicate { diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/LbsQueue.java similarity index 98% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/LbsQueue.java index b7af3969..f8b19a21 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/LbsQueue.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/LbsQueue.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.utils; import java.util.ArrayList; import java.util.List; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/QueueManager.java similarity index 96% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/QueueManager.java index feff3e35..bc2eef40 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/QueueManager.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/QueueManager.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.utils; import java.util.ArrayList; import java.util.List; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/ThreadManager.java similarity index 92% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java rename to apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/ThreadManager.java index 81e254ed..89f9954b 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/utils/ThreadManager.java +++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/utils/ThreadManager.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.utils; import java.util.ArrayList; import java.util.List; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java deleted file mode 100644 index 98fdd3eb..00000000 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/events/output/NotificationDispatcher.java +++ /dev/null @@ -1,18 +0,0 @@ -package eu.dnetlib.lbs.events.output; - -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.subscriptions.NotificationMode; -import eu.dnetlib.lbs.subscriptions.Subscription; - -public interface NotificationDispatcher { - - void sendNotification(Subscription subscription, Event... events); - - void resetCount(); - - String getDispatcherName(); - - long count(); - - NotificationMode getMode(); -} diff --git a/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/LiteratureBrokerServiceApplicationTests.java similarity index 92% rename from apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/LiteratureBrokerServiceApplicationTests.java index 6cd5f1b2..427e7ca6 100644 --- a/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/LiteratureBrokerServiceApplicationTests.java +++ b/apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/LiteratureBrokerServiceApplicationTests.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs; +package eu.dnetlib.broker; import org.junit.Ignore; import org.junit.Test; diff --git a/apps/dhp-broker-public-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/integration/ScrollTest.java similarity index 93% rename from apps/dhp-broker-public-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/integration/ScrollTest.java index 69d86a96..32d7931c 100644 --- a/apps/dhp-broker-public-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java +++ b/apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/integration/ScrollTest.java @@ -1,11 +1,11 @@ -package eu.dnetlib.lbs.integration; +package eu.dnetlib.broker.integration; import org.junit.Ignore; import org.junit.Test; import org.springframework.web.client.RestTemplate; import eu.dnetlib.broker.objects.OaBrokerEventPayload; -import eu.dnetlib.lbs.controllers.ScrollPage; +import eu.dnetlib.broker.openaire.ScrollPage; public class ScrollTest { diff --git a/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java b/apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/tests/OpenaireQueriesTest.java similarity index 93% rename from apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java rename to apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/tests/OpenaireQueriesTest.java index 134f2979..18982599 100644 --- a/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/tests/OpenaireQueriesTest.java +++ b/apps/dhp-broker-application/src/test/java/eu/dnetlib/broker/tests/OpenaireQueriesTest.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.tests; +package eu.dnetlib.broker.tests; import java.util.Arrays; @@ -22,12 +22,12 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import eu.dnetlib.broker.common.elasticsearch.Event; import eu.dnetlib.broker.objects.OaBrokerEventPayload; import eu.dnetlib.broker.objects.OaBrokerMainEntity; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.openaire.AdvQueryObject; -import eu.dnetlib.lbs.openaire.ElasticSearchQueryUtils; -import eu.dnetlib.lbs.openaire.Range; +import eu.dnetlib.broker.openaire.AdvQueryObject; +import eu.dnetlib.broker.openaire.ElasticSearchQueryUtils; +import eu.dnetlib.broker.openaire.Range; @Ignore @RunWith(SpringJUnit4ClassRunner.class) diff --git a/apps/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml b/apps/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml index 14c89f8c..9eb5c0ca 100644 --- a/apps/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml +++ b/apps/dhp-broker-application/src/test/resources/applicationContext-test-queries.xml @@ -10,7 +10,7 @@ cluster-name="elasticsearch_michele" /> diff --git a/apps/dhp-broker-application/src/test/resources/logback-test.xml b/apps/dhp-broker-application/src/test/resources/logback-test.xml index 0fd0d9c9..83cdb461 100644 --- a/apps/dhp-broker-application/src/test/resources/logback-test.xml +++ b/apps/dhp-broker-application/src/test/resources/logback-test.xml @@ -7,7 +7,7 @@ - + diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/BrokerConfiguration.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java similarity index 94% rename from apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/BrokerConfiguration.java rename to apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java index 8a200946..69711375 100644 --- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/BrokerConfiguration.java +++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs; +package eu.dnetlib.broker; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -16,9 +16,9 @@ import org.springframework.data.elasticsearch.repository.config.EnableElasticsea import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; import io.prometheus.client.exporter.MetricsServlet; import io.prometheus.client.hotspot.DefaultExports; import springfox.documentation.builders.RequestHandlerSelectors; diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/BrokerPublicApplication.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerPublicApplication.java similarity index 91% rename from apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/BrokerPublicApplication.java rename to apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerPublicApplication.java index 1fedca04..21742349 100644 --- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/BrokerPublicApplication.java +++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerPublicApplication.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs; +package eu.dnetlib.broker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java similarity index 87% rename from apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java rename to apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java index f6437bbc..e8095eee 100644 --- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/lbs/controllers/ApiDocController.java +++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.oa.controllers; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/NotificationMessage.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/NotificationMessage.java new file mode 100644 index 00000000..08357144 --- /dev/null +++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/NotificationMessage.java @@ -0,0 +1,40 @@ +package eu.dnetlib.broker.oa.controllers; + +import java.io.Serializable; + +import com.google.gson.Gson; + +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.objects.OaBrokerEventPayload; + +public class NotificationMessage implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 7302363775341307950L; + + private String topic; + + public static NotificationMessage fromNotification(final Notification n) { + final Gson gson = new Gson(); + + final OaBrokerEventPayload payload = gson.fromJson(n.getPayload(), OaBrokerEventPayload.class); + + final NotificationMessage res = new NotificationMessage(); + + res.setTopic(n.getTopic()); + + // TODO Auto-generated method stub + return res; + } + + public String getTopic() { + return topic; + } + + public void setTopic(final String topic) { + this.topic = topic; + } + +} diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/OpenaireBrokerController.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/OpenairePublicController.java similarity index 50% rename from apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/OpenaireBrokerController.java rename to apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/OpenairePublicController.java index 5313f5ee..8702b7eb 100644 --- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/OpenaireBrokerController.java +++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/OpenairePublicController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.oa.controllers; import java.util.ArrayList; import java.util.Arrays; @@ -6,8 +6,10 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.index.query.QueryBuilders; import org.springframework.beans.factory.annotation.Autowired; @@ -24,15 +26,12 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.Gson; - -import eu.dnetlib.broker.objects.OaBrokerEventPayload; -import eu.dnetlib.lbs.BrokerConfiguration; -import eu.dnetlib.lbs.elasticsearch.Notification; -import eu.dnetlib.lbs.elasticsearch.NotificationRepository; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.subscriptions.SubscriptionRepository; +import eu.dnetlib.broker.BrokerConfiguration; +import eu.dnetlib.broker.common.controllers.AbstractLbsController; +import eu.dnetlib.broker.common.elasticsearch.Notification; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.SubscriptionRepository; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -40,14 +39,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("/api/openaireBroker") @Api(tags = BrokerConfiguration.TAG_OPENAIRE) -public class OpenaireBrokerController extends AbstractLbsController { +public class OpenairePublicController extends AbstractLbsController { @Autowired private ElasticsearchOperations esOperations; - @Autowired - private NotificationRepository notificationRepository; - @Autowired private SubscriptionRepository subscriptionRepo; @@ -56,11 +52,11 @@ public class OpenaireBrokerController extends AbstractLbsController { private static final long SCROLL_TIMEOUT_IN_MILLIS = 5 * 60 * 1000; - private static final Log log = LogFactory.getLog(OpenaireBrokerController.class); + private static final Log log = LogFactory.getLog(OpenairePublicController.class); - @ApiOperation("Returns notifications using scrolls (first page)") - @GetMapping("/scroll/notifications/start/{subscrId}") - public ScrollPage prepareScrollNotifications(@PathVariable final String subscrId) { + @ApiOperation("Returns notifications by subscription using scrolls (first page)") + @GetMapping("/scroll/notifications/bySubscriptionId/{subscrId}") + public ScrollPage prepareScrollNotificationsBySubscrId(@PathVariable final String subscrId) { final Optional optSub = subscriptionRepo.findById(subscrId); @@ -77,50 +73,75 @@ public class OpenaireBrokerController extends AbstractLbsController { final SearchScrollHits scroll = esTemplate.searchScrollStart(SCROLL_TIMEOUT_IN_MILLIS, searchQuery, Notification.class, IndexCoordinates.of(props.getNotificationsIndexName())); if (scroll.hasSearchHits()) { - final List values = calculateEventPayloads(scroll); - return new ScrollPage(scroll.getScrollId(), values.isEmpty() || scroll.getScrollId() == null, values); + final List values = calculateNotificationMessages(scroll); + return new ScrollPage<>(scroll.getScrollId(), values.isEmpty() || scroll.getScrollId() == null, values); } else { esTemplate.searchScrollClear(Arrays.asList(scroll.getScrollId())); - return new ScrollPage(null, true, new ArrayList<>()); + return new ScrollPage<>(null, true, new ArrayList<>()); } } else { log.warn("Invalid subscription: " + subscrId); - return new ScrollPage(); + return new ScrollPage<>(); + } + } + + @ApiOperation("Returns notifications by opendorar Id (for example: 301) using scrolls (first page)") + @GetMapping("/scroll/notifications/byOpenDoarId/{opendoarId}") + public ScrollPage prepareScrollNotificationsByOpendoarId(@PathVariable final String opendoarId) { + + final ElasticsearchRestTemplate esTemplate = (ElasticsearchRestTemplate) esOperations; + + final String dsId = calculateDsIdFromOpenDoarId(opendoarId); + + final NativeSearchQuery searchQuery = new NativeSearchQueryBuilder() + .withQuery(QueryBuilders.nestedQuery("map", QueryBuilders.matchQuery("map.targetDatasourceId", dsId), ScoreMode.None)) + .withSearchType(SearchType.DEFAULT) + .withFields("payload") + .build(); + + final SearchScrollHits scroll = + esTemplate.searchScrollStart(SCROLL_TIMEOUT_IN_MILLIS, searchQuery, Notification.class, IndexCoordinates.of(props.getNotificationsIndexName())); + if (scroll.hasSearchHits()) { + final List values = calculateNotificationMessages(scroll); + return new ScrollPage<>(scroll.getScrollId(), values.isEmpty() || scroll.getScrollId() == null, values); + } else { + esTemplate.searchScrollClear(Arrays.asList(scroll.getScrollId())); + return new ScrollPage<>(null, true, new ArrayList<>()); } } + private String calculateDsIdFromOpenDoarId(final String opendoarId) { + return "10|opendoar____::" + DigestUtils.md5Hex(opendoarId); + } + @ApiOperation("Returns notifications using scrolls (other pages)") @GetMapping("/scroll/notifications/{scrollId}") - public ScrollPage scrollNotifications(@PathVariable final String scrollId) { + public ScrollPage scrollNotifications(@PathVariable final String scrollId) { final ElasticsearchRestTemplate esTemplate = (ElasticsearchRestTemplate) esOperations; final SearchScrollHits scroll = esTemplate.searchScrollContinue(scrollId, SCROLL_TIMEOUT_IN_MILLIS, Notification.class, IndexCoordinates.of(props.getNotificationsIndexName())); if (scroll.hasSearchHits()) { - final List values = calculateEventPayloads(scroll); - return new ScrollPage(scroll.getScrollId(), values.isEmpty() || scroll.getScrollId() == null, values); + final List values = calculateNotificationMessages(scroll); + return new ScrollPage<>(scroll.getScrollId(), values.isEmpty() || scroll.getScrollId() == null, values); } else { esTemplate.searchScrollClear(Arrays.asList(scroll.getScrollId())); - return new ScrollPage(null, true, new ArrayList<>()); + return new ScrollPage<>(null, true, new ArrayList<>()); } } - private List calculateEventPayloads(final SearchScrollHits scroll) { + private List calculateNotificationMessages(final SearchScrollHits scroll) { if (scroll.getSearchHits().size() > 0) { - final Gson gson = new Gson(); - return scroll.stream() .map(SearchHit::getContent) - .map(Notification::getPayload) - .map(s -> gson.fromJson(s, OaBrokerEventPayload.class)) + .map(NotificationMessage::fromNotification) .collect(Collectors.toList()); } else { return new ArrayList<>(); } - } } diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/ScrollPage.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ScrollPage.java similarity index 62% rename from apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/ScrollPage.java rename to apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ScrollPage.java index b52db02a..432741b3 100644 --- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/lbs/controllers/ScrollPage.java +++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ScrollPage.java @@ -1,20 +1,18 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.oa.controllers; import java.util.List; -import eu.dnetlib.broker.objects.OaBrokerEventPayload; - -public class ScrollPage { +public class ScrollPage { private String id; private boolean completed; - private List values; + private List values; public ScrollPage() {} - public ScrollPage(final String id, final boolean completed, final List values) { + public ScrollPage(final String id, final boolean completed, final List values) { this.id = id; this.completed = completed; this.values = values; @@ -36,11 +34,11 @@ public class ScrollPage { this.completed = completed; } - public List getValues() { + public List getValues() { return values; } - public void setValues(final List values) { + public void setValues(final List values) { this.values = values; } diff --git a/apps/dhp-broker-public-application/src/main/resources/application.properties b/apps/dhp-broker-public-application/src/main/resources/application.properties index 5e3ae35c..44cc1c39 100644 --- a/apps/dhp-broker-public-application/src/main/resources/application.properties +++ b/apps/dhp-broker-public-application/src/main/resources/application.properties @@ -23,7 +23,6 @@ lbs.database.url = ${spring.datasource.url} #lbs.elastic.clusterNodes = broker1-dev-dnet.d4science.org:9300 #lbs.elastic.homepage = http://broker1-dev-dnet.d4science.org:9200/_plugin/hq - # for localhost lbs.elastic.clusterNodes = 127.0.0.1:9200 lbs.elastic.homepage = http:// @@ -32,8 +31,6 @@ lbs.elastic.connectionTimeout = 30000 lbs.elastic.eventsIndexName = oa_events_beta lbs.elastic.notificationsIndexName = oa_notifications_beta - - lbs.queues.maxReturnedValues = 1000 lbs.task.deleteOldEvents.cron = 0 0 4 1/1 * ? diff --git a/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java b/apps/dhp-broker-public-application/src/test/java/eu/dnetlib/broker/oa/integration/ScrollTest.java similarity index 62% rename from apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java rename to apps/dhp-broker-public-application/src/test/java/eu/dnetlib/broker/oa/integration/ScrollTest.java index 8436482e..c0a7dd44 100644 --- a/apps/dhp-broker-application/src/test/java/eu/dnetlib/lbs/integration/ScrollTest.java +++ b/apps/dhp-broker-public-application/src/test/java/eu/dnetlib/broker/oa/integration/ScrollTest.java @@ -1,11 +1,11 @@ -package eu.dnetlib.lbs.integration; +package eu.dnetlib.broker.oa.integration; import org.junit.Ignore; import org.junit.Test; import org.springframework.web.client.RestTemplate; -import eu.dnetlib.broker.objects.OaBrokerEventPayload; -import eu.dnetlib.lbs.openaire.ScrollPage; +import eu.dnetlib.broker.oa.controllers.NotificationMessage; +import eu.dnetlib.broker.oa.controllers.ScrollPage; public class ScrollTest { @@ -15,19 +15,21 @@ public class ScrollTest { private static final String subscriptionId = "sub-c9767c84-3597-462b-803b-2d3e09de44c4"; + public class TestScrollPage extends ScrollPage {} + @Test @Ignore public void testScroll() { int total = 0; - ScrollPage page = getPage(baseUrl + "/api/openaireBroker/scroll/notifications/start/ " + subscriptionId); + TestScrollPage page = getPage(baseUrl + "/api/openaireBroker/scroll/notifications/start/ " + subscriptionId); total += page.getValues().size(); while (!page.isCompleted()) { page = getPage(baseUrl + "/api/openaireBroker/scroll/notifications/ " + page.getId()); total += page.getValues().size(); - for (final OaBrokerEventPayload p : page.getValues()) { + for (final NotificationMessage p : page.getValues()) { // DO SOMETHING } } @@ -35,9 +37,9 @@ public class ScrollTest { System.out.println("\nTOTAL: " + total); } - private ScrollPage getPage(final String url) { + private TestScrollPage getPage(final String url) { System.out.println(url); - final ScrollPage p = new RestTemplate().getForObject(url, ScrollPage.class); + final TestScrollPage p = new RestTemplate().getForObject(url, TestScrollPage.class); System.out.println("Page size: " + p.getValues().size()); return p; } diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/controllers/AbstractLbsController.java similarity index 95% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/controllers/AbstractLbsController.java index a853795e..4bf5abca 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/controllers/AbstractLbsController.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/controllers/AbstractLbsController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.controllers; +package eu.dnetlib.broker.common.controllers; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.http.HttpStatus; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/Event.java similarity index 98% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/Event.java index 120cc5c4..f7d4ad5c 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/Event.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/Event.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.elasticsearch; +package eu.dnetlib.broker.common.elasticsearch; import java.util.Map; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/EventRepository.java similarity index 93% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/EventRepository.java index 407d63f2..bf114d3a 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/EventRepository.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/EventRepository.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.elasticsearch; +package eu.dnetlib.broker.common.elasticsearch; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/EventStatsManager.java similarity index 95% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/EventStatsManager.java index d7681907..9ecb5856 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/EventStatsManager.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/EventStatsManager.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.elasticsearch; +package eu.dnetlib.broker.common.elasticsearch; import java.util.List; import java.util.stream.Collectors; @@ -18,7 +18,7 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.stereotype.Component; -import eu.dnetlib.lbs.properties.ElasticSearchProperties; +import eu.dnetlib.broker.common.properties.ElasticSearchProperties; @Component public class EventStatsManager { diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/Notification.java similarity index 96% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/Notification.java index f389f91e..fa99c941 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/Notification.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/Notification.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.elasticsearch; +package eu.dnetlib.broker.common.elasticsearch; import java.util.Date; import java.util.Map; @@ -9,7 +9,7 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -import eu.dnetlib.lbs.subscriptions.Subscription; +import eu.dnetlib.broker.common.subscriptions.Subscription; @Document(indexName = "#{elasticSearchProperties.notificationsIndexName}", shards = 48, replicas = 1, refreshInterval = "600s") public class Notification { diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/NotificationRepository.java similarity index 94% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/NotificationRepository.java index 38e2b847..648341fb 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/elasticsearch/NotificationRepository.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/elasticsearch/NotificationRepository.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.elasticsearch; +package eu.dnetlib.broker.common.elasticsearch; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/properties/DatabaseProperties.java similarity index 90% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/properties/DatabaseProperties.java index fd2f314a..e416b58b 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/properties/DatabaseProperties.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/properties/DatabaseProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.properties; +package eu.dnetlib.broker.common.properties; import javax.validation.constraints.NotNull; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/properties/ElasticSearchProperties.java similarity index 97% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/properties/ElasticSearchProperties.java index 900bb9af..dbc1f967 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/properties/ElasticSearchProperties.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/properties/ElasticSearchProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.properties; +package eu.dnetlib.broker.common.properties; import javax.validation.constraints.NotNull; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/ConditionOperator.java similarity index 59% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/ConditionOperator.java index a8391f6b..48dc4e24 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionOperator.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/ConditionOperator.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; public enum ConditionOperator { EXACT, MATCH_ANY, MATCH_ALL, RANGE diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/ConditionParams.java similarity index 96% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/ConditionParams.java index 81380673..57592729 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/ConditionParams.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/ConditionParams.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; import java.util.Arrays; import java.util.Date; @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import eu.dnetlib.lbs.utils.DateParser; +import eu.dnetlib.broker.common.utils.DateParser; public class ConditionParams { diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/MapCondition.java similarity index 96% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/MapCondition.java index f067ca2c..08125cc0 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/MapCondition.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/MapCondition.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; import java.util.ArrayList; import java.util.Date; @@ -14,9 +14,9 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.utils.DateParser; -import eu.dnetlib.lbs.utils.MapValueType; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.utils.DateParser; +import eu.dnetlib.broker.common.utils.MapValueType; public class MapCondition { diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationFrequency.java similarity index 62% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationFrequency.java index dabeeac1..edfcf9a5 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationFrequency.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationFrequency.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; public enum NotificationFrequency { never, realtime, daily, weekly, monthly diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationMode.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationMode.java new file mode 100644 index 00000000..b289cdf9 --- /dev/null +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/NotificationMode.java @@ -0,0 +1,5 @@ +package eu.dnetlib.broker.common.subscriptions; + +public enum NotificationMode { + MOCK, EMAIL +} diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/Subscription.java similarity index 97% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/Subscription.java index 18906cf6..1f8b27fe 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/Subscription.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/Subscription.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; import java.util.Date; import java.util.List; @@ -14,7 +14,7 @@ import javax.persistence.Table; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import eu.dnetlib.lbs.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.Event; @Entity(name = "subscriptions") @Table(name = "subscriptions") diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/SubscriptionRepository.java similarity index 70% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/SubscriptionRepository.java index c94d8596..42d61f85 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/SubscriptionRepository.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/subscriptions/SubscriptionRepository.java @@ -1,7 +1,9 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; +@Repository public interface SubscriptionRepository extends CrudRepository { Iterable findByTopic(String topic); diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/topics/TopicType.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/topics/TopicType.java similarity index 96% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/topics/TopicType.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/topics/TopicType.java index de9516c6..308b5fef 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/topics/TopicType.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/topics/TopicType.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.topics; +package eu.dnetlib.broker.common.topics; import java.util.Set; import java.util.function.Predicate; @@ -15,7 +15,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Sets; -import eu.dnetlib.lbs.elasticsearch.Event; +import eu.dnetlib.broker.common.elasticsearch.Event; @Entity(name = "topic_types") @Table(name = "topic_types") diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/topics/TopicTypeRepository.java similarity index 77% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/topics/TopicTypeRepository.java index 436d69c3..d9f86949 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/topics/TopicTypeRepository.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/topics/TopicTypeRepository.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.topics; +package eu.dnetlib.broker.common.topics; import org.springframework.data.repository.CrudRepository; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/DateParser.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/DateParser.java similarity index 93% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/DateParser.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/DateParser.java index 6da9340d..3f6cd2e5 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/DateParser.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/DateParser.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.common.utils; import java.text.ParseException; import java.util.Date; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/MapValue.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/MapValue.java similarity index 98% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/MapValue.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/MapValue.java index f3d30605..8dd116ec 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/MapValue.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/MapValue.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.common.utils; import java.util.List; import java.util.stream.Collectors; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/MapValueType.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/MapValueType.java similarity index 77% rename from libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/MapValueType.java rename to libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/MapValueType.java index 47f262c2..2cb412f5 100644 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/utils/MapValueType.java +++ b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/broker/common/utils/MapValueType.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.common.utils; public enum MapValueType { STRING, INTEGER, FLOAT, DATE, BOOLEAN, LIST_STRING, LIST_INTEGER, LIST_FLOAT, LIST_DATE, LIST_BOOLEAN; diff --git a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java b/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java deleted file mode 100644 index 7f80ead2..00000000 --- a/libs/dnet-broker-apps-common/src/main/java/eu/dnetlib/lbs/subscriptions/NotificationMode.java +++ /dev/null @@ -1,5 +0,0 @@ -package eu.dnetlib.lbs.subscriptions; - -public enum NotificationMode { - MOCK, EMAIL -} diff --git a/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java b/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/clients/IndexClientTest.java similarity index 90% rename from libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java rename to libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/clients/IndexClientTest.java index aba2536d..20e82791 100644 --- a/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/clients/IndexClientTest.java +++ b/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/clients/IndexClientTest.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.clients; +package eu.dnetlib.broker.common.clients; import java.util.Date; import java.util.Objects; @@ -19,12 +19,12 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.util.CloseableIterator; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.subscriptions.MapCondition; -import eu.dnetlib.lbs.subscriptions.NotificationFrequency; -import eu.dnetlib.lbs.subscriptions.NotificationMode; -import eu.dnetlib.lbs.subscriptions.Subscription; -import eu.dnetlib.lbs.utils.DateParser; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.subscriptions.MapCondition; +import eu.dnetlib.broker.common.subscriptions.NotificationFrequency; +import eu.dnetlib.broker.common.subscriptions.NotificationMode; +import eu.dnetlib.broker.common.subscriptions.Subscription; +import eu.dnetlib.broker.common.utils.DateParser; @Ignore // @RunWith(SpringJUnit4ClassRunner.class) diff --git a/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java b/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/subscriptions/ConditionTest.java similarity index 97% rename from libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java rename to libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/subscriptions/ConditionTest.java index e94ac823..4939ae6f 100644 --- a/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/subscriptions/ConditionTest.java +++ b/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/subscriptions/ConditionTest.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.subscriptions; +package eu.dnetlib.broker.common.subscriptions; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -14,9 +14,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import eu.dnetlib.lbs.elasticsearch.Event; -import eu.dnetlib.lbs.utils.DateParser; -import eu.dnetlib.lbs.utils.MapValueType; +import eu.dnetlib.broker.common.elasticsearch.Event; +import eu.dnetlib.broker.common.utils.DateParser; +import eu.dnetlib.broker.common.utils.MapValueType; @RunWith(MockitoJUnitRunner.class) public class ConditionTest { diff --git a/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/utils/MapValueTest.java b/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/utils/MapValueTest.java similarity index 96% rename from libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/utils/MapValueTest.java rename to libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/utils/MapValueTest.java index 9e4ee52e..52b86800 100644 --- a/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/lbs/utils/MapValueTest.java +++ b/libs/dnet-broker-apps-common/src/test/java/eu/dnetlib/broker/common/utils/MapValueTest.java @@ -1,4 +1,4 @@ -package eu.dnetlib.lbs.utils; +package eu.dnetlib.broker.common.utils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,8 +13,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import eu.dnetlib.lbs.utils.MapValue; -import eu.dnetlib.lbs.utils.MapValueType; +import eu.dnetlib.broker.common.utils.MapValue; +import eu.dnetlib.broker.common.utils.MapValueType; public class MapValueTest { diff --git a/libs/dnet-broker-apps-common/src/test/resources/applicationContext-test-queries.xml b/libs/dnet-broker-apps-common/src/test/resources/applicationContext-test-queries.xml index 14c89f8c..641af3a7 100644 --- a/libs/dnet-broker-apps-common/src/test/resources/applicationContext-test-queries.xml +++ b/libs/dnet-broker-apps-common/src/test/resources/applicationContext-test-queries.xml @@ -10,7 +10,7 @@ cluster-name="elasticsearch_michele" /> diff --git a/libs/dnet-broker-apps-common/src/test/resources/logback-test.xml b/libs/dnet-broker-apps-common/src/test/resources/logback-test.xml index 0fd0d9c9..bbb7b9c9 100644 --- a/libs/dnet-broker-apps-common/src/test/resources/logback-test.xml +++ b/libs/dnet-broker-apps-common/src/test/resources/logback-test.xml @@ -7,7 +7,7 @@ - +