Restore ConversionException where needed

geoserver · Apr 23, 2018 · f13763a · f13763a
1 parent ff00fe9
commit f13763a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/DecimalListConverter.java b/src/web/core/src/main/java/org/geoserver/web/wicket/DecimalListConverter.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.wicket.util.convert.UnconvertibleException;
+import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 
 /**
@@ -22,7 +22,7 @@ public class DecimalListConverter implements IConverter<List<Double>> {
 
     @Override
     public List<Double> convertToObject(String value, Locale locale)
-            throws UnconvertibleException {
+            throws ConversionException {
         List<Double> result = new ArrayList<>();
         if(value != null && !"-".equals(value.trim())) {
             String[] values = value.split("\\s+");

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/GeometryTextArea.java b/src/web/core/src/main/java/org/geoserver/web/wicket/GeometryTextArea.java
@@ -10,7 +10,7 @@
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.UnconvertibleException;
+import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 
 import com.vividsolutions.jts.geom.Coordinate;
@@ -78,7 +78,7 @@ public Object convertToObject(String value, Locale locale) {
                     // fall through
                 }
 
-                UnconvertibleException ce = new UnconvertibleException(e.getMessage());
+                ConversionException ce = new ConversionException(e.getMessage());
                 ce.setResourceKey(GeometryTextArea.class.getSimpleName() + ".parseError");
                 throw ce;
             }

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/FloatParameterFilterSubform.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/FloatParameterFilterSubform.java
@@ -17,7 +17,7 @@
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.convert.UnconvertibleException;
+import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 import org.geowebcache.filter.parameters.FloatParameterFilter;
 
@@ -40,7 +40,7 @@ public Float convertToObject(String value, Locale locale) {
             try {
                 return Float.parseFloat(value);
             } catch (NumberFormatException ex) {
-                throw new UnconvertibleException(ex)
+                throw new ConversionException(ex)
                 .setConverter(this)
                 .setLocale(locale)
                 .setTargetType(Float.class)

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/IntegerParameterFilterSubform.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/IntegerParameterFilterSubform.java
@@ -17,7 +17,7 @@
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.convert.UnconvertibleException;
+import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 import org.geowebcache.filter.parameters.IntegerParameterFilter;
 
@@ -40,7 +40,7 @@ public Integer convertToObject(String value, Locale locale) {
             try {
                 return Integer.parseInt(value);
             } catch (NumberFormatException ex) {
-                throw new UnconvertibleException(ex)
+                throw new ConversionException(ex)
                 .setConverter(this)
                 .setLocale(locale)
                 .setTargetType(Integer.class)

diff --git a/...urity/core/src/main/java/org/geoserver/security/web/auth/CommaSeparatedListConverter.java b/...urity/core/src/main/java/org/geoserver/security/web/auth/CommaSeparatedListConverter.java
@@ -9,7 +9,7 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import org.apache.wicket.util.convert.UnconvertibleException;
+import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 
 /**
@@ -21,7 +21,7 @@ public class CommaSeparatedListConverter implements IConverter<List<String>> {
     private static final long serialVersionUID = -2772030358671687777L;
 
     @Override
-    public List<String> convertToObject(String value, Locale locale) throws UnconvertibleException {
+    public List<String> convertToObject(String value, Locale locale) throws ConversionException {
         String[] split = value.split("\\s*,\\s*");
         final ArrayList list = new ArrayList<>();
         // Need to return an implementation of List<String> that isn't private.