artin/nzbhydra2
1
0
Fork 0
mirror of https://github.com/theotherp/nzbhydra2.git synced 2026-02-06 11:17:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fix notification sending test on arch-nzbhydra2.

Browse Source 
See #806
This commit is contained in:
TheOtherP 2022-11-30 18:41:44 +01:00
parent 1dae3b8874
commit 04fcafd356
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/org/nzbhydra/notifications/NotificationsWeb.java
View File

@ -16,9 +16,9 @@
package org.nzbhydra.notifications;
import com.google.common.collect.Sets;
import org.nzbhydra.ShutdownEvent;
import org.nzbhydra.logging.LoggingMarkers;
import org.reflections.Reflections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -49,6 +49,15 @@ public class NotificationsWeb {
private static final Logger logger = LoggerFactory.getLogger(NotificationsWeb.class);
private static final int INTERVAL = 1000;
private static final String TOPIC = "/topic/notifications";
private static final Set<NotificationEvent> NOTIFICATION_EVENTS = Sets.newHashSet(
new DownloadNotificationEvent(),
new IndexerDisabledNotificationEvent(),
new UpdateNotificationEvent(),
new DownloadCompletionNotificationEvent(),
new IndexerVipExpiryNotificationEvent(),
new IndexerReenabledNotificationEvent(),
new AuthFailureNotificationEvent()
);
@Autowired
private NotificationRepository notificationRepository;
@ -88,19 +97,10 @@ public class NotificationsWeb {
public void testNotification(@PathVariable("eventType") String eventType) {
final NotificationEventType notificationEventType = NotificationEventType.valueOf(eventType);
Reflections reflections = new Reflections("org.nzbhydra.notifications");
Set<Class<? extends NotificationEvent>> notificationEventClasses = reflections.getSubTypesOf(NotificationEvent.class);
final Optional<? extends NotificationEvent> notificationEvent = notificationEventClasses.stream()
.map(x -> {
try {
return x.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
logger.error("Unable to instantiate event for {}", eventType, e);
return null;
}
})
.filter(x -> x != null && x.getEventType() == notificationEventType)
.findFirst();
final Optional<? extends NotificationEvent> notificationEvent = NOTIFICATION_EVENTS
.stream()
.filter(x -> x != null && x.getEventType() == notificationEventType)
.findFirst();
if (!notificationEvent.isPresent()) {
throw new RuntimeException("Unable to create test notification for event type " + eventType);
}

4
core/src/main/resources/changelog.json
View File

@ -9,6 +9,10 @@
{
"type": "fix",
"text": "Fix typo in apprise notification handler."
},
{
"type": "fix",
"text": "Hopefully fix notification sending test on arch-nzbhydra2. See #806"
}
],
"final": false