diff --git a/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJob.java b/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJob.java
index 21c6c64a6..6b8d60f40 100644
--- a/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJob.java
+++ b/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJob.java
@@ -45,8 +45,9 @@ public class GenerateNotificationsJob {
 
 		final ArgumentApplicationParser parser = new ArgumentApplicationParser(
 			IOUtils
-				.toString(GenerateNotificationsJob.class
-					.getResourceAsStream("/eu/dnetlib/dhp/broker/oa/generate_notifications.json")));
+				.toString(
+					GenerateNotificationsJob.class
+						.getResourceAsStream("/eu/dnetlib/dhp/broker/oa/generate_notifications.json")));
 		parser.parseArgument(args);
 
 		final SparkConf conf = new SparkConf();
@@ -79,7 +80,10 @@ public class GenerateNotificationsJob {
 			final Encoder<Notification> nEncoder = Encoders.bean(Notification.class);
 			final Dataset<Notification> notifications = ClusterUtils
 				.readPath(spark, eventsPath, Event.class)
-				.map((MapFunction<Event, NotificationGroup>) e -> generateNotifications(e, subscriptions, conditionsMap, startTime), ngEncoder)
+				.map(
+					(MapFunction<Event, NotificationGroup>) e -> generateNotifications(
+						e, subscriptions, conditionsMap, startTime),
+					ngEncoder)
 				.flatMap((FlatMapFunction<NotificationGroup, Notification>) g -> g.getData().iterator(), nEncoder);
 
 			ClusterUtils.save(notifications, notificationsPath, Notification.class, total);
@@ -99,7 +103,8 @@ public class GenerateNotificationsJob {
 		final long date) {
 		final List<Notification> list = subscriptions
 			.stream()
-			.filter(s -> StringUtils.isBlank(s.getTopic()) || s.getTopic().equals("*") || s.getTopic().equals(e.getTopic()))
+			.filter(
+				s -> StringUtils.isBlank(s.getTopic()) || s.getTopic().equals("*") || s.getTopic().equals(e.getTopic()))
 			.filter(s -> verifyConditions(e.getMap(), conditionsMap.get(s.getSubscriptionId())))
 			.map(s -> generateNotification(s, e, date))
 			.collect(Collectors.toList());
@@ -130,15 +135,18 @@ public class GenerateNotificationsJob {
 
 		if (conditions.containsKey("trust")
 			&& !SubscriptionUtils
-				.verifyFloatRange(map.getTrust(), conditions.get("trust").get(0).getValue(), conditions.get("trust").get(0).getOtherValue())) {
+				.verifyFloatRange(
+					map.getTrust(), conditions.get("trust").get(0).getValue(),
+					conditions.get("trust").get(0).getOtherValue())) {
 			return false;
 		}
 
 		if (conditions.containsKey("targetDateofacceptance") && !conditions
 			.get("targetDateofacceptance")
 			.stream()
-			.anyMatch(c -> SubscriptionUtils
-				.verifyDateRange(map.getTargetDateofacceptance(), c.getValue(), c.getOtherValue()))) {
+			.anyMatch(
+				c -> SubscriptionUtils
+					.verifyDateRange(map.getTargetDateofacceptance(), c.getValue(), c.getOtherValue()))) {
 			return false;
 		}
 
diff --git a/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJob.java b/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJob.java
index 55e82446f..a2aa30092 100644
--- a/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJob.java
+++ b/dhp-workflows/dhp-broker-events/src/main/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJob.java
@@ -36,8 +36,9 @@ public class IndexNotificationsJob {
 
 		final ArgumentApplicationParser parser = new ArgumentApplicationParser(
 			IOUtils
-				.toString(IndexNotificationsJob.class
-					.getResourceAsStream("/eu/dnetlib/dhp/broker/oa/index_notifications.json")));
+				.toString(
+					IndexNotificationsJob.class
+						.getResourceAsStream("/eu/dnetlib/dhp/broker/oa/index_notifications.json")));
 		parser.parseArgument(args);
 
 		final SparkConf conf = new SparkConf();
diff --git a/dhp-workflows/dhp-broker-events/src/test/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJobTest.java b/dhp-workflows/dhp-broker-events/src/test/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJobTest.java
similarity index 81%
rename from dhp-workflows/dhp-broker-events/src/test/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJobTest.java
rename to dhp-workflows/dhp-broker-events/src/test/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJobTest.java
index 8ecb3061b..233963e2f 100644
--- a/dhp-workflows/dhp-broker-events/src/test/java/eu/dnetlib/dhp/broker/oa/IndexNotificationsJobTest.java
+++ b/dhp-workflows/dhp-broker-events/src/test/java/eu/dnetlib/dhp/broker/oa/GenerateNotificationsJobTest.java
@@ -16,7 +16,7 @@ import eu.dnetlib.dhp.broker.model.MappedFields;
 import eu.dnetlib.dhp.broker.model.Subscription;
 import eu.dnetlib.dhp.broker.oa.util.NotificationGroup;
 
-class IndexNotificationsJobTest {
+class GenerateNotificationsJobTest {
 
 	private List<Subscription> subscriptions;
 
@@ -32,7 +32,7 @@ class IndexNotificationsJobTest {
 			.setConditions(
 				"[{\"field\":\"targetDatasourceName\",\"fieldType\":\"STRING\",\"operator\":\"EXACT\",\"listParams\":[{\"value\":\"reposiTUm\"}]},{\"field\":\"trust\",\"fieldType\":\"FLOAT\",\"operator\":\"RANGE\",\"listParams\":[{\"value\":\"0\",\"otherValue\":\"1\"}]}]");
 		subscriptions = Arrays.asList(s);
-		conditionsMap = IndexNotificationsJob.prepareConditionsMap(subscriptions);
+		conditionsMap = GenerateNotificationsJob.prepareConditionsMap(subscriptions);
 	}
 
 	@Test
@@ -40,7 +40,7 @@ class IndexNotificationsJobTest {
 		final Event event = new Event();
 		event.setTopic("ENRICH/MISSING/PROJECT");
 
-		final NotificationGroup res = IndexNotificationsJob
+		final NotificationGroup res = GenerateNotificationsJob
 			.generateNotifications(event, subscriptions, conditionsMap, 0);
 		assertEquals(0, res.getData().size());
 	}
@@ -53,7 +53,7 @@ class IndexNotificationsJobTest {
 		event.getMap().setTargetDatasourceName("reposiTUm");
 		event.getMap().setTrust(0.8f);
 
-		final NotificationGroup res = IndexNotificationsJob
+		final NotificationGroup res = GenerateNotificationsJob
 			.generateNotifications(event, subscriptions, conditionsMap, 0);
 		assertEquals(1, res.getData().size());
 	}
@@ -66,7 +66,7 @@ class IndexNotificationsJobTest {
 		event.getMap().setTargetDatasourceName("Puma");
 		event.getMap().setTrust(0.8f);
 
-		final NotificationGroup res = IndexNotificationsJob
+		final NotificationGroup res = GenerateNotificationsJob
 			.generateNotifications(event, subscriptions, conditionsMap, 0);
 		assertEquals(0, res.getData().size());
 	}
@@ -77,11 +77,11 @@ class IndexNotificationsJobTest {
 		event.setTopic("ENRICH/MISSING/PROJECT");
 
 		// warm up
-		IndexNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
+		GenerateNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
 
 		final long start = System.currentTimeMillis();
 		for (int i = 0; i < N_TIMES; i++) {
-			IndexNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
+			GenerateNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
 		}
 		final long end = System.currentTimeMillis();
 		System.out
@@ -98,11 +98,11 @@ class IndexNotificationsJobTest {
 		event.getMap().setTrust(0.8f);
 
 		// warm up
-		IndexNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
+		GenerateNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
 
 		final long start = System.currentTimeMillis();
 		for (int i = 0; i < N_TIMES; i++) {
-			IndexNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
+			GenerateNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
 		}
 		final long end = System.currentTimeMillis();
 		System.out
@@ -118,11 +118,11 @@ class IndexNotificationsJobTest {
 		event.getMap().setTrust(0.8f);
 
 		// warm up
-		IndexNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
+		GenerateNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
 
 		final long start = System.currentTimeMillis();
 		for (int i = 0; i < N_TIMES; i++) {
-			IndexNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
+			GenerateNotificationsJob.generateNotifications(event, subscriptions, conditionsMap, 0);
 		}
 		final long end = System.currentTimeMillis();
 		System.out