add event http service

event-api/src/main/java/org/xbib/event/DefaultEvent.java

@@ -1,33 +0,0 @@
-package org.xbib.event;
-
-import java.util.Map;
-
-public class DefaultEvent implements Event {
-
-    private String key;
-
-    private Map<String, Object> map;
-
-    public DefaultEvent() {
-    }
-
-    @Override
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String getKey() {
-        return key;
-    }
-
-    @Override
-    public void setMap(Map<String, Object> map) {
-        this.map = map;
-    }
-
-    @Override
-    public Map<String, Object> getMap() {
-        return map;
-    }
-}

event-api/src/main/java/org/xbib/event/Event.java

@@ -4,9 +4,9 @@ import java.util.Map;
 
 public interface Event {
 
-    void setKey(String key);
+    void setType(String type);
 
-    String getKey();
+    String getType();
 
     void setMap(Map<String, Object> map);
 

event-common/build.gradle

@@ -6,5 +6,4 @@ dependencies {
     implementation libs.time
     implementation libs.datastructures.common
     implementation libs.datastructures.json.tiny
-    implementation libs.netty.handler
 }

event-common/src/main/java/module-info.java

@@ -1,3 +1,5 @@
+import org.xbib.event.common.EventManagerService;
+
 module org.xbib.event.common {
     exports org.xbib.event.bus;
     exports org.xbib.event.clock;
@@ -6,9 +8,9 @@ module org.xbib.event.common {
     exports org.xbib.event.log;
     exports org.xbib.event.path;
     exports org.xbib.event.persistence;
-    exports org.xbib.event.syslog;
     exports org.xbib.event.timer;
     exports org.xbib.event.wal;
+    uses EventManagerService;
     requires org.xbib.event.api;
     requires org.xbib.settings.api;
     requires org.xbib.settings.datastructures.json;
@@ -16,10 +18,5 @@ module org.xbib.event.common {
     requires org.xbib.time;
     requires org.xbib.datastructures.common;
     requires org.xbib.datastructures.json.tiny;
-    requires io.netty.buffer;
-    requires io.netty.common;
-    requires io.netty.transport;
-    requires io.netty.handler;
-    requires io.netty.codec;
     requires java.logging;
 }

event-common/src/main/java/org/xbib/event/clock/ClockEventImpl.java

@@ -1,14 +1,14 @@
 package org.xbib.event.clock;
 
-import org.xbib.event.DefaultEvent;
+import org.xbib.event.common.EventImpl;
 
 import java.time.Instant;
 
-public class DefaultClockEvent extends DefaultEvent implements ClockEvent {
+public class ClockEventImpl extends EventImpl implements ClockEvent {
 
     private Instant instant;
 
-    public DefaultClockEvent() {
+    public ClockEventImpl() {
     }
 
     @Override

event-common/src/main/java/org/xbib/event/clock/ClockEventManagerService.java

@@ -1,7 +1,7 @@
 package org.xbib.event.clock;
 
-import org.xbib.event.bus.AsyncEventBus;
 import org.xbib.event.bus.EventBus;
+import org.xbib.event.common.EventManagerService;
 import org.xbib.settings.Settings;
 import org.xbib.time.schedule.CronExpression;
 import org.xbib.time.schedule.CronSchedule;
@@ -11,27 +11,25 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class ClockEventManager implements Closeable {
+public class ClockEventManagerService implements EventManagerService, Closeable {
 
-    private static final Logger logger = Logger.getLogger(ClockEventManager.class.getName());
+    private static final Logger logger = Logger.getLogger(ClockEventManagerService.class.getName());
 
-    private final CronSchedule<Integer> cronSchedule;
+    private CronSchedule<Integer> cronSchedule;
 
-    private final List<String> suspended;
+    private List<String> suspended;
 
-    public ClockEventManager(Settings settings) {
-        this(settings, new AsyncEventBus(Executors.newSingleThreadExecutor()), ClockEventManager.class.getClassLoader());
+    public ClockEventManagerService() {
     }
 
-    public ClockEventManager(Settings settings,
-                             EventBus eventBus,
-                             ClassLoader classLoader) {
+    public ClockEventManagerService init(Settings settings, EventBus eventBus, ClassLoader classLoader, ExecutorService executorService) {
         this.suspended = new ArrayList<>();
         ThreadFactory threadFactory = new ThreadFactory() {
             int n = 1;
@@ -40,9 +38,9 @@ public class ClockEventManager implements Closeable {
                 return new Thread(r, "clock-event-manager-" + (n++));
             }
         };
-        ScheduledExecutorService executorService =
+        ScheduledExecutorService scheduledExecutorService =
                 Executors.newScheduledThreadPool(settings.getAsInt("pool.size", 2), threadFactory);
-        this.cronSchedule = new CronSchedule<>(executorService);
+        this.cronSchedule = new CronSchedule<>(scheduledExecutorService);
         for (Map.Entry<String, Settings> clockEventService : settings.getGroups("event.clock").entrySet()) {
             String name = clockEventService.getKey();
             Settings entrySettings = clockEventService.getValue();
@@ -69,6 +67,7 @@ public class ClockEventManager implements Closeable {
         }
         logger.log(Level.INFO, "entries = " + cronSchedule.getEntries());
         cronSchedule.start();
+        return this;
     }
 
     public List<String> getSuspended() {

event-common/src/main/java/org/xbib/event/clock/ClockEventService.java

@@ -10,7 +10,7 @@ public class ClockEventService implements Callable<Integer> {
 
     private static final Logger logger = Logger.getLogger(ClockEventService.class.getName());
 
-    private final ClockEventManager manager;
+    private final ClockEventManagerService manager;
 
     private final EventBus eventBus;
 
@@ -18,7 +18,7 @@ public class ClockEventService implements Callable<Integer> {
 
     private final Class<? extends ClockEvent> eventClass;
 
-    public ClockEventService(ClockEventManager manager,
+    public ClockEventService(ClockEventManagerService manager,
                              EventBus eventBus,
                              String name,
                              Class<? extends ClockEvent> eventClass) {
@@ -29,7 +29,7 @@ public class ClockEventService implements Callable<Integer> {
     }
 
     @Override
-    public Integer call() throws Exception {
+    public Integer call() {
         try {
             if (manager.getSuspended().contains(name)) {
                 logger.log(Level.FINE, "clock event " + name + " suspended");

event-common/src/main/java/org/xbib/event/common/EventImpl.java

@@ -0,0 +1,53 @@
+package org.xbib.event.common;
+
+import org.xbib.datastructures.json.tiny.Json;
+import org.xbib.event.Event;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class EventImpl implements Event {
+
+    private String type;
+
+    private Map<String, Object> map;
+
+    public EventImpl() {
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setMap(Map<String, Object> map) {
+        this.map = map;
+    }
+
+    @Override
+    public Map<String, Object> getMap() {
+        return map;
+    }
+
+    public static EventImpl fromJson(String json) {
+        Map<String, Object> map = Json.toMap(json);
+        EventImpl event = new EventImpl();
+        event.setType((String) map.get("type"));
+        event.setMap(map);
+        return event;
+    }
+
+    public String toJson() throws IOException {
+        return Json.toString(map);
+    }
+
+    public boolean isNullEvent() {
+        return type == null;
+    }
+}

event-common/src/main/java/org/xbib/event/common/EventManager.java

@@ -1,22 +1,23 @@
 package org.xbib.event.common;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.ServiceLoader;
 
+import org.xbib.event.Event;
 import org.xbib.event.EventConsumer;
 import org.xbib.event.bus.AsyncEventBus;
 import org.xbib.event.bus.SubscriberExceptionContext;
 import org.xbib.event.bus.SubscriberExceptionHandler;
-import org.xbib.event.clock.ClockEventManager;
-import org.xbib.event.generic.GenericEventManager;
-import org.xbib.event.path.FileFollowEventManager;
-import org.xbib.event.path.PathEventManager;
-import org.xbib.event.syslog.SyslogEventManager;
-import org.xbib.event.timer.TimerEventManager;
+import org.xbib.event.clock.ClockEventManagerService;
+import org.xbib.event.generic.GenericEventManagerService;
+import org.xbib.event.path.FileFollowEventManagerService;
+import org.xbib.event.path.PathEventManagerService;
+import org.xbib.event.timer.TimerEventManagerService;
 import org.xbib.settings.Settings;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -31,54 +32,57 @@ public final class EventManager {
 
     private final Builder builder;
 
-    private final GenericEventManager genericEventManager;
-
-    private final ClockEventManager clockEventManager;
-
-    private final TimerEventManager timerEventManager;
-
-    private final FileFollowEventManager fileFollowEventManager;
-
-    private final PathEventManager pathEventManager;
-
-    private final SyslogEventManager syslogEventManager;
+    private final Map<Class<? extends EventManagerService>, EventManagerService> services;
 
     private EventManager(Builder builder) {
         this.builder = builder;
-        this.genericEventManager = new GenericEventManager(builder.eventBus);
-        this.clockEventManager = new ClockEventManager(builder.settings, builder.eventBus, builder.classLoader);
-        this.timerEventManager = new TimerEventManager(builder.settings, builder.eventBus, builder.classLoader, ZoneId.systemDefault());
-        this.fileFollowEventManager = new FileFollowEventManager(builder.settings, builder.eventBus, builder.executorService, builder.classLoader);
-        this.pathEventManager = new PathEventManager(builder.settings, builder.eventBus, builder.executorService, builder.classLoader);
-        this.syslogEventManager = new SyslogEventManager(builder.settings, builder.eventBus);
+        this.services = new HashMap<>();
+        services.put(GenericEventManagerService.class, new GenericEventManagerService()
+                .init(builder.settings, builder.eventBus, builder.classLoader, builder.executorService));
+        services.put(ClockEventManagerService.class, new ClockEventManagerService()
+                .init(builder.settings, builder.eventBus, builder.classLoader, builder.executorService));
+        services.put(TimerEventManagerService.class, new TimerEventManagerService()
+                .init(builder.settings, builder.eventBus, builder.classLoader, builder.executorService));
+        services.put(FileFollowEventManagerService.class, new FileFollowEventManagerService()
+                .init(builder.settings, builder.eventBus, builder.classLoader, builder.executorService));
+        services.put(PathEventManagerService.class, new PathEventManagerService()
+                .init(builder.settings, builder.eventBus, builder.classLoader, builder.executorService));
+        for (EventManagerService service : ServiceLoader.load(EventManagerService.class)) {
+            services.put(service.getClass(), service.init(builder.settings, builder.eventBus, builder.classLoader, builder.executorService));
+        }
+        logger.log(Level.INFO, "installed event service managers = " + services.keySet());
     }
 
     public static Builder builder(Settings settings) {
         return new Builder(settings);
     }
 
-    public GenericEventManager getGenericEventManager() {
-        return genericEventManager;
+    public void submit(Event event) {
+        getGenericEventManagerService().post(event);
     }
 
-    public ClockEventManager getClockEventManager() {
-        return clockEventManager;
+    public EventManagerService getEventManagerService(Class<? extends EventManagerService> cl) {
+        return services.get(cl);
     }
 
-    public TimerEventManager getTimerEventManager() {
-        return timerEventManager;
+    public GenericEventManagerService getGenericEventManagerService() {
+        return (GenericEventManagerService) services.get(GenericEventManagerService.class);
     }
 
-    public FileFollowEventManager getFileFollowEventManager() {
-        return fileFollowEventManager;
+    public ClockEventManagerService getClockEventManagerService() {
+        return (ClockEventManagerService) services.get(ClockEventManagerService.class);
     }
 
-    public PathEventManager getPathEventManager() {
-        return pathEventManager;
+    public TimerEventManagerService getTimerEventManagerService() {
+        return (TimerEventManagerService) services.get(TimerEventManagerService.class);
     }
 
-    public SyslogEventManager getSyslogEventManager() {
-        return syslogEventManager;
+    public FileFollowEventManagerService getFileFollowEventManagerService() {
+        return (FileFollowEventManagerService) services.get(FileFollowEventManagerService.class);
+    }
+
+    public PathEventManagerService getPathEventManagerService() {
+        return (PathEventManagerService) services.get(PathEventManagerService.class);
     }
 
     public void close() throws IOException {
@@ -87,11 +91,11 @@ public final class EventManager {
                 closeable.close();
             }
         }
-        clockEventManager.close();
-        timerEventManager.close();
-        fileFollowEventManager.close();
-        pathEventManager.close();
-        syslogEventManager.close();
+        for (EventManagerService service : services.values()) {
+            if (service instanceof Closeable closeable) {
+                closeable.close();
+            }
+        }
     }
 
     public static class Builder {

event-common/src/main/java/org/xbib/event/common/EventManagerService.java

@@ -0,0 +1,11 @@
+package org.xbib.event.common;
+
+import org.xbib.event.bus.EventBus;
+import org.xbib.settings.Settings;
+
+import java.util.concurrent.ExecutorService;
+
+public interface EventManagerService {
+
+    EventManagerService init(Settings settings, EventBus eventBus, ClassLoader classLoader, ExecutorService executorService);
+}

event-common/src/main/java/org/xbib/event/generic/GenericEventImpl.java

@@ -1,20 +1,20 @@
 package org.xbib.event.generic;
 
-import org.xbib.event.DefaultEvent;
+import org.xbib.event.common.EventImpl;
 
-public class DefaultGenericEvent extends DefaultEvent implements GenericEvent {
+public class GenericEventImpl extends EventImpl implements GenericEvent {
 
     private Listener listener;
 
-    public DefaultGenericEvent() {
+    public GenericEventImpl() {
         this(null);
     }
 
-    public DefaultGenericEvent(Listener listener) {
+    public GenericEventImpl(Listener listener) {
         this.listener = listener;
     }
 
-    public DefaultGenericEvent setListener(Listener listener) {
+    public GenericEventImpl setListener(Listener listener) {
         this.listener = listener;
         return this;
     }

event-common/src/main/java/org/xbib/event/generic/GenericEventManagerService.java

@@ -2,24 +2,32 @@ package org.xbib.event.generic;
 
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
 
-import org.xbib.event.bus.AsyncEventBus;
+import org.xbib.event.bus.EventBus;
 import org.xbib.event.bus.Subscriber;
 import org.xbib.event.bus.SubscriberRegistry;
+import org.xbib.event.common.EventManagerService;
+import org.xbib.settings.Settings;
 
-public class GenericEventManager {
+public class GenericEventManagerService implements EventManagerService {
 
-    private final AsyncEventBus eventBus;
+    private EventBus eventBus;
 
-    public GenericEventManager(AsyncEventBus eventBus) {
+    public GenericEventManagerService() {
+    }
+
+    @Override
+    public GenericEventManagerService init(Settings settings, EventBus eventBus, ClassLoader classLoader, ExecutorService executorService) {
         this.eventBus = eventBus;
+        return this;
     }
 
     public void post(Object event) {
         eventBus.post(event);
     }
 
-    public void post(DefaultGenericEvent event,
+    public void post(GenericEventImpl event,
                      CompletableFuture<GenericEvent> future) {
         SubscriberRegistry subscriberRegistry = eventBus.getSubscribers();
         Set<Subscriber> set = subscriberRegistry.getSubscribersForTesting(event.getClass());

event-common/src/main/java/org/xbib/event/path/FileFollowEventImpl.java

@@ -1,16 +1,16 @@
 package org.xbib.event.path;
 
-import org.xbib.event.DefaultEvent;
+import org.xbib.event.common.EventImpl;
 
 import java.nio.file.Path;
 
-public class DefaultFileFollowEvent extends DefaultEvent implements FileFollowEvent {
+public class FileFollowEventImpl extends EventImpl implements FileFollowEvent {
 
     private Path path;
 
     private String content;
 
-    public DefaultFileFollowEvent() {
+    public FileFollowEventImpl() {
     }
 
     @Override

event-common/src/main/java/org/xbib/event/path/FileFollowEventManagerService.java

@@ -1,6 +1,7 @@
 package org.xbib.event.path;
 
-import org.xbib.event.bus.AsyncEventBus;
+import org.xbib.event.bus.EventBus;
+import org.xbib.event.common.EventManagerService;
 import org.xbib.settings.Settings;
 
 import java.io.Closeable;
@@ -16,17 +17,21 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-public class FileFollowEventManager implements Closeable {
+public class FileFollowEventManagerService implements EventManagerService, Closeable {
 
-    private static final Logger logger = Logger.getLogger(FileFollowEventManager.class.getName());
+    private static final Logger logger = Logger.getLogger(FileFollowEventManagerService.class.getName());
 
-    private final Map<Future<?>, FileFollowEventService> eventServiceMap;
+    private Map<Future<?>, FileFollowEventService> eventServiceMap;
+
+    public FileFollowEventManagerService() {
+    }
 
     @SuppressWarnings("unchecked")
-    public FileFollowEventManager(Settings settings,
-                                  AsyncEventBus eventBus,
-                                  ExecutorService executorService,
-                                  ClassLoader classLoader) {
+    @Override
+    public FileFollowEventManagerService init(Settings settings,
+                                              EventBus eventBus,
+                                              ClassLoader classLoader,
+                                              ExecutorService executorService) {
         this.eventServiceMap = new LinkedHashMap<>();
         for (Map.Entry<String, Settings> entry : settings.getGroups("event.filefollow").entrySet()) {
             Settings definition = entry.getValue();
@@ -38,7 +43,7 @@ public class FileFollowEventManager implements Closeable {
                 try {
                     Path base = Paths.get(baseStr);
                     Pattern pattern = Pattern.compile(patternStr);
-                    String className = definition.get("class", DefaultFileFollowEvent.class.getName());
+                    String className = definition.get("class", FileFollowEventImpl.class.getName());
                     Class<? extends FileFollowEvent> eventClass = (Class<? extends FileFollowEvent>) classLoader.loadClass(className);
                     FileFollowEventService fileFollowEventService = new FileFollowEventService(definition, eventBus, base, pattern, eventClass);
                     Future<?> future = executorService.submit(fileFollowEventService);
@@ -49,6 +54,7 @@ public class FileFollowEventManager implements Closeable {
                 }
             }
         }
+        return this;
     }
 
     @Override

event-common/src/main/java/org/xbib/event/path/FileFollowEventService.java

@@ -92,7 +92,7 @@ public class FileFollowEventService implements Callable<Integer>, Closeable {
                         // split content by line, this allows pattern matching without preprocessing in worker
                         for (String line : content.split("\n")) {
                             FileFollowEvent event = eventClass.getDeclaredConstructor().newInstance();
-                            event.setKey(base.toString());
+                            event.setType(base.toString());
                             event.setPath(path);
                             event.setContent(line);
                             eventBus.post(event);

event-common/src/main/java/org/xbib/event/path/PathEventImpl.java

@@ -1,6 +1,6 @@
 package org.xbib.event.path;
 
-import org.xbib.event.DefaultEvent;
+import org.xbib.event.common.EventImpl;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,7 +9,7 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import java.time.Instant;
 
-public class DefaultPathEvent extends DefaultEvent implements PathEvent {
+public class PathEventImpl extends EventImpl implements PathEvent {
 
     private Path path;
 

event-common/src/main/java/org/xbib/event/path/PathEventManagerService.java

@@ -3,6 +3,7 @@ package org.xbib.event.path;
 import org.xbib.datastructures.api.TimeValue;
 import org.xbib.datastructures.json.tiny.Json;
 import org.xbib.event.bus.EventBus;
+import org.xbib.event.common.EventManagerService;
 import org.xbib.settings.Settings;
 
 import java.io.Closeable;
@@ -22,25 +23,29 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
-public class PathEventManager implements Closeable {
+public class PathEventManagerService implements EventManagerService, Closeable {
 
-    private static final Logger logger = Logger.getLogger(PathEventManager.class.getName());
+    private static final Logger logger = Logger.getLogger(PathEventManagerService.class.getName());
 
-    private final EventBus eventBus;
+    private EventBus eventBus;
 
-    private final ExecutorService executorService;
+    private ExecutorService executorService;
 
-    private final Path path;
+    private Path path;
 
-    private final Map<Future<?>, PathEventService> eventServiceMap;
+    private Map<Future<?>, PathEventService> eventServiceMap;
 
-    private final List<String> suspendedQueues;
+    private List<String> suspendedQueues;
+
+    public PathEventManagerService() {
+    }
 
     @SuppressWarnings("unchecked")
-    public PathEventManager(Settings settings,
-                            EventBus eventBus,
-                            ExecutorService executorService,
-                            ClassLoader classLoader) {
+    @Override
+    public PathEventManagerService init(Settings settings,
+                                        EventBus eventBus,
+                                        ClassLoader classLoader,
+                                        ExecutorService executorService) {
         this.eventBus = eventBus;
         this.executorService = executorService;
         this.eventServiceMap = new LinkedHashMap<>();
@@ -53,7 +58,7 @@ public class PathEventManager implements Closeable {
                 if (definition.getAsBoolean("enabled", true)) {
                     int maxBytes = definition.getAsInt("maxfilesize", 10 * 1024 * 1024); // 10 MB
                     TimeValue lifetime = definition.getAsTime("lifetime", TimeValue.timeValueHours(72));
-                    String className = definition.get("class", DefaultPathEvent.class.getName());
+                    String className = definition.get("class", PathEventImpl.class.getName());
                     Class<? extends PathEvent> eventClass = (Class<? extends PathEvent>) classLoader.loadClass(className);
                     Path p = path.resolve(name);
                     createPathEventService(name, p, maxBytes, lifetime, eventClass);
@@ -64,6 +69,7 @@ public class PathEventManager implements Closeable {
                 logger.log(Level.SEVERE, "unable to create event path service " + entry.getKey() + ", reason " + e.getMessage(), e);
             }
         }
+        return this;
     }
 
     public void createPathEventService(String name,

event-common/src/main/java/org/xbib/event/path/PathEventService.java

@@ -32,7 +32,7 @@ public class PathEventService implements Callable<Integer>, Closeable {
 
     public static final String FAIL = "fail";
 
-    private final PathEventManager pathEventManager;
+    private final PathEventManagerService pathEventManager;
 
     private final EventBus eventBus;
 
@@ -52,7 +52,7 @@ public class PathEventService implements Callable<Integer>, Closeable {
 
     private volatile boolean keepWatching;
 
-    public PathEventService(PathEventManager pathEventManager,
+    public PathEventService(PathEventManagerService pathEventManager,
                             EventBus eventBus,
                             String name,
                             Path path,
@@ -215,7 +215,7 @@ public class PathEventService implements Callable<Integer>, Closeable {
     private PathEvent toEvent(String base, Path file, String suffix, String json) {
         try {
             PathEvent event = pathEventClass.getConstructor().newInstance();
-            event.setKey(base);
+            event.setType(base);
             event.setFile(file);
             event.setSuffix(suffix);
             event.setPath(path); // remember directory for fail() and success()

event-common/src/main/java/org/xbib/event/timer/TimerEventImpl.java

@@ -1,14 +1,14 @@
 package org.xbib.event.timer;
 
-import org.xbib.event.DefaultEvent;
+import org.xbib.event.common.EventImpl;
 
 import java.time.Instant;
 
-public class DefaultTimerEvent extends DefaultEvent implements TimerEvent {
+public class TimerEventImpl extends EventImpl implements TimerEvent {
 
     private Instant instant;
 
-    public DefaultTimerEvent() {
+    public TimerEventImpl() {
     }
 
     @Override

event-common/src/main/java/org/xbib/event/timer/TimerEventManagerService.java

@@ -2,6 +2,7 @@ package org.xbib.event.timer;
 
 import org.xbib.event.bus.AsyncEventBus;
 import org.xbib.event.bus.EventBus;
+import org.xbib.event.common.EventManagerService;
 import org.xbib.event.persistence.FilePersistenceStore;
 import org.xbib.event.persistence.PersistenceStore;
 import org.xbib.settings.Settings;
@@ -16,26 +17,27 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class TimerEventManager implements Closeable {
+public class TimerEventManagerService implements EventManagerService, Closeable {
 
-    private static final Logger logger = Logger.getLogger(TimerEventManager.class.getName());
+    private static final Logger logger = Logger.getLogger(TimerEventManagerService.class.getName());
 
-    private final Map<String, TimerEventService> services;
+    private Map<String, TimerEventService> services;
 
-    public TimerEventManager(Settings settings) {
-        this(settings, new AsyncEventBus(Executors.newSingleThreadExecutor()),
-                TimerEventManager.class.getClassLoader(), ZoneId.systemDefault());
+    public TimerEventManagerService() {
     }
 
+
     @SuppressWarnings("unchecked")
-    public TimerEventManager(Settings settings,
-                             EventBus eventBus,
-                             ClassLoader classLoader,
-                             ZoneId zoneId) {
+    @Override
+    public TimerEventManagerService init(Settings settings,
+                                         EventBus eventBus,
+                                         ClassLoader classLoader,
+                                         ExecutorService executorService) {
         this.services = new LinkedHashMap<>();
         for (Map.Entry<String, Settings> entry : settings.getGroups("event.timer").entrySet()) {
             String name = entry.getKey();
@@ -44,38 +46,43 @@ public class TimerEventManager implements Closeable {
             try {
                 Class<? extends TimerEvent> eventClass = (Class<? extends TimerEvent>) classLoader.loadClass(className);
                 PersistenceStore<String, Object> persistenceStore = new FilePersistenceStore(timerSettings, name);
-                services.put(name, new TimerEventService(eventBus, name, eventClass, zoneId, persistenceStore));
+                services.put(name, new TimerEventService(eventBus, name, eventClass, ZoneId.systemDefault(), persistenceStore));
                 logger.log(Level.INFO, "timer " + name + " active for timer event class " + className);
             } catch (Exception e) {
                 logger.log(Level.WARNING, "unable to activate timer " + name + ", reason: " + e.getMessage(), e);
             }
         }
+        return this;
     }
 
-    public boolean put(String key, String timeSpec, Map<String,Object> map) throws ParseException, IOException {
-        if (services.containsKey(key)) {
+    public boolean put(String service,
+                       String timeSpec,
+                       Map<String, Object> map) throws ParseException, IOException {
+        if (services.containsKey(service)) {
             Span span = Chronic.parse(timeSpec);
             if (span != null) {
                 ZonedDateTime zonedDateTime = span.getBeginCalendar();
-                services.get(key).schedule(zonedDateTime.toInstant(), map);
+                services.get(service).schedule(zonedDateTime.toInstant(), map);
                 logger.log(Level.INFO, "scheduled to " + zonedDateTime);
             } else {
-                logger.log(Level.INFO, "timer event key " + key + ": can not understand time spec " + timeSpec);
+                logger.log(Level.INFO, "timer event key " + service + ": can not understand time spec " + timeSpec);
                 return false;
             }
             return true;
         } else {
-            logger.log(Level.SEVERE, "unknown timer event key: " + key);
+            logger.log(Level.SEVERE, "unknown timer event key: " + service);
         }
         return false;
     }
 
-    public boolean put(String key, Instant instant, Map<String,Object> map) throws IOException {
-        if (services.containsKey(key)) {
-            services.get(key).schedule(instant, map);
+    public boolean put(String service,
+                       Instant instant,
+                       Map<String, Object> map) throws IOException {
+        if (services.containsKey(service)) {
+            services.get(service).schedule(instant, map);
             return true;
         } else {
-            logger.log(Level.SEVERE, "unknown timer event key: " + key);
+            logger.log(Level.SEVERE, "unknown timer event key: " + service);
         }
         return false;
     }

event-common/src/test/java/org/xbib/event/EventManagerTest.java

@@ -3,7 +3,7 @@ package org.xbib.event;
 import org.junit.jupiter.api.Test;
 import org.xbib.event.bus.Subscribe;
 import org.xbib.event.common.EventManager;
-import org.xbib.event.generic.DefaultGenericEvent;
+import org.xbib.event.generic.GenericEventImpl;
 import org.xbib.event.generic.GenericEvent;
 import org.xbib.settings.Settings;
 
@@ -24,7 +24,7 @@ public class EventManagerTest {
         EventManager eventManager = EventManager.builder(settings)
                 .register(consumer)
                 .build();
-        eventManager.getGenericEventManager().post(new DefaultGenericEvent(e -> {
+        eventManager.getGenericEventManagerService().post(new GenericEventImpl(e -> {
             logger.log(Level.INFO, "received event " + e);
         }));
     }
@@ -39,7 +39,7 @@ public class EventManagerTest {
                 .register(consumer)
                 .build();
         CompletableFuture<GenericEvent> future = new CompletableFuture<>();
-        eventManager.getGenericEventManager().post(new DefaultGenericEvent(e -> {
+        eventManager.getGenericEventManagerService().post(new GenericEventImpl(e -> {
             logger.log(Level.INFO, "received event " + e);
             future.complete(e);
         }));
@@ -59,7 +59,7 @@ public class EventManagerTest {
                 .loadEventConsumers()
                 .build();
         CompletableFuture<GenericEvent> future = new CompletableFuture<>();
-        eventManager.getGenericEventManager().post(new DefaultGenericEvent(e -> {
+        eventManager.getGenericEventManagerService().post(new GenericEventImpl(e -> {
             logger.log(Level.INFO, "received event " + e);
         }), future);
         GenericEvent e = future.get();
@@ -72,7 +72,7 @@ public class EventManagerTest {
         }
 
         @Subscribe
-        public void onEvent(DefaultGenericEvent event) {
+        public void onEvent(GenericEventImpl event) {
             event.received();
         }
     }

event-common/src/test/java/org/xbib/event/clock/ClockEventManagerTest.java

@@ -19,8 +19,7 @@ public class ClockEventManagerTest {
         EventManager eventManager = EventManager.builder(settings)
                 .register(clockEventConsumer)
                 .build();
-        ClockEventManager clockEventManager = eventManager.getClockEventManager();
         Thread.sleep(90000L);
-        clockEventManager.close();
+        eventManager.close();
     }
 }

event-common/src/test/java/org/xbib/event/clock/TestClockEvent.java

@@ -1,4 +1,4 @@
 package org.xbib.event.clock;
 
-public class TestClockEvent extends DefaultClockEvent {
+public class TestClockEvent extends ClockEventImpl {
 }

event-common/src/test/java/org/xbib/event/path/FileFollowEventManagerTest.java

@@ -28,15 +28,14 @@ public class FileFollowEventManagerTest {
         EventManager eventManager = EventManager.builder(settings)
                 .register(consumer)
                 .build();
-        FileFollowEventManager fileFolloeEventManager = eventManager.getFileFollowEventManager();
         Thread.sleep(5000L);
         try (BufferedWriter bufferedWriter = Files.newBufferedWriter(path.resolve("test.txt"))) {
             bufferedWriter.write("Hello");
             logger.log(Level.INFO, "Hello written");
         }
         Thread.sleep(5000L);
-        fileFolloeEventManager.close();
         Files.delete(path.resolve("test.txt"));
         Files.delete(path);
+        eventManager.close();
     }
 }

event-common/src/test/java/org/xbib/event/path/TestFileFollowEvent.java

@@ -1,4 +1,4 @@
 package org.xbib.event.path;
 
-public class TestFileFollowEvent extends DefaultFileFollowEvent {
+public class TestFileFollowEvent extends FileFollowEventImpl {
 }

event-common/src/test/java/org/xbib/event/timer/TestTimerEvent.java

@@ -1,4 +1,4 @@
 package org.xbib.event.timer;
 
-public class TestTimerEvent extends DefaultTimerEvent {
+public class TestTimerEvent extends TimerEventImpl {
 }

event-common/src/test/java/org/xbib/event/timer/TimerEventManagerTest.java

@@ -20,7 +20,7 @@ public class TimerEventManagerTest {
         EventManager eventManager = EventManager.builder(settings)
                 .register(consumer)
                 .build();
-        TimerEventManager timerEventManager = eventManager.getTimerEventManager();
+        TimerEventManagerService timerEventManager = eventManager.getTimerEventManagerService();
         timerEventManager.put("testtimerevent", Instant.now().plusSeconds(5L), Map.of("a", "b"));
         Thread.sleep(10000L);
         timerEventManager.close();

event-net-http/build.gradle

@@ -0,0 +1,6 @@
+dependencies {
+    api project(':event-common')
+    api libs.net.http.server.netty
+    api libs.net.http.client.netty
+    implementation libs.datastructures.json.tiny
+}

event-net-http/src/main/java/module-info.java

@@ -0,0 +1,13 @@
+module org.xbib.event.net.http {
+    exports org.xbib.event.net.http;
+    requires org.xbib.event.api;
+    requires org.xbib.event.common;
+    requires org.xbib.net.http;
+    requires org.xbib.net.http.client;
+    requires org.xbib.net.http.client.netty;
+    requires org.xbib.net.http.client.netty.secure;
+    requires org.xbib.net.http.server;
+    requires org.xbib.net.http.server.netty;
+    requires org.xbib.net.http.server.netty.secure;
+    requires java.logging;
+}

event-net-http/src/main/java/org/xbib/event/net/http/EventReceiverService.java

@@ -0,0 +1,44 @@
+package org.xbib.event.net.http;
+
+import org.xbib.event.common.EventManager;
+import org.xbib.event.common.EventImpl;
+import org.xbib.net.http.HttpHeaderNames;
+import org.xbib.net.http.HttpHeaderValues;
+import org.xbib.net.http.HttpMethod;
+import org.xbib.net.http.server.service.BaseHttpService;
+import org.xbib.net.http.server.service.HttpService;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.xbib.net.http.HttpResponseStatus.NOT_FOUND;
+import static org.xbib.net.http.HttpResponseStatus.OK;
+
+public class EventReceiverService {
+
+    private final EventManager eventManager;
+
+    public EventReceiverService(EventManager eventManager) {
+        this.eventManager = eventManager;
+    }
+
+    public HttpService createService(String prefix) {
+        return BaseHttpService.builder()
+                .setPrefix(prefix)
+                .setPath("/event/{type}")
+                .setMethod(HttpMethod.POST)
+                .setHandler(ctx -> {
+                    EventImpl event = EventImpl.fromJson(ctx.getRequest().asJson());
+                    if (event.isNullEvent()) {
+                        ctx.status(NOT_FOUND).done();
+                    } else {
+                        eventManager.submit(event);
+                        ctx.status(OK)
+                                .header(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON)
+                                .charset(StandardCharsets.UTF_8)
+                                .body(event.toJson())
+                                .done();
+                    }
+                })
+                .build();
+    }
+}

event-syslog/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    api project(':event-common')
+    implementation libs.datastructures.json.tiny
+    implementation libs.netty.handler
+}

event-syslog/src/main/java/module-info.java

@@ -0,0 +1,17 @@
+import org.xbib.event.common.EventManagerService;
+import org.xbib.event.syslog.SyslogEventManagerService;
+
+module org.xbib.event.syslog {
+    exports org.xbib.event.syslog;
+    provides EventManagerService with SyslogEventManagerService;
+    requires org.xbib.event.common;
+    requires org.xbib.datastructures.json.tiny;
+    requires io.netty.buffer;
+    requires io.netty.common;
+    requires io.netty.transport;
+    requires io.netty.handler;
+    requires io.netty.codec;
+    requires java.logging;
+    requires org.xbib.settings.api;
+    requires org.xbib.event.api;
+}

event-syslog/src/main/java/org/xbib/event/syslog/DefaultSyslogMessage.java

@@ -138,12 +138,12 @@ public class DefaultSyslogMessage implements SyslogMessage {
     }
 
     @Override
-    public void setKey(String key) {
+    public void setType(String key) {
         // ignore
     }
 
     @Override
-    public String getKey() {
+    public String getType() {
         return builder.messageId;
     }
 

event-syslog/src/main/java/org/xbib/event/syslog/MessageEncoder.java

@@ -72,7 +72,6 @@ public class MessageEncoder extends MessageToMessageEncoder<Message> {
             buffer.writeCharSequence(kvp.getValue().toString(), charset);
             index++;
         }
-
         output.add(buffer);
     }
 

event-syslog/src/main/java/org/xbib/event/syslog/SyslogEventManagerService.java

@@ -1,6 +1,7 @@
 package org.xbib.event.syslog;
 
-import org.xbib.event.bus.AsyncEventBus;
+import org.xbib.event.bus.EventBus;
+import org.xbib.event.common.EventManagerService;
 import org.xbib.settings.Settings;
 
 import java.io.Closeable;
@@ -8,16 +9,22 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class SyslogEventManager implements Closeable {
-    private static final Logger logger = Logger.getLogger(SyslogEventManager.class.getName());
+public class SyslogEventManagerService implements EventManagerService, Closeable {
+    private static final Logger logger = Logger.getLogger(SyslogEventManagerService.class.getName());
 
-    private final List<SyslogService> syslogServices;
+    private List<SyslogService> syslogServices;
 
-    public SyslogEventManager(Settings settings,
-                              AsyncEventBus eventBus) {
+    public SyslogEventManagerService() {}
+
+    @Override
+    public SyslogEventManagerService init(Settings settings,
+                                          EventBus eventBus,
+                                          ClassLoader classLoader,
+                                          ExecutorService executorService) {
         this.syslogServices = new ArrayList<>();
         for (Map.Entry<String, Settings> entry : settings.getGroups("event.syslog").entrySet()) {
             Settings definition = entry.getValue();
@@ -31,6 +38,7 @@ public class SyslogEventManager implements Closeable {
                 }
             }
         }
+        return this;
     }
 
     @Override

event-syslog/src/main/resources/META-INF/services/org.xbib.event.common.EventManagerService

@@ -0,0 +1 @@
+org.xbib.event.syslog.SyslogEventManagerService

event-syslog/src/test/java/org/xbib/event/syslog/test/SyslogServiceTest.java

@@ -1,6 +1,7 @@
-package org.xbib.event.syslog;
+package org.xbib.event.syslog.test;
 
 import org.junit.jupiter.api.Test;
+import org.xbib.event.syslog.SyslogService;
 import org.xbib.settings.Settings;
 
 import java.io.IOException;
@@ -14,7 +15,7 @@ public class SyslogServiceTest {
                 .build();
         SyslogService syslogService = new SyslogService(settings, null);
         syslogService.startTcp();
-        Thread.sleep(60000L);
+        Thread.sleep(60000L); // send a syslog from console
         syslogService.close();
     }
 }

gradle.properties

@@ -1,3 +1,3 @@
 group = org.xbib
 name = event
-version = 0.1.0
+version = 0.2.0

settings.gradle

@@ -18,6 +18,7 @@ dependencyResolutionManagement {
             version('gradle', '8.5')
             version('datastructures', '5.0.6')
             version('net', '4.0.4')
+            version('net-http', '4.1.0')
             version('netty', '4.1.104.Final')
             library('netty-handler', 'io.netty', 'netty-handler').versionRef('netty')
             library('net', 'org.xbib', 'net').versionRef('net')
@@ -26,6 +27,8 @@ dependencyResolutionManagement {
             library('settings-api', 'org.xbib', 'settings-api').versionRef('datastructures')
             library('settings-datastructures-json', 'org.xbib', 'settings-datastructures-json').versionRef('datastructures')
             library('time', 'org.xbib', 'time').version('4.0.0')
+            library('net-http-server-netty', 'org.xbib', 'net-http-server-netty-secure').versionRef('net-http')
+            library('net-http-client-netty', 'org.xbib', 'net-http-client-netty-secure').versionRef('net-http')
             library('reactivestreams', 'org.reactivestreams', 'reactive-streams').version('1.0.3')
             library('rxjava3', 'io.reactivex.rxjava3', 'rxjava').version('3.0.3')
         }
@@ -45,3 +48,4 @@ include 'event-async'
 include 'event-common'
 include 'event-loop'
 include 'event-net-http'
+include 'event-syslog'