Added base classes for event handling

ical4j · Sep 14, 2023 · cdc44a0 · cdc44a0
1 parent b222ab9
commit cdc44a0
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 24 deletions.
diff --git a/ical4j-connector-api/src/main/java/org/ical4j/connector/AbstractObjectCollection.java b/ical4j-connector-api/src/main/java/org/ical4j/connector/AbstractObjectCollection.java
@@ -0,0 +1,22 @@
+package org.ical4j.connector;
+
+import org.ical4j.connector.event.ListenerList;
+import org.ical4j.connector.event.ObjectCollectionListener;
+
+public abstract class AbstractObjectCollection<T> implements ObjectCollection<T> {
+
+    private final ListenerList<ObjectCollectionListener<T>> listenerList;
+
+    public AbstractObjectCollection() {
+        this(new ListenerList<>());
+    }
+
+    public AbstractObjectCollection(ListenerList<ObjectCollectionListener<T>> listenerList) {
+        this.listenerList = listenerList;
+    }
+
+    @Override
+    public ListenerList<ObjectCollectionListener<T>> getObjectCollectionListeners() {
+        return listenerList;
+    }
+}
diff --git a/ical4j-connector-api/src/main/java/org/ical4j/connector/AbstractObjectStore.java b/ical4j-connector-api/src/main/java/org/ical4j/connector/AbstractObjectStore.java
@@ -0,0 +1,25 @@
+package org.ical4j.connector;
+
+import org.ical4j.connector.event.ListenerList;
+import org.ical4j.connector.event.ObjectStoreListener;
+
+public abstract class AbstractObjectStore<T, C extends ObjectCollection<T>> implements ObjectStore<T, C> {
+
+    /**
+     * Registered event listeners.
+     */
+    private final ListenerList<ObjectStoreListener<T>> listenerList;
+
+    public AbstractObjectStore() {
+        this(new ListenerList<>());
+    }
+
+    public AbstractObjectStore(ListenerList<ObjectStoreListener<T>> listenerList) {
+        this.listenerList = listenerList;
+    }
+
+    @Override
+    public ListenerList<ObjectStoreListener<T>> getObjectStoreListeners() {
+        return listenerList;
+    }
+}
diff --git a/...connector-api/src/main/java/org/ical4j/connector/local/AbstractLocalObjectCollection.java b/...connector-api/src/main/java/org/ical4j/connector/local/AbstractLocalObjectCollection.java
@@ -1,23 +1,19 @@
 package org.ical4j.connector.local;
 
 import net.fortuna.ical4j.model.Calendar;
-import org.ical4j.connector.ObjectCollection;
+import org.ical4j.connector.AbstractObjectCollection;
 import org.ical4j.connector.ObjectStoreException;
-import org.ical4j.connector.event.ListenerList;
-import org.ical4j.connector.event.ObjectCollectionListener;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Objects;
 
-public abstract class AbstractLocalObjectCollection<T> implements ObjectCollection<T> {
+public abstract class AbstractLocalObjectCollection<T> extends AbstractObjectCollection<T> {
 
     private final File root;
 
     private final LocalCollectionConfiguration configuration;
 
-    private final ListenerList<ObjectCollectionListener<T>> listenerList;
-
     public AbstractLocalObjectCollection(File root) throws IOException {
         this.root = Objects.requireNonNull(root);
         if (!root.isDirectory()) {
@@ -29,7 +25,6 @@ public AbstractLocalObjectCollection(File root) throws IOException {
             throw new IOException("Unable to initialise collection config");
         }
         this.configuration = new LocalCollectionConfiguration(configRoot);
-        this.listenerList = new ListenerList<>();
     }
 
     protected File getRoot() {
@@ -81,11 +76,6 @@ public void delete() throws ObjectStoreException {
         }
     }
 
-    @Override
-    public ListenerList<ObjectCollectionListener<T>> getObjectCollectionListeners() {
-        return listenerList;
-    }
-
     @Override
     public String toString() {
         return String.format("LocalCollection[%s]", getDisplayName());

diff --git a/ical4j-connector-api/src/main/java/org/ical4j/connector/local/AbstractLocalObjectStore.java b/ical4j-connector-api/src/main/java/org/ical4j/connector/local/AbstractLocalObjectStore.java
@@ -1,11 +1,9 @@
 package org.ical4j.connector.local;
 
 import net.fortuna.ical4j.model.Calendar;
+import org.ical4j.connector.AbstractObjectStore;
 import org.ical4j.connector.ObjectNotFoundException;
-import org.ical4j.connector.ObjectStore;
 import org.ical4j.connector.ObjectStoreException;
-import org.ical4j.connector.event.ListenerList;
-import org.ical4j.connector.event.ObjectStoreListener;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,20 +12,17 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-public abstract  class AbstractLocalObjectStore<T, C extends AbstractLocalObjectCollection<T>> implements ObjectStore<T, C> {
+public abstract  class AbstractLocalObjectStore<T, C extends AbstractLocalObjectCollection<T>> extends AbstractObjectStore<T, C> {
 
     private final File root;
 
-    private final ListenerList<ObjectStoreListener<T>> listenerList;
-
     AbstractLocalObjectStore(File root) {
         this.root = Objects.requireNonNull(root);
         if (root.exists() && !root.isDirectory()) {
             throw new IllegalArgumentException("Root must be a directory");
         } else if (!root.exists() && !root.mkdirs()) {
             throw new IllegalArgumentException("Unable to initialise root directory");
         }
-        listenerList = new ListenerList<>();
     }
 
     protected File getRoot() {
@@ -132,9 +127,4 @@ public List<C> getCollections() {
             }
         }).collect(Collectors.toList());
     }
-
-    @Override
-    public ListenerList<ObjectStoreListener<T>> getObjectStoreListeners() {
-        return listenerList;
-    }
 }