Fix generic issue GeoServerDataProvider

geoserver · Jan 22, 2016 · 347fae0 · 347fae0
1 parent c809265
commit 347fae0
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerDataProvider.java b/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerDataProvider.java
@@ -42,8 +42,9 @@
  * 
  * @param <T>
  */
-@SuppressWarnings("serial")
 public abstract class GeoServerDataProvider<T> extends SortableDataProvider<T, Object> {
+    private static final long serialVersionUID = -6876929036365601443L;
+
     static final Logger LOGGER = Logging.getLogger(GeoServerDataProvider.class);
 
     /**
@@ -387,8 +388,9 @@ protected Filter getFilter() {
      * @param object
      * @return
      */
+    @SuppressWarnings("unchecked")
     protected IModel<T> newModel(T object) {
-        return new Model((Serializable) object);
+        return (IModel<T>) new Model<Serializable>((Serializable) object);
     }
 
     /**
@@ -444,6 +446,7 @@ public interface Property<T> extends Serializable {
      * the getModel() method
      */
     public abstract static class AbstractProperty<T> implements Property<T> {
+        private static final long serialVersionUID = 6286992721731224988L;
         String name;
         boolean visible;
 
@@ -465,13 +468,12 @@ public Comparator<T> getComparator() {
          * not suitable for editable tables, if you need to make one you'll have to
          * roll your own getModel() implementation ( {@link BeanProperty} provides a good example)
          */
-        @SuppressWarnings("unchecked")
-		public IModel<T> getModel(IModel<T> itemModel) {
+        public IModel<?> getModel(IModel<T> itemModel) {
             Object value = getPropertyValue((T) itemModel.getObject());
             if(value instanceof IModel) {
-                return (IModel<T>) value;
+                return (IModel<?>) value;
             } else {
-                return new Model((Serializable) value);
+                return new Model<Serializable>((Serializable) value);
             }
         }
 
@@ -501,6 +503,7 @@ public boolean isSearchable() {
      * @param <T>
      */
     public static class BeanProperty<T> extends AbstractProperty<T> {
+        private static final long serialVersionUID = 5532661316457341748L;
         String propertyPath;
 
         public BeanProperty(String key, String propertyPath) {
@@ -556,6 +559,7 @@ public String toString() {
      * @param <T>
      */
     public static class PropertyPlaceholder<T> implements Property<T> {
+        private static final long serialVersionUID = -6605207892648199453L;
         String name;
 
         public PropertyPlaceholder(String name) {
@@ -607,9 +611,10 @@ public PropertyComparator(Property<T> property) {
             this.property = property;
         }
 
+        @SuppressWarnings("unchecked")
         public int compare(T o1, T o2) {
-            Comparable p1 = (Comparable) property.getPropertyValue(o1);
-            Comparable p2 = (Comparable) property.getPropertyValue(o2);
+            Comparable<Object> p1 = (Comparable<Object>) property.getPropertyValue(o1);
+            Comparable<Object> p2 = (Comparable<Object>) property.getPropertyValue(o2);
 
             // what if any property is null? We assume null < (not null)
             if (p1 == null)