[jspwiki] 11/21: remove compilation warnings

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 92e6e5e02f2bf7cfbaf7785af4428714ab7c1c5e
Author: juanpablo <juanpa...@apache.org>
AuthorDate: Sun Nov 4 01:40:36 2018 +0100

    remove compilation warnings
---
 .../src/main/java/org/apache/wiki/util/FormUtil.java  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/util/FormUtil.java 
b/jspwiki-main/src/main/java/org/apache/wiki/util/FormUtil.java
index 72f6d1a..2fb23b3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/util/FormUtil.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/util/FormUtil.java
@@ -53,15 +53,15 @@ public final class FormUtil
      * @param key the key to look up
      * @return the List of keys
      */
-    public static List getValues( Map params, String key )
+    public static List< ? > getValues( Map< ? , ? > params, String key )
     {
         if( params == null || key == null )
-            return new ArrayList(0);
+            return new ArrayList<>(0);
 
         Object entry = params.get( key );
         if( entry != null )
         {
-            ArrayList<Object> rval = new ArrayList<Object>(1);
+            ArrayList<Object> rval = new ArrayList<>(1);
             rval.add( entry );
             return rval;
         }
@@ -88,9 +88,9 @@ public final class FormUtil
      * @return ArrayList, containing the values corresponding to the
      *          keyPrefix, in order.
      */
-    public static List getNumberedValues( Map params, String keyPrefix )
+    public static List< ? > getNumberedValues( Map< ?, ? > params, String 
keyPrefix )
     {
-        ArrayList<Object> rval = new ArrayList<Object>();
+        ArrayList<Object> rval = new ArrayList<>();
         if( params == null || 
             params.size() == 0 || 
             keyPrefix == null || 
@@ -137,17 +137,16 @@ public final class FormUtil
      * @param filterPrefix the prefix
      * @return the Map containing parsed key/value pairs
      */
-    public static Map< String, String > requestToMap( HttpServletRequest req, 
-                                                      String filterPrefix )
+    public static Map< String, String > requestToMap( HttpServletRequest req, 
String filterPrefix )
     {
-        HashMap<String,String> params = new HashMap<String,String>();
+        HashMap<String,String> params = new HashMap<>();
         
         if( filterPrefix == null ) filterPrefix = "";
         
-        Enumeration en = req.getParameterNames();
+        Enumeration< String > en = req.getParameterNames();
         while( en.hasMoreElements() )
         {
-            String param = (String)en.nextElement();
+            String param = en.nextElement();
             
             if( param.startsWith( filterPrefix ) )
             {