[GEOS-8237] UI page table contents get ruined once page is serialized…

… and read back
geoserver · Jul 28, 2017 · 087759e · 087759e
1 parent 15eff2c
commit 087759e
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 18 deletions.
diff --git a/...dyndimension/src/main/java/org/geoserver/web/data/resource/DynamicDimensionsTabPanel.java b/...dyndimension/src/main/java/org/geoserver/web/data/resource/DynamicDimensionsTabPanel.java
@@ -28,6 +28,7 @@
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.repeater.ReuseIfModelsEqualStrategy;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.IValidator;
@@ -158,8 +159,13 @@ class Editor extends FormComponentPanel<DefaultValueConfigurations> {
         public Editor(String id, final Collection<String> enabledDimensionNames,
                 IModel<DefaultValueConfigurations> model) {
             super(id, model);
-            List<Property<DefaultValueConfiguration>> properties = Arrays.asList(DIMENSION, POLICY,
+            IModel<List<Property<DefaultValueConfiguration>>> properties = new LoadableDetachableModel<List<Property<DefaultValueConfiguration>>>() {
-                    DEFAULT_VALUE_EXPRESSION);
+
+                @Override
+                protected List<Property<DefaultValueConfiguration>> load() {
+                    return Arrays.asList(DIMENSION, POLICY, DEFAULT_VALUE_EXPRESSION);
+                }
+            };
 
             table = new ReorderableTablePanel<DefaultValueConfiguration>("defaultConfigs",
                     configurations, properties) {

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layergroup/LayerGroupEntryPanel.java b/src/web/core/src/main/java/org/geoserver/web/data/layergroup/LayerGroupEntryPanel.java
@@ -21,6 +21,7 @@
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.DefaultItemReuseStrategy;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.resource.PackageResourceReference;
 import org.geoserver.catalog.LayerGroupInfo;
@@ -46,19 +47,19 @@ public class LayerGroupEntryPanel extends Panel {
 
     private static final long serialVersionUID = -5483938812185582866L;
 
-    public static Property<LayerGroupEntry> LAYER = new PropertyPlaceholder<LayerGroupEntry>(
+    public static final Property<LayerGroupEntry> LAYER = new PropertyPlaceholder<LayerGroupEntry>(
             "layer");
 
-    public static Property<LayerGroupEntry> DEFAULT_STYLE = new PropertyPlaceholder<LayerGroupEntry>(
+    public static final Property<LayerGroupEntry> DEFAULT_STYLE = new PropertyPlaceholder<LayerGroupEntry>(
             "defaultStyle");
 
-    public static Property<LayerGroupEntry> STYLE = new PropertyPlaceholder<LayerGroupEntry>(
+    public static final Property<LayerGroupEntry> STYLE = new PropertyPlaceholder<LayerGroupEntry>(
             "style");
 
-    public static Property<LayerGroupEntry> REMOVE = new PropertyPlaceholder<LayerGroupEntry>(
+    public static final Property<LayerGroupEntry> REMOVE = new PropertyPlaceholder<LayerGroupEntry>(
             "remove");
 
-    static List<Property<LayerGroupEntry>> PROPERTIES = Arrays.asList(LAYER, DEFAULT_STYLE, STYLE, REMOVE);
+    static final List<Property<LayerGroupEntry>> PROPERTIES = Arrays.asList(LAYER, DEFAULT_STYLE, STYLE, REMOVE);
 
     ModalWindow popupWindow;
     GeoServerTablePanel<LayerGroupEntry> layerTable;
@@ -79,8 +80,16 @@ public LayerGroupEntryPanel( String id, LayerGroupInfo layerGroup, IModel<Worksp
         add(dialog = new GeoServerDialog("dialog"));
         add(new HelpLink("layersHelp").setDialog(dialog));
 
-        //layers
+        // make sure we don't end up serializing the list, but get it fresh from the dataProvider, 
-        add(layerTable = new ReorderableTablePanel<LayerGroupEntry>("layers", items, PROPERTIES) {
+        // to avoid serialization issues seen in GEOS-8273
+        LoadableDetachableModel<List<Property<LayerGroupEntry>>> propertiesModel = new LoadableDetachableModel<List<Property<LayerGroupEntry>>>() {
+            @Override
+            protected List<Property<LayerGroupEntry>> load() {
+                return PROPERTIES;
+            }
+        };
+        // layers
+        add(layerTable = new ReorderableTablePanel<LayerGroupEntry>("layers", items, propertiesModel) {
 
             private static final long serialVersionUID = -3270471094618284639L;
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerTablePanel.java b/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerTablePanel.java
@@ -35,6 +35,7 @@
 import org.apache.wicket.markup.repeater.ReuseIfModelsEqualStrategy;
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.ResourceModel;
@@ -208,8 +209,18 @@ protected void populateItem(ListItem<Property<T>> item) {
 
     protected void buildRowListView(final GeoServerDataProvider<T> dataProvider, Item<T> item,
             final IModel<T> itemModel) {
+        // make sure we don't serialize the list, but get it fresh from the dataProvider, 
+        // to avoid serialization issues seen in GEOS-8273
+        IModel propertyList = new LoadableDetachableModel() {
+
+            @Override
+            protected Object load() {
+                return dataProvider.getVisibleProperties();
+            }
+
+        };
         // create one component per viewable property
-        ListView<Property<T>> items = new ListView<Property<T>>("itemProperties", dataProvider.getVisibleProperties()) {
+        ListView<Property<T>> items = new ListView<Property<T>>("itemProperties", propertyList) {
 
             private static final long serialVersionUID = -4552413955986008990L;
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/ReorderableTablePanel.java b/src/web/core/src/main/java/org/geoserver/web/wicket/ReorderableTablePanel.java
@@ -18,6 +18,7 @@
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.OddEvenItem;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.geoserver.web.data.layergroup.LayerGroupEntry;
 import org.geoserver.web.wicket.GeoServerDataProvider.Property;
@@ -47,19 +48,30 @@ static class ReorderableDataProvider<T> extends GeoServerDataProvider<T> {
 
         private List<T> items;
 
-        private List<org.geoserver.web.wicket.GeoServerDataProvider.Property<T>> properties;
+        private IModel<List<org.geoserver.web.wicket.GeoServerDataProvider.Property<T>>> properties;
 
         @SuppressWarnings("unchecked")
-        public ReorderableDataProvider(List<T> items, List<Property<T>> properties) {
+        public ReorderableDataProvider(List<T> items, IModel<List<Property<T>>> properties) {
             this.items = items;
-            this.properties = new ArrayList<Property<T>>(properties);
+            // make sure we don't serialize the list, but get it fresh from the dataProvider, 
-            this.properties.add(0, (Property<T>) POSITION);
+            // to avoid serialization issues seen in GEOS-8273
-            this.properties.add(0, (Property<T>) RENDERING_ORDER);
+            this.properties = new LoadableDetachableModel<List<Property<T>>>() {
+
+                @Override
+                protected List<Property<T>> load() {
+                    List result = new ArrayList<Property<T>>(properties.getObject());
+                    result.add(0, (Property<T>) POSITION);
+                    result.add(0, (Property<T>) RENDERING_ORDER);
+                    return result;
+                }
+
+            };
+
         }
 
         @Override
         protected List<Property<T>> getProperties() {
-            return properties;
+            return properties.getObject();
         }
 
         @Override
@@ -76,9 +88,19 @@ protected List<T> getItems() {
     static Property<?> POSITION = new PropertyPlaceholder<Object>("position");
 
     static Property<?> RENDERING_ORDER = new PropertyPlaceholder<Object>("order");
-
+
+    /**
+     * Deprecated, provide a loadable model for properties instead which ensures always the 
+     * same exact property objects are returned (or use equality by name in the getComponentForProperty method)
+     */
     @SuppressWarnings("serial")
+    @Deprecated
     public ReorderableTablePanel(String id, List<T> items, List<Property<T>> properties) {
+        this(id, items, Model.ofList(properties));
+    }
+
+    @SuppressWarnings("serial")
+    public ReorderableTablePanel(String id, List<T> items, IModel<List<Property<T>>> properties) {
         super(id, new ReorderableDataProvider<T>(items, properties));
         this.setOutputMarkupId(true);
         this.add(new WebTheme());
@@ -110,7 +132,14 @@ public void onDrop(AjaxRequestTarget target, Transfer transfer, Location locatio
     @Override
     protected void buildRowListView(GeoServerDataProvider<T> dataProvider, Item<T> item, IModel<T> itemModel) {
         // create one component per viewable property
-        ListView<Property<T>> items = new ListView<Property<T>>("itemProperties", dataProvider.getVisibleProperties()) {
+        IModel propertyList = new LoadableDetachableModel() {
+
+            @Override
+            protected Object load() {
+                return dataProvider.getVisibleProperties();
+            }
+        };
+        ListView<Property<T>> items = new ListView<Property<T>>("itemProperties", propertyList) {
 
             private static final long serialVersionUID = -7089826211241039856L;