add clock event manager test

build.gradle

@@ -47,4 +47,5 @@ dependencies {
     implementation libs.datastructures.json.tiny
     implementation libs.reactivestreams
     testImplementation libs.rxjava3
+    testImplementation libs.settings.datastructures.json
 }

gradle/test/junit5.gradle

@@ -9,8 +9,10 @@ dependencies {
 test {
     useJUnitPlatform()
     failFast = true
+    systemProperty 'java.util.logging.config.file', 'src/test/resources/logging.properties'
     testLogging {
         events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED'
+        showStandardStreams = true
     }
     afterSuite { desc, result ->
         if (!desc.parent) {

settings.gradle

@@ -18,18 +18,18 @@ dependencyResolutionManagement {
             version('gradle', '8.4-rc-1')
             version('groovy', '4.0.13')
             version('junit', '5.10.0')
-            version('datastructures', '3.0.0')
+            version('datastructures', '5.0.5')
             version('net', '4.0.0')
-            version('content', '5.0.4')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
             library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
             library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
             library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
-            library('settings-api', 'org.xbib', 'settings-api').versionRef('content')
             library('net', 'org.xbib', 'net').versionRef('net')
             library('datastructures-common', 'org.xbib', 'datastructures-common').versionRef('datastructures')
             library('datastructures-json-tiny', 'org.xbib', 'datastructures-json-tiny').versionRef('datastructures')
+            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('2.3.0')
             library('reactivestreams', 'org.reactivestreams', 'reactive-streams').version('1.0.3')
             library('rxjava3', 'io.reactivex.rxjava3', 'rxjava').version('3.0.3')

src/main/java/org/xbib/event/clock/ClockEventManager.java

@@ -1,5 +1,6 @@
 package org.xbib.event.clock;
 
+import org.xbib.event.EventConsumer;
 import org.xbib.event.bus.AsyncEventBus;
 import org.xbib.event.bus.EventBus;
 import org.xbib.settings.Settings;
@@ -8,10 +9,13 @@ import org.xbib.time.schedule.CronSchedule;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 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 {
@@ -31,31 +35,52 @@ public class ClockEventManager implements Closeable {
             int n = 1;
             @Override
             public Thread newThread(Runnable r) {
-                return new Thread(r, "malva-clockevent-" + (n++));
+                return new Thread(r, "clock-event-manager-" + (n++));
             }
         };
         ScheduledExecutorService executorService =
                 Executors.newScheduledThreadPool(settings.getAsInt("pool.size", 2), threadFactory);
         this.cronSchedule = new CronSchedule<>(executorService);
-        for (Map.Entry<String,Settings> cronjobs : settings.getGroups("clock").entrySet()) {
+        // register consumers
+        List<String> consumerList = new ArrayList<>();
+        for (Map.Entry<String, Settings> consumers : settings.getGroups("event.consumer").entrySet()) {
+            Settings entrySettings = consumers.getValue();
+            if (entrySettings.getAsBoolean("enabled", true)) {
+                String className = entrySettings.get("class");
+                try {
+                    if (className != null) {
+                        @SuppressWarnings("unchecked")
+                        Class<? extends EventConsumer> consumerClass = (Class<? extends EventConsumer>) classLoader.loadClass(className);
+                        eventBus.register(consumerClass.getDeclaredConstructor().newInstance());
+                        logger.log(Level.INFO, "consumer " + consumerClass + " registered");
+                        consumerList.add(consumerClass.getName());
+                    }
+                } catch (Exception e) {
+                    logger.log(Level.WARNING, "unable to load consumer " + className + ", reason " + e.getMessage());
+                }
+            }
+        }
+        logger.log(Level.INFO, "consumers = " + consumerList);
+        for (Map.Entry<String, Settings> cronjobs : settings.getGroups("event.clock").entrySet()) {
             Settings entrySettings = cronjobs.getValue();
             if (entrySettings.getAsBoolean("enabled", true)) {
                 String entry = entrySettings.get("entry");
                 if (entry != null) {
-                    String className = entrySettings.get("class", ClockEvent.class.getName());
                     try {
+                        String className = entrySettings.get("class", ClockEvent.class.getName());
+                        if (className != null) {
                             @SuppressWarnings("unchecked")
                             Class<? extends ClockEvent> eventClass = (Class<? extends ClockEvent>) classLoader.loadClass(className);
                             cronSchedule.add(className, CronExpression.parse(entry), new ClockEventService(eventBus, eventClass));
-                        logger.info("cron job " + cronjobs.getKey() +
+                            logger.log(Level.INFO, "cron job " + cronjobs.getKey() + " scheduled on " + entry + ", event class " + className);
-                                " scheduled on " + entry +
+                        }
-                                ", event class " + className);
                     } catch (Exception e) {
-                        logger.warning("unable to schedule cron job " + cronjobs.getKey() + ", reason " + e.getMessage());
+                        logger.log(Level.WARNING, "unable to schedule cron job " + cronjobs.getKey() + ", reason " + e.getMessage());
                     }
                 }
             }
         }
+        logger.log(Level.INFO, "entries = " + cronSchedule.getEntries());
         cronSchedule.start();
     }
 

src/main/java/org/xbib/event/clock/DefaultClockEvent.java

@@ -0,0 +1,46 @@
+package org.xbib.event.clock;
+
+import java.time.Instant;
+import java.util.Map;
+
+public class DefaultClockEvent implements ClockEvent {
+
+    private String key;
+
+    private Map<String, Object> map;
+
+    private Instant instant;
+
+    public DefaultClockEvent() {
+    }
+
+    @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;
+    }
+
+    @Override
+    public void setInstant(Instant instant) {
+        this.instant = instant;
+    }
+
+    @Override
+    public Instant getInstant() {
+        return instant;
+    }
+}

src/main/java/org/xbib/event/clock/SimpleClockEventConsumer.java

@@ -6,9 +6,12 @@ import java.util.logging.Logger;
 import org.xbib.event.bus.AllowConcurrentEvents;
 import org.xbib.event.bus.Subscribe;
 
-public class ClockEventConsumer implements EventConsumer {
+public class SimpleClockEventConsumer implements EventConsumer {
 
-    private static final Logger logger = Logger.getLogger(ClockEventConsumer.class.getName());
+    private static final Logger logger = Logger.getLogger(SimpleClockEventConsumer.class.getName());
+
+    public SimpleClockEventConsumer() {
+    }
 
     @Subscribe
     @AllowConcurrentEvents

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

@@ -0,0 +1,24 @@
+package org.xbib.event.clock;
+
+import org.junit.jupiter.api.Test;
+import org.xbib.settings.Settings;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+public class ClockEventManagerTest {
+
+    @Test
+    public void testEvents() throws IOException, InterruptedException {
+        Settings settings = Settings.settingsBuilder()
+                .put("event.consumer.testconsumer.enabled", "true")
+                .put("event.consumer.testconsumer.class", "org.xbib.event.clock.TestClockEventConsumer")
+                .put("event.clock.testclockevent.enabled", "true")
+                .put("event.clock.testclockevent.class", "org.xbib.event.clock.TestClockEvent")
+                .put("event.clock.testclockevent.entry", "*/1 6-21 * * *")
+                .build();
+        ClockEventManager clockEventManager = new ClockEventManager(settings);
+        Thread.sleep(90000L);
+        clockEventManager.close();
+    }
+}

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

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

src/test/java/org/xbib/event/clock/TestClockEventConsumer.java

@@ -0,0 +1,18 @@
+package org.xbib.event.clock;
+
+import org.xbib.event.EventConsumer;
+import org.xbib.event.bus.AllowConcurrentEvents;
+import org.xbib.event.bus.Subscribe;
+
+import java.util.logging.Logger;
+
+public class TestClockEventConsumer implements EventConsumer {
+
+    private static final Logger logger = Logger.getLogger(SimpleClockEventConsumer.class.getName());
+
+    @Subscribe
+    @AllowConcurrentEvents
+    void onEvent(TestClockEvent event) {
+        logger.info("received test clock event, instant = " + event.getInstant());
+    }
+}

src/test/resources/META-INF/services/org.xbib.settings.SettingsLoader

@@ -0,0 +1 @@
+org.xbib.settings.datastructures.json.JsonSettingsLoader

src/test/resources/logging.properties

@@ -0,0 +1,6 @@
+handlers=java.util.logging.ConsoleHandler
+.level=ALL
+java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+jdk.event.security.level=INFO