Merge branch 'master' of https://github.com/jenkinsci/stapler into html-JENKINS-31203

Author: jglick

core/pom.xml

@@ -26,7 +26,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.9.4</version>
+      <version>1.10.1</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

core/src/main/java/org/kohsuke/stapler/RequestImpl.java

@@ -259,17 +259,30 @@ public String getParameter(String name) {
     }
 
     @Override
-    public Map getParameterMap() {
-        Map parameterMap = super.getParameterMap();
+    public Map<String, String[]> getParameterMap() {
+        var parameterMap = super.getParameterMap();
         if (isMultipart()) {
             Map<String, String> data = getFormDataFormFields();
-            parameterMap.putAll(data);
+            parameterMap = new HashMap<>(parameterMap);
+            for (var e : data.entrySet()) {
+                var values = parameterMap.get(e.getKey());
+                if (values == null) {
+                    values = new String[] {e.getValue()};
+                } else {
+                    int len = values.length;
+                    var moreValues = Arrays.copyOf(values, len + 1);
+                    moreValues[len] = e.getValue();
+                    values = moreValues;
+                }
+                parameterMap.put(e.getKey(), values);
+            }
+            parameterMap = Collections.unmodifiableMap(parameterMap);
         }
         return parameterMap;
     }
 
     @Override
-    public Enumeration getParameterNames() {
+    public Enumeration<String> getParameterNames() {
         if (!isMultipart()) {
             return super.getParameterNames();
         }

core/src/test/java/org/kohsuke/stapler/DataBindingTest.java

@@ -77,8 +77,8 @@ public String getContentType() {
                 return "text/html";
             }
         };
-        mr.getParameterMap().put("a", "123");
-        mr.getParameterMap().put("b", "string");
+        mr.parameters.put("a", "123");
+        mr.parameters.put("b", "string");
         RequestImpl req = new RequestImpl(new Stapler(), mr, Collections.emptyList(), null);
         new Function.InstanceFunction(
                         getClass().getMethod("doFromStaplerMethod", StaplerRequest2.class, int.class, Binder.class))

core/src/test/java/org/kohsuke/stapler/MockRequest.java

@@ -19,10 +19,12 @@
 import java.io.UnsupportedEncodingException;
 import java.security.Principal;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -53,13 +55,13 @@ public String getHeader(String name) {
     }
 
     @Override
-    public Enumeration getHeaders(String name) {
+    public Enumeration<String> getHeaders(String name) {
         // TODO
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Enumeration getHeaderNames() {
+    public Enumeration<String> getHeaderNames() {
         // TODO
         throw new UnsupportedOperationException();
     }
@@ -184,7 +186,7 @@ public Object getAttribute(String name) {
     }
 
     @Override
-    public Enumeration getAttributeNames() {
+    public Enumeration<String> getAttributeNames() {
         // TODO
         throw new UnsupportedOperationException();
     }
@@ -222,18 +224,17 @@ public ServletInputStream getInputStream() throws IOException {
     public Map<String, String> parameters = new HashMap<>();
 
     @Override
-    public String getParameter(String name) {
+    public final String getParameter(String name) {
         return parameters.get(name);
     }
 
     @Override
-    public Enumeration getParameterNames() {
-        // TODO
-        throw new UnsupportedOperationException();
+    public final Enumeration<String> getParameterNames() {
+        return Collections.enumeration(parameters.keySet());
     }
 
     @Override
-    public String[] getParameterValues(String name) {
+    public final String[] getParameterValues(String name) {
         String v = getParameter(name);
         if (v == null) {
             return new String[0];
@@ -242,8 +243,9 @@ public String[] getParameterValues(String name) {
     }
 
     @Override
-    public Map getParameterMap() {
-        return parameters;
+    public final Map<String, String[]> getParameterMap() {
+        return Collections.unmodifiableMap(parameters.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> new String[] {e.getValue()})));
     }
 
     @Override
@@ -307,7 +309,7 @@ public Locale getLocale() {
     }
 
     @Override
-    public Enumeration getLocales() {
+    public Enumeration<Locale> getLocales() {
         // TODO
         throw new UnsupportedOperationException();
     }

core/src/test/java/org/kohsuke/stapler/RequestImplTest.java

@@ -37,7 +37,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
 import net.sf.json.JSONObject;
 import org.apache.commons.fileupload2.core.FileItem;
@@ -120,11 +119,6 @@ public int getContentLength() {
                 return buf.length;
             }
 
-            @Override
-            public Enumeration getParameterNames() {
-                return Collections.enumeration(List.of("p1"));
-            }
-
             @Override
             public ServletInputStream getInputStream() throws IOException {
                 return new ServletInputStream() {
@@ -160,6 +154,7 @@ public void setReadListener(ReadListener readListener) {
                 };
             }
         };
+        mockRequest.parameters.put("p1", "somevalue");
 
         RequestImpl request = new RequestImpl(stapler, mockRequest, Collections.emptyList(), null);
 

groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyClassLoaderTearOff.java

@@ -28,7 +28,6 @@
 import groovy.lang.GroovyCodeSource;
 import java.io.IOException;
 import java.net.URL;
-import org.apache.commons.jelly.XMLOutput;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.kohsuke.stapler.MetaClass;
 import org.kohsuke.stapler.MetaClassLoader;
@@ -42,16 +41,6 @@ public class GroovyClassLoaderTearOff {
 
     private final GroovyClassLoader gcl;
 
-    private final SimpleTemplateParser parser = new SimpleTemplateParser() {
-        /**
-         * Sends the output via {@link XMLOutput#write(String)}
-         */
-        @Override
-        protected String printCommand() {
-            return "output.write";
-        }
-    };
-
     public GroovyClassLoaderTearOff(MetaClassLoader owner) {
         this.owner = owner;
         gcl = createGroovyClassLoader();
@@ -93,11 +82,4 @@ public GroovierJellyScript parse(URL script) throws IOException {
 
         return new GroovierJellyScript(gcl.parseClass(gcs), script);
     }
-
-    public GroovierJellyScript parseGSP(URL res) throws IOException, ClassNotFoundException {
-        GroovyCodeSource gcs = new GroovyCodeSource(parser.parse(res), res.toExternalForm(), res.toExternalForm());
-        gcs.setCachable(false);
-
-        return new GroovierJellyScript(gcl.parseClass(gcs), res);
-    }
 }

groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyFacet.java

@@ -55,7 +55,6 @@ public class GroovyFacet extends Facet implements JellyCompatibleFacet {
     public void buildViewDispatchers(final MetaClass owner, List<Dispatcher> dispatchers) {
         ScriptInvoker scriptInvoker = owner.webApp.getFacet(JellyFacet.class).scriptInvoker;
         dispatchers.add(createValidatingDispatcher(owner.loadTearOff(GroovyClassTearOff.class), scriptInvoker));
-        dispatchers.add(createValidatingDispatcher(owner.loadTearOff(GroovyServerPageTearOff.class), scriptInvoker));
     }
 
     @Override
@@ -75,9 +74,6 @@ public RequestDispatcher createRequestDispatcher(RequestImpl request, Klass type
         ScriptInvoker scriptExecutor = request.getWebApp().getFacet(JellyFacet.class).scriptInvoker;
         RequestDispatcher d =
                 createRequestDispatcher(owner.loadTearOff(GroovyClassTearOff.class), scriptExecutor, it, viewName);
-        if (d == null) {
-            d = createRequestDispatcher(owner.loadTearOff(GroovyServerPageTearOff.class), scriptExecutor, it, viewName);
-        }
         return d;
     }
 
@@ -96,9 +92,7 @@ public void buildIndexDispatchers(MetaClass owner, List<Dispatcher> dispatchers)
     public boolean handleIndexRequest(RequestImpl req, ResponseImpl rsp, Object node, MetaClass nodeMetaClass)
             throws IOException, ServletException {
         ScriptInvoker scriptExecutor = req.getWebApp().getFacet(JellyFacet.class).scriptInvoker;
-        return handleIndexRequest(nodeMetaClass.loadTearOff(GroovyClassTearOff.class), scriptExecutor, req, rsp, node)
-                || handleIndexRequest(
-                        nodeMetaClass.loadTearOff(GroovyServerPageTearOff.class), scriptExecutor, req, rsp, node);
+        return handleIndexRequest(nodeMetaClass.loadTearOff(GroovyClassTearOff.class), scriptExecutor, req, rsp, node);
     }
 
     private static final Set<Class<GroovyClassTearOff>> TEAROFF_TYPES = Set.of(GroovyClassTearOff.class);