Fix and Genericize feature-aggregate extension web packages

geoserver · Jan 19, 2016 · 92e6278 · 92e6278
1 parent 2f2faad
commit 92e6278
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 41 deletions.
diff --git a/...re-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/AbstractConfigPage.java b/...re-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/AbstractConfigPage.java
@@ -118,7 +118,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                 "sourceTypes", new SourceTypeProvider(configModel)) {
 
             @Override
-            protected Component getComponentForProperty(String id, IModel itemModel,
+            protected Component getComponentForProperty(String id, IModel<SourceType> itemModel,
                     Property<SourceType> property) {
                 if(property.getName().equals("default")) {
                     return new Label(id, property.getModel(itemModel));

diff --git a/...gregate/src/main/java/org/geoserver/web/data/store/aggregate/AggregateStoreEditPanel.java b/...gregate/src/main/java/org/geoserver/web/data/store/aggregate/AggregateStoreEditPanel.java
@@ -1,4 +1,4 @@
-/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -14,11 +14,12 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Logger;
+import java.util.Map;
-
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.IAjaxCallListener;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
@@ -37,7 +38,6 @@
 import org.geoserver.web.wicket.SimpleAjaxLink;
 import org.geotools.data.aggregate.AggregateTypeConfiguration;
 import org.geotools.data.aggregate.AggregatingDataStoreFactory;
-import org.geotools.util.logging.Logging;
 
 /**
  * Provides the form components for the shapefile datastore
@@ -47,27 +47,26 @@
 @SuppressWarnings("serial")
 public class AggregateStoreEditPanel extends StoreEditPanel {
 
-    private static final Logger LOGGER = Logging.getLogger(AggregateStoreEditPanel.class);
     private List<AggregateTypeConfiguration> configs;
     private GeoServerTablePanel<AggregateTypeConfiguration> configTable;
     private ConfigModel configModel;
 
-    public AggregateStoreEditPanel(final String componentId, final Form storeEditForm) {
+    public AggregateStoreEditPanel(final String componentId, final Form<?> storeEditForm) {
         super(componentId, storeEditForm);
 
-        final IModel model = storeEditForm.getModel();
+        final IModel<?> model = storeEditForm.getModel();
         setDefaultModel(model);
 
-        final IModel paramsModel = new PropertyModel(model, "connectionParameters");
+        final IModel<Map<String, Object>> paramsModel = new PropertyModel<Map<String, Object>>(model, "connectionParameters");
-        new MapModel(paramsModel, CONFIGURATION.key).setObject(null);
+        new MapModel<Object>(paramsModel, CONFIGURATION.key).setObject(null);
 
-        add(new TextParamPanel("parallelism", new MapModel(paramsModel, PARALLELISM.key),
+        add(new TextParamPanel("parallelism", new MapModel<Object>(paramsModel, PARALLELISM.key),
                 new ParamResourceModel("parallelism", this), true));
 
-        add(new CheckBoxParamPanel("tolerateErrors", new MapModel(paramsModel,
+        add(new CheckBoxParamPanel("tolerateErrors", new MapModel<Object>(paramsModel,
                 TOLERATE_CONNECTION_FAILURE.key), new ParamResourceModel("tolerateErrors", this)));
 
-        configModel = new ConfigModel(new MapModel(paramsModel, CONFIGURATION_XML.key));
+        configModel = new ConfigModel(new MapModel<String>(paramsModel, CONFIGURATION_XML.key));
         configs = configModel.getObject();
         if(configs == null) {
             configs = new ArrayList<AggregateTypeConfiguration>();
@@ -77,7 +76,7 @@ public AggregateStoreEditPanel(final String componentId, final Form storeEditFor
                 "configTable", new ConfigurationListProvider(configs)) {
 
             @Override
-            protected Component getComponentForProperty(String id, IModel itemModel,
+            protected Component getComponentForProperty(String id, IModel<AggregateTypeConfiguration> itemModel,
                     Property<AggregateTypeConfiguration> property) {
                 if (property == ConfigurationListProvider.NAME) {
                     return editLink(id, itemModel);
@@ -109,8 +108,8 @@ public void onClick(AjaxRequestTarget target) {
         return link;
     }
 
-    protected Component editLink(String id, IModel itemModel) {
+    protected Component editLink(String id, IModel<AggregateTypeConfiguration> itemModel) {
-        SimpleAjaxLink link = new SimpleAjaxLink(id, itemModel, new PropertyModel<String>(itemModel, "name")) {
+        SimpleAjaxLink<?> link = new SimpleAjaxLink<AggregateTypeConfiguration>(id, itemModel, new PropertyModel<String>(itemModel, "name")) {
 
             @Override
             protected void onClick(AjaxRequestTarget target) {
@@ -120,25 +119,24 @@ protected void onClick(AjaxRequestTarget target) {
         return link;
     }
 
-    Component removeLink(String id, IModel itemModel) {
+    Component removeLink(String id, IModel<AggregateTypeConfiguration> itemModel) {
         final AggregateTypeConfiguration entry = (AggregateTypeConfiguration) itemModel.getObject();
-        ImageAjaxLink link = new ImageAjaxLink( id, new PackageResourceReference( GeoServerApplication.class, "img/icons/silk/delete.png") ) {
+        ImageAjaxLink<?> link = new ImageAjaxLink<Object>( id, new PackageResourceReference( GeoServerApplication.class, "img/icons/silk/delete.png") ) {
             @Override
             protected void onClick(AjaxRequestTarget target) {
 
                 configs.remove( entry );
                 target.add( configTable );
             }
 
-            @Override
+            protected IAjaxCallListener getAjaxCallListener() {
-            protected IAjaxCallDecorator getAjaxCallListener() {
+                return new AjaxCallListener() {
-                return new AjaxPreprocessingCallDecorator(null) {
 
                     @Override
-                    public CharSequence preDecorateScript(CharSequence script) {
+                    public CharSequence getBeforeHandler(Component component) {
                         String msg = new ParamResourceModel("confirmTypeRemoval", 
                                 AggregateStoreEditPanel.this, entry.getName()).getString();
-                        return "if(!confirm('" + msg +"')) return false;" + script;
+                        return "if(!confirm('" + msg +"')) return false;";
                     }
                 };
             }
@@ -154,9 +152,9 @@ public boolean onSave() {
     }
 
     class ConfigModel implements IModel<List<AggregateTypeConfiguration>> {
-        IModel model;
+        IModel<String> model;
 
-        public ConfigModel(IModel model) {
+        public ConfigModel(IModel<String> model) {
             this.model = model;
         }
 

diff --git a/...eature-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/ConfigEditPage.java b/...eature-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/ConfigEditPage.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -10,6 +10,8 @@
 
 public class ConfigEditPage extends AbstractConfigPage {
 
+    private static final long serialVersionUID = -5309182299077598971L;
+
     public ConfigEditPage(AggregateStoreEditPanel master, AggregateTypeConfiguration config) {
         super(master);
         initUI(config);

diff --git a/...feature-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/ConfigNewPage.java b/...feature-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/ConfigNewPage.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -10,6 +10,8 @@
 
 public class ConfigNewPage extends AbstractConfigPage {
 
+    private static final long serialVersionUID = 4059243636202134036L;
+
     public ConfigNewPage(AggregateStoreEditPanel master) {
         super(master);
         initUI(new AggregateTypeConfiguration(""));

diff --git a/...egate/src/main/java/org/geoserver/web/data/store/aggregate/ConfigurationListProvider.java b/...egate/src/main/java/org/geoserver/web/data/store/aggregate/ConfigurationListProvider.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -22,21 +22,25 @@ class ConfigurationListProvider extends GeoServerDataProvider<AggregateTypeConfi
     public static Property<AggregateTypeConfiguration> SOURCES = new AbstractProperty<AggregateTypeConfiguration>(
             "sources") {
 
-        public IModel getModel(final IModel itemModel) {
+        private static final long serialVersionUID = 8445881898430736063L;
-            return new IModel() {
+
+        public IModel<AggregateTypeConfiguration> getModel(final IModel<AggregateTypeConfiguration> itemModel) {
+            return new IModel<AggregateTypeConfiguration>() {
+
+                private static final long serialVersionUID = -1612531825990914783L;
 
                 @Override
                 public void detach() {
                     // nothing to do                    
                 }
 
                 @Override
-                public Object getObject() {
+                public AggregateTypeConfiguration getObject() {
-                    return getPropertyValue((AggregateTypeConfiguration) itemModel.getObject());
+                    return (AggregateTypeConfiguration) getPropertyValue( itemModel.getObject());
                 }
 
                 @Override
-                public void setObject(Object object) {
+                public void setObject(AggregateTypeConfiguration object) {
                     // read only                    
                 }
             };
@@ -61,7 +65,7 @@ public Object getPropertyValue(AggregateTypeConfiguration item) {
     public static Property<AggregateTypeConfiguration> REMOVE = 
         new PropertyPlaceholder<AggregateTypeConfiguration>( "remove" );
 
-    static List PROPERTIES = Arrays.asList(NAME, SOURCES, REMOVE);
+    static List<org.geoserver.web.wicket.GeoServerDataProvider.Property<AggregateTypeConfiguration>> PROPERTIES = Arrays.asList(NAME, SOURCES, REMOVE);
 
     List<AggregateTypeConfiguration> items;
 

diff --git a/...re-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/SourceTypeProvider.java b/...re-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/SourceTypeProvider.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -22,9 +22,9 @@ class SourceTypeProvider extends GeoServerDataProvider<SourceType> {
 
     public Property<SourceType> TYPE = new BeanProperty<SourceType>("typeName", "typeName");
 
-    public Property<SourceType> MAKE_DEFAULT = new PropertyPlaceholder("makeDefault");
+    public Property<SourceType> MAKE_DEFAULT = new PropertyPlaceholder<SourceType>("makeDefault");
 
-    public Property<SourceType> REMOVE = new PropertyPlaceholder("remove");
+    public Property<SourceType> REMOVE = new PropertyPlaceholder<SourceType>("remove");
 
     IModel<AggregateTypeConfiguration> config;
 
@@ -50,6 +50,7 @@ public DefaultSourceTypeProperty getDefaultSourceTypeProperty() {
     }
 
     static final class DefaultSourceTypeProperty extends AbstractProperty<SourceType> {
+        private static final long serialVersionUID = 7215317236941087113L;
         IModel<AggregateTypeConfiguration> config;
 
         public DefaultSourceTypeProperty(String name, IModel<AggregateTypeConfiguration> config) {
@@ -58,8 +59,7 @@ public DefaultSourceTypeProperty(String name, IModel<AggregateTypeConfiguration>
         }
 
         @Override
-        public IModel getModel(IModel itemModel) {
+        public IModel<SourceType> getModel(IModel<SourceType> itemModel) {
-            // TODO Auto-generated method stub
             return super.getModel(itemModel);
         }
 
@@ -71,6 +71,8 @@ public Comparator<SourceType> getComparator() {
         public Object getPropertyValue(final SourceType item) {
             return new IModel<Boolean>() {
 
+                private static final long serialVersionUID = 335379699073989386L;
+
                 @Override
                 public void detach() {
                 }

diff --git a/...ature-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/SourcesProvider.java b/...ature-aggregate/src/main/java/org/geoserver/web/data/store/aggregate/SourcesProvider.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -19,6 +19,8 @@ class SourcesProvider extends GeoServerDataProvider<Map.Entry<Name, String>> {
     public static Property<Map.Entry<Name, String>> NAME = new AbstractProperty<Map.Entry<Name, String>>(
             "store") {
 
+        private static final long serialVersionUID = -4599279831041684940L;
+
         @Override
         public Object getPropertyValue(Entry<Name, String> item) {
             return item.getKey();
@@ -28,13 +30,15 @@ public Object getPropertyValue(Entry<Name, String> item) {
     public static Property<Map.Entry<Name, String>> TYPE = new AbstractProperty<Map.Entry<Name, String>>(
             "type") {
 
+        private static final long serialVersionUID = -2038898684200579478L;
+
         @Override
         public Object getPropertyValue(Map.Entry<Name, String> item) {
             return item.getValue();
         }
     };
 
-    static List PROPERTIES = Arrays.asList(NAME, TYPE);
+    static List<Property<Entry<Name, String>>> PROPERTIES = Arrays.asList(NAME, TYPE);
 
     List<Map.Entry<Name, String>> items;