Fix Hazelcast NotificationDispatcher

src/community/hz-cluster/src/main/java/org/geoserver/cluster/hazelcast/HzCluster.java

@@ -12,10 +12,9 @@
 import org.geoserver.catalog.Catalog;
 import org.geoserver.cluster.ClusterConfig;
 import org.geoserver.cluster.ClusterConfigWatcher;
-import org.geoserver.config.GeoServerDataDirectory;
 import org.geoserver.data.util.IOUtils;
-import org.geoserver.platform.GeoServerResourceLoader;
 import org.geoserver.platform.resource.Resource;
+import org.geoserver.platform.resource.ResourceStore;
 import org.geoserver.platform.resource.Resources;
 import org.geotools.util.logging.Logging;
 import org.springframework.beans.factory.DisposableBean;
@@ -41,7 +40,7 @@ public class HzCluster implements DisposableBean, InitializingBean {
     static final String HAZELCAST_FILENAME = "hazelcast.xml";
 
     HazelcastInstance hz;
-    GeoServerResourceLoader rl;
+    ResourceStore rl;
     ClusterConfigWatcher watcher;
 
     private Catalog rawCatalog;
@@ -120,7 +119,7 @@ public HazelcastInstance getHz() {
     public void afterPropertiesSet() throws Exception {
         watcher = loadConfig();
         if(watcher.get().isEnabled()){
-            hz = Hazelcast.newHazelcastInstance(loadHazelcastConfig(rl));
+            hz = Hazelcast.newHazelcastInstance(loadHazelcastConfig());
             CLUSTER = this;
         }
     }
@@ -136,7 +135,7 @@ public void destroy() throws Exception {
         }
     }
 
-    private Config loadHazelcastConfig(GeoServerResourceLoader rl) throws IOException{
+    private Config loadHazelcastConfig() throws IOException{
         Resource hzf = getConfigFile(HAZELCAST_FILENAME, HzCluster.class);
         try (InputStream hzIn = hzf.in()) {
             return new XmlConfigBuilder(hzIn).build();
@@ -148,8 +147,8 @@ private Config loadHazelcastConfig(GeoServerResourceLoader rl) throws IOExceptio
      * @param dd
      * @throws IOException
      */
-    public void setDataDirectory(GeoServerDataDirectory dd) throws IOException {
-        rl=dd.getResourceLoader();
+    public void setResourceStore(ResourceStore dd) throws IOException {
+        rl=dd;
     }
 
     /**

src/community/hz-cluster/src/main/java/org/geoserver/cluster/hazelcast/HzResourceNotificationDispatcher.java

@@ -1,13 +1,11 @@
 package org.geoserver.cluster.hazelcast;
 
 import java.util.logging.Logger;
+
 import org.geoserver.platform.resource.ResourceNotification;
 import org.geoserver.platform.resource.ResourceNotificationDispatcher;
 import org.geoserver.platform.resource.SimpleResourceNotificationDispatcher;
 import org.geotools.util.logging.Logging;
-import org.springframework.beans.factory.InitializingBean;
-
-import com.google.common.base.Preconditions;
 import com.hazelcast.core.ITopic;
 import com.hazelcast.core.Message;
 import com.hazelcast.core.MessageListener;
@@ -19,34 +17,42 @@
  * spring configuration file in order for {@link ResourceStore} to find it.
  * 
  */
-public class HzResourceNotificationDispatcher extends SimpleResourceNotificationDispatcher implements InitializingBean, MessageListener<ResourceNotification> {
+public class HzResourceNotificationDispatcher extends SimpleResourceNotificationDispatcher implements MessageListener<ResourceNotification> {
 
     static final String TOPIC_NAME = "resourceWatcher";
 
     private static final Logger LOGGER = Logging.getLogger(HzResourceNotificationDispatcher.class);
 
-    private HzCluster cluster;  
+    private HzCluster cluster; 
 
-    private ITopic<ResourceNotification> topic() {
-        return cluster.getHz().getTopic(TOPIC_NAME);
+    public HzResourceNotificationDispatcher() {
+        //lazy loaded cluster
     }
 
-    /**
-     * {@code cluster} property to be set in {@code applicationContext.xml}
-     */
-    public void setCluster(HzCluster cluster) {
+    public HzResourceNotificationDispatcher(HzCluster cluster) {
         this.cluster = cluster;
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        Preconditions.checkNotNull(cluster, "HzCluster is not set");
         topic().addMessageListener(this);
     }
+
+    private ITopic<ResourceNotification> topic() {   
+        if (cluster == null) {
+            cluster = HzCluster.getInstanceIfAvailable().orNull();
+            if (cluster != null) {
+                topic().addMessageListener(this);
+            }
+        }
+        return cluster == null ? null : cluster.getHz().getTopic(TOPIC_NAME);
+    }
 
     @Override
     public void changed(ResourceNotification event) {
-        topic().publish(event);
+        ITopic<ResourceNotification> topic = topic();
+        if (topic != null) {
+            topic.publish(event);
+        } else {
+            LOGGER.warning("Failed to publish resource notification, cluster not initialized (yet).");
+            super.changed(event); 
+        }
     }
 
     @Override

src/community/hz-cluster/src/main/resources/applicationContext.xml

@@ -14,7 +14,7 @@
    </bean>
    <bean id="hzCluster" 
          class="org.geoserver.cluster.hazelcast.HzCluster">
-      <property name="dataDirectory" ref="dataDirectory"/>
+      <property name="resourceStore" ref="resourceStore"/>
       <property name="rawCatalog" ref="rawCatalog"/>
    </bean>
 
@@ -30,8 +30,5 @@
    </bean>
 
    <!-- override the default one -->
-   <!--  TODO Re-enable once GSIP:136 passes -->
-   <!--<bean id="resourceWatcher" class="org.geoserver.cluster.hazelcast.HzResourceWatcher">
-      <property name="cluster" ref="hzCluster"/>
-   </bean>-->
+   <bean id="resourceNotificationDispatcher" class="org.geoserver.cluster.hazelcast.HzResourceNotificationDispatcher" />
 </beans>

src/community/hz-cluster/src/test/java/org/geoserver/cluster/hazelcast/HzResourceWatcherTest.java → src/community/hz-cluster/src/test/java/org/geoserver/cluster/hazelcast/HzResourceNotificationDispatcherTest.java

@@ -13,7 +13,7 @@
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
-import org.geoserver.platform.resource.AbstractResourceWatcherTest;
+import org.geoserver.platform.resource.AbstractResourceNotificationDispatcherTest;
 import org.geoserver.platform.resource.ResourceNotification;
 import org.geoserver.platform.resource.ResourceNotificationDispatcher;
 
@@ -28,9 +28,7 @@
  * @author Niels Charlier
  *
  */
-public class HzResourceWatcherTest extends AbstractResourceWatcherTest {
-
-    private HzResourceNotificationDispatcher resourceWatcher;
+public class HzResourceNotificationDispatcherTest extends AbstractResourceNotificationDispatcherTest {
 
     @Override
     protected ResourceNotificationDispatcher initWatcher() throws Exception {
@@ -66,10 +64,7 @@ public Object answer() throws Throwable {
 
         replay(cluster, topic, hz, hzCluster);
 
-        resourceWatcher = new HzResourceNotificationDispatcher();
-        resourceWatcher.setCluster(hzCluster);
-        resourceWatcher.afterPropertiesSet();
-        return resourceWatcher;
+        return new HzResourceNotificationDispatcher(hzCluster);
     }
 
 }

src/platform/src/test/java/org/geoserver/platform/resource/AbstractResourceWatcherTest.java → src/platform/src/test/java/org/geoserver/platform/resource/AbstractResourceNotificationDispatcherTest.java

@@ -21,7 +21,7 @@
  * @author Niels Charlier
  *
  */
-public abstract class AbstractResourceWatcherTest {
+public abstract class AbstractResourceNotificationDispatcherTest {
 
     protected FileSystemResourceStore store;
     protected ResourceNotificationDispatcher watcher;

src/platform/src/test/java/org/geoserver/platform/resource/SimpleResourceNotificationDispatcherTest.java

@@ -19,7 +19,7 @@
  * @author Niels Charlier
  *
  */
-public class SimpleResourceNotificationDispatcherTest extends AbstractResourceWatcherTest {       
+public class SimpleResourceNotificationDispatcherTest extends AbstractResourceNotificationDispatcherTest {       
 
     @Override
     protected ResourceNotificationDispatcher initWatcher() {