[GEOS-8039] Fix JMS plugin styles workspaces change handling

src/community/jms-cluster/jms-geoserver/src/main/java/org/geoserver/cluster/impl/handlers/catalog/JMSCatalogModifyEventHandler.java

@@ -5,6 +5,7 @@
  */
 package org.geoserver.cluster.impl.handlers.catalog;
 
+import java.io.ByteArrayInputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
@@ -31,6 +32,8 @@
 import org.geoserver.cluster.impl.utils.BeanUtils;
 
 import com.thoughtworks.xstream.XStream;
+import org.geoserver.cluster.server.events.StyleModifyEvent;
+import org.geotools.renderer.style.Style;
 
 /**
  * 
@@ -288,6 +291,24 @@ protected static void modify(final Catalog catalog,
 
 			BeanUtils.smartUpdate(localObject, modifyEv.getPropertyNames(),
 					modifyEv.getNewValues());
+
+			// let's if the style file was provided
+			if (modifyEv instanceof StyleModifyEvent) {
+				StyleModifyEvent styleModifyEvent = (StyleModifyEvent) modifyEv;
+				byte[] fileContent = styleModifyEvent.getFile();
+				if (fileContent != null && fileContent.length != 0) {
+					// update the style file using the old style
+					StyleInfo oldStyle = catalog.getStyleByName(name);
+					try {
+						catalog.getResourcePool().writeStyle(oldStyle, new ByteArrayInputStream(fileContent));
+					} catch (Exception exception) {
+						throw new RuntimeException(String.format(
+								"Error writing style '%s' file.", localObject.getName()), exception);
+					}
+				}
+			}
+
+			// update the style in the catalog
 			catalog.save(localObject);
 
 		} else if (info instanceof WorkspaceInfo) {

src/community/jms-cluster/jms-geoserver/src/main/java/org/geoserver/cluster/server/JMSCatalogListener.java

@@ -5,7 +5,9 @@
  */
 package org.geoserver.cluster.server;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.OutputStream;
 import java.util.Properties;
 
 import javax.jms.JMSException;
@@ -20,15 +22,20 @@
 import org.geoserver.catalog.event.CatalogModifyEvent;
 import org.geoserver.catalog.event.CatalogPostModifyEvent;
 import org.geoserver.catalog.event.CatalogRemoveEvent;
+import org.geoserver.catalog.impl.ModificationProxy;
 import org.geoserver.cluster.JMSApplicationListener;
 import org.geoserver.cluster.JMSPublisher;
 import org.geoserver.cluster.impl.handlers.DocumentFile;
+import org.geoserver.cluster.impl.utils.BeanUtils;
+import org.geoserver.cluster.server.events.StyleModifyEvent;
+import org.geoserver.config.GeoServerDataDirectory;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.platform.GeoServerResourceLoader;
-import org.geoserver.platform.resource.Paths;
 import org.geoserver.platform.resource.Resource;
 import org.geoserver.platform.resource.Resource.Type;
 import org.geoserver.platform.resource.Resources;
+import org.geoserver.util.IOUtils;
+import org.geotools.data.Base64;
 import org.geotools.util.logging.Logging;
 
 /**
@@ -166,33 +173,58 @@ public void handleModifyEvent(CatalogModifyEvent event) throws CatalogException
         // update properties
         Properties options = getProperties();
 
-        try {
-            // check if we may publish also the file
-            GeoServerResourceLoader loader = GeoServerExtensions.bean(GeoServerResourceLoader.class);
-            final CatalogInfo info = event.getSource();
-            if (info instanceof StyleInfo) {
-                // build local datadir file style path
-                Resource styleFile = loader.get("styles").get(((StyleInfo) info).getFilename());
+        // check if we may publish also the file
+        CatalogInfo info = event.getSource();
 
-                if (!Resources.exists(styleFile)) {
-                    final String workspace = ((StyleInfo) info).getWorkspace().getName();
-                    styleFile = loader.get(Paths.path("workspaces", workspace, "styles",
-                            ((StyleInfo) info).getFilename()));
+        // if the modified object was a style we need to send the style file too
+        if (info instanceof StyleInfo) {
+            // we need to get the associated resource file, for this we need to look
+            // at the final object we use a proxy to preserver the original object
+            StyleInfo styleInfo = ModificationProxy.create((StyleInfo) info, StyleInfo.class);
+            // updated the proxy object with the new values
+            try {
+                BeanUtils.smartUpdate(styleInfo, event.getPropertyNames(), event.getNewValues());
+            } catch (Exception exception) {
+                // there is nothing we can do about this
+                throw new RuntimeException(String.format(
+                        "Error setting proxy of style '%s' new values.",
+                        styleInfo.getName()), exception);
+            }
+            // get style associated resource
+            GeoServerDataDirectory dataDirectory = GeoServerExtensions.bean(GeoServerDataDirectory.class);
+            Resource resource = dataDirectory.get(styleInfo, styleInfo.getFilename());
+            if (!resource.file().exists()) {
+                // this should not happen we throw an exception
+                throw new RuntimeException(String.format(
+                        "Style file '%s' for style '%s' could not be found.",
+                        styleInfo.getFilename(), styleInfo.getName()));
+            }
+            try {
+                // read the style file to an array of bytes
+                ByteArrayOutputStream output = new ByteArrayOutputStream();
+                try {
+                    IOUtils.copy(resource.in(), output);
+                } catch (Exception exception) {
+                    throw new RuntimeException(String.format(
+                            "Error reading style '%s' file '%s'.",
+                            styleInfo.getName(), resource.file().getAbsolutePath()), exception);
                 }
-
-                // publish the style xml document
-                jmsPublisher.publish(getTopic(), getJmsTemplate(), options, new DocumentFile(styleFile));
+                // publish the style event
+                jmsPublisher.publish(getTopic(), getJmsTemplate(), options, new StyleModifyEvent(event, output.toByteArray()));
+            } catch (Exception exception) {
+                throw new RuntimeException(String.format(
+                        "Error publishing file associated with style '%s'.",
+                        styleInfo.getName()), exception);
             }
-
-            // propagate the event
-            jmsPublisher.publish(getTopic(), getJmsTemplate(), options, event);
-
-        } catch (Exception e) {
-            if (LOGGER.isLoggable(java.util.logging.Level.SEVERE)) {
-                LOGGER.severe(e.getLocalizedMessage());
+        } else {
+            // propagate the catalog modified event
+            try {
+                jmsPublisher.publish(getTopic(), getJmsTemplate(), options, event);
+            } catch (Exception exception) {
+                throw new RuntimeException(String.format(
+                        "Error publishing catalog modified event of type '%s'.",
+                        info.getClass().getSimpleName()), exception);
             }
-            final CatalogException ex = new CatalogException(e);
-            throw ex;
         }
     }
 

src/community/jms-cluster/jms-geoserver/src/main/java/org/geoserver/cluster/server/events/StyleModifyEvent.java

@@ -0,0 +1,48 @@
+/* (c) 2017 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ */
+package org.geoserver.cluster.server.events;
+
+import org.geoserver.catalog.CatalogInfo;
+import org.geoserver.catalog.event.CatalogModifyEvent;
+
+import java.util.List;
+
+/**
+ * Catalog modify event for styles that include the style file as an array of bytes.
+ */
+public class StyleModifyEvent implements CatalogModifyEvent {
+
+    private final CatalogModifyEvent event;
+    private final byte[] file;
+
+    public StyleModifyEvent(CatalogModifyEvent event, byte[] file) {
+        this.event = event;
+        this.file = file;
+    }
+
+    @Override
+    public CatalogInfo getSource() {
+        return event.getSource();
+    }
+
+    @Override
+    public List<String> getPropertyNames() {
+        return event.getPropertyNames();
+    }
+
+    @Override
+    public List<Object> getOldValues() {
+        return event.getOldValues();
+    }
+
+    @Override
+    public List<Object> getNewValues() {
+        return event.getNewValues();
+    }
+
+    public byte[] getFile() {
+        return file;
+    }
+}