Fix errors in conversion at c1aabb9

I'd failed to realise those were resource keys.
geoserver · Jan 17, 2016 · 4cc69f7 · 4cc69f7
1 parent 89190cf
commit 4cc69f7
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 35 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java
@@ -203,10 +203,10 @@ public void validate(IValidatable validatable) {
                 StoredQueryConfiguration config = curr.getMetadata().get(FeatureTypeInfo.STORED_QUERY_CONFIGURATION, StoredQueryConfiguration.class);
                 if(config != null) {
                     if(curr.getNativeName().equals(csqName)) {
-                        Map<String, String> map = new HashMap<String, String>();
+                        Map<String, Object> map = new HashMap<>();
                         map.put("name", csqName);
                         map.put("dataStore", store.getName());
-                        IValidationError err = new ValidationError("duplicateSqlViewName: " + csqName);
+                        IValidationError err = new ValidationError("duplicateSqlViewName").setVariables(map);
                         validatable.error(err);
                         return;
                     }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java
@@ -202,10 +202,10 @@ public void validate(IValidatable validatable) {
                 if (currvc != null) {
                     if (coverageInfoId == null || !coverageInfoId.equals(curr.getId())) {
                         if (currvc.getName().equals(vcName) && newCoverage) {
-                            Map<String, String> map = new HashMap<String, String>();
+                            Map<String, Object> map = new HashMap<>();
                             map.put("name", vcName);
                             map.put("coverageName", curr.getName());
-                            IValidationError err = new ValidationError("duplicateCoverageViewName:" + vcName);
+                            IValidationError err = new ValidationError("duplicateCoverageViewName").setVariables(map);
                             validatable.error(err);
                             return;
                         }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layergroup/LayerGroupEditPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layergroup/LayerGroupEditPage.java
@@ -246,7 +246,7 @@ public void validate(IValidatable<String> validatable) {
                 String name = validatable.getValue();
                 LayerGroupInfo other = getCatalog().getLayerGroupByName(name);
                 if(other != null && (isNew || !other.getId().equals(getPublishedInfo().getId()))) {
-                    IValidationError err = new ValidationError("duplicateGroupNameError" + Collections.singletonMap("name", (Object) name));
+                    IValidationError err = new ValidationError("duplicateGroupNameError").setVariable("name", name);
                     validatable.error(err);
                 }
             }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/resource/DataLinkEditor.java b/src/web/core/src/main/java/org/geoserver/web/data/resource/DataLinkEditor.java
@@ -140,7 +140,7 @@ public void validate(IValidatable<String> validatable) {
                 try {
                     DataLinkInfoImpl.validate(url);
                 } catch (IllegalArgumentException ex) {
-                    IValidationError err = new ValidationError("invalidDataLinkURL:" + url);
+                    IValidationError err = new ValidationError("invalidDataLinkURL").setVariable("url", url);
                     validatable.error(err);
                 }
             }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/resource/DimensionEditor.java b/src/web/core/src/main/java/org/geoserver/web/data/resource/DimensionEditor.java
@@ -464,25 +464,18 @@ else if (dimension.equals("time")) {
                     if (strategyModel.getObject() == Strategy.NEAREST) {
                         if (!DimensionDefaultValueSetting.TIME_CURRENT.equalsIgnoreCase(value
                                 .getValue())) {
-                            IValidationError err = new ValidationError("invalidNearestTimeReferenceValue " + Collections
+                            value.error(new ValidationError("invalidNearestTimeReferenceValue"));
-                                    .singletonMap("value", (Object) value.getValue()));
-                            value.error(err);
                         }
                     } else {
-                        IValidationError err = new ValidationError("invalidTimeReferenceValue" + Collections.singletonMap("value",
+                        value.error(new ValidationError("invalidTimeReferenceValue"));
-                                (Object) value.getValue()));
-
-                        value.error(err);
                     }
                 }
             }
             else if (dimension.equals("elevation")) {
                 try {
                     Double.parseDouble(value.getValue());
                 } catch (NumberFormatException nfe){
-                    IValidationError err = new ValidationError("invalidElevationReferenceValue " + Collections.singletonMap("value",
+                    value.error(new ValidationError("invalidElevationReferenceValue"));
-                            (Object) value.getValue()));
-                    value.error(err);
                 }
             }
         }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/resource/MetadataLinkEditor.java b/src/web/core/src/main/java/org/geoserver/web/data/resource/MetadataLinkEditor.java
@@ -169,7 +169,7 @@ public void validate(IValidatable validatable) {
                 try {
                     MetadataLinkInfoImpl.validate(url);
                 } catch (IllegalArgumentException ex) {
-                    IValidationError err = new ValidationError("invalidURI:" + url);
+                    IValidationError err = new ValidationError("invalidURL").setVariable("url", url);
                     validatable.error(err);
                 }
             }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/store/WMSStoreNewPage.java b/src/web/core/src/main/java/org/geoserver/web/data/store/WMSStoreNewPage.java
@@ -23,6 +23,7 @@
 import org.geotools.data.ows.HTTPClient;
 import org.geotools.data.ows.SimpleHttpClient;
 import org.geotools.data.wms.WebMapServer;
+import org.geotools.ows.ServiceException;
 
 public class WMSStoreNewPage extends AbstractWMSStorePage {
 
@@ -97,9 +98,8 @@ public void validate(IValidatable validatable) {
                 }
                 WebMapServer server = new WebMapServer(new URL(url), client);
                 server.getCapabilities();
-            } catch(Exception e) {
+            } catch(IOException | ServiceException e) {
-                IValidationError err = new ValidationError("WMSCapabilitiesValidator.connectionFailure" +
+                IValidationError err = new ValidationError("WMSCapabilitiesValidator.connectionFailure").setVariable("error", e.getMessage());
-                        Collections.singletonMap("error", e.getMessage()));
                 validatable.error(err);
             }
         }

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/FileExistsValidator.java b/src/web/core/src/main/java/org/geoserver/web/wicket/FileExistsValidator.java
@@ -27,7 +27,7 @@
  * Checks the specified file exists on the file system, including checks in the data directory
  */
 @SuppressWarnings("serial")
-public class FileExistsValidator implements IValidator {
+public class FileExistsValidator implements IValidator<String> {
 
     private UrlValidator delegate;
 
@@ -53,8 +53,8 @@ public FileExistsValidator(boolean allowRemoteUrl) {
     }
 
     @Override
-    public void validate(IValidatable validatable) {
+    public void validate(IValidatable<String> validatable) {
-        String uriSpec = Converters.convert(validatable.getValue(), String.class);
+        String uriSpec = validatable.getValue();
 
         // Make sure we are dealing with a local path
         try {
@@ -68,7 +68,8 @@ public void validate(IValidatable validatable) {
                         connection.setConnectTimeout(10000);
                         is = connection.getInputStream();
                     } catch(Exception e) {
-                        IValidationError err = new ValidationError("FileExistsValidator.unreachable" + e.getLocalizedMessage());
+                        IValidationError err = new ValidationError("FileExistsValidator.unreachable")
+                                .setVariable("file", uriSpec);
                         validatable.error(err);
                     } finally {
                         IOUtils.closeQuietly(is);
@@ -99,7 +100,8 @@ else if( loader != null ){
         }
 
         if (relFile == null || !relFile.exists()) {
-            IValidationError err = new ValidationError("FileExistsValidator.fileNotFoundError: " + Collections.singletonMap("file", uriSpec));
+            IValidationError err = new ValidationError("FileExistsValidator.fileNotFoundError")
+                    .setVariable("file", uriSpec);
             validatable.error(err);
         }
     }

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/SRSListTextArea.java b/src/web/core/src/main/java/org/geoserver/web/wicket/SRSListTextArea.java
@@ -70,7 +70,8 @@ public void validate(IValidatable validatable) {
             });
 
             if (invalid.size() > 0) {
-                IValidationError err = new ValidationError("SRSListTextArea.unknownEPSGCodes" + Collections.singletonMap("codes", invalid.toString()));
+                IValidationError err = new ValidationError("SRSListTextArea.unknownEPSGCodes")
+                        .setVariable("codes", invalid.toString());
                 validatable.error(err);
             }
         }

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/URIValidator.java b/src/web/core/src/main/java/org/geoserver/web/wicket/URIValidator.java
@@ -6,10 +6,8 @@
 package org.geoserver.web.wicket;
 
 import java.net.URI;
-import java.util.Collections;
 
 import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
 import org.apache.wicket.validation.IValidator;
 import org.apache.wicket.validation.ValidationError;
 
@@ -26,8 +24,7 @@ public void validate(IValidatable validatable) {
         try {
             new URI(uri);
         } catch(Exception e) {
-            IValidationError err = new ValidationError("invalidURI:" + Collections.singletonMap("uri", uri));
+            validatable.error(new ValidationError("invalidURI").setVariable("uri", uri));
-            validatable.error(err);
         }
     }
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/XMLNameValidator.java b/src/web/core/src/main/java/org/geoserver/web/wicket/XMLNameValidator.java
@@ -5,11 +5,9 @@
  */
 package org.geoserver.web.wicket;
 
-import java.util.Collections;
 import java.util.regex.Pattern;
 
 import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
 import org.apache.wicket.validation.IValidator;
 import org.apache.wicket.validation.ValidationError;
 
@@ -45,8 +43,7 @@ public class XMLNameValidator implements IValidator {
     public void validate(IValidatable validatable) {
         String value = (String) validatable.getValue();
         if (!XML_NAME_PATTERN.matcher(value).matches()) {
-            IValidationError err = new ValidationError("invalidXMLName" + Collections.singletonMap("name", value));
+            validatable.error(new ValidationError("invalidXMLName").setVariable("name", value));
-            validatable.error(err);
         }
     }
 

diff --git a/src/web/core/src/main/resources/GeoServerApplication.properties b/src/web/core/src/main/resources/GeoServerApplication.properties
@@ -223,7 +223,6 @@ FileDataView.lastModified = Last modified
 FileDataView.size = Size
 
 FileExistsValidator.fileNotFoundError = Could not find file: ${file}
-FileExistsValidator.invalidPathError  = Invalid path: ${path}
 FileExistsValidator.unreachable = Connection to resource failed: ${file}
 
 FileParamPanel.browse=Browse...
@@ -412,12 +411,14 @@ MetadataLinkEditor.remove  = Remove
 MetadataLinkEditor.type    = Type
 MetadataLinkEditor.url     = URL
 MetadataLinkEditor.warnValidWmsLinkTypes = Note only FGDC and TC211 metadata links show up in WMS 1.1.1 capabilities
+MetadataLinkEditor.invalidURL = '${url}' is not a valid URL
 
 #DataLinkEditor.noDataLinksDefined=No data links defined so far
 DataLinkEditor.addLink = Add link
 DataLinkEditor.format  = Format
 DataLinkEditor.remove  = Remove
 DataLinkEditor.url     = URL
+DataLinkEditor.invalidDataLinkURL = '${url}' is not a valid URL
 
 NamespaceEditPage.addOrEditWorkspace                         = Add or Edit Workspace
 NamespaceEditPage.prefix                                     = Prefix