Merge "JERSEY-2656: Fix NullPointer during injection a FormParam"

Author: pavelbucek

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/FormParamValueFactoryProvider.java

@@ -53,11 +53,13 @@
 import javax.ws.rs.core.Form;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.glassfish.jersey.internal.inject.ExtractorException;
+import org.glassfish.jersey.internal.util.collection.NullableMultivaluedHashMap;
 import org.glassfish.jersey.message.internal.MediaTypes;
 import org.glassfish.jersey.message.internal.ReaderWriter;
 import org.glassfish.jersey.server.ContainerRequest;
@@ -128,7 +130,8 @@ public Object provide() {
 
         private Form switchUrlEncoding(final ContainerRequest request, final Form otherForm) {
             final Set<Map.Entry<String, List<String>>> entries = otherForm.asMap().entrySet();
-            Form newForm = new Form();
+
+            MultivaluedMap<String, String> formMap = new NullableMultivaluedHashMap<>();
             for (Map.Entry<String, List<String>> entry : entries) {
                 final String charsetName = ReaderWriter.getCharset(MediaType.valueOf(
                         request.getHeaderString(HttpHeaders.CONTENT_TYPE))).name();
@@ -139,16 +142,20 @@ private Form switchUrlEncoding(final ContainerRequest request, final Form otherF
                             charsetName);
 
                     for (String value : entry.getValue()) {
-                        newForm.asMap().add(key, decode ? URLDecoder.decode(value, charsetName) : URLEncoder.encode(value,
-                                charsetName));
+                        if (value != null) {
+                            formMap.add(key,
+                                    decode ? URLDecoder.decode(value, charsetName) : URLEncoder.encode(value, charsetName));
+                        } else {
+                            formMap.add(key, null);
+                        }
                     }
 
                 } catch (UnsupportedEncodingException uee) {
                     throw new ProcessingException(LocalizationMessages.ERROR_UNSUPPORTED_ENCODING(charsetName,
                             extractor.getName()), uee);
                 }
             }
-            return newForm;
+            return new Form(formMap);
         }
 
         private void cacheForm(final ContainerRequest request, final Form form) {

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/EncodedFormParamTest.java

@@ -0,0 +1,97 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.glassfish.jersey.tests.e2e.server;
+
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Encoded;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Proper encoding of Form params
+ *
+ * @author Petr Bouda (petr.bouda at oracle.com)
+ */
+public class EncodedFormParamTest extends JerseyTest {
+
+    @Path("encoded")
+    public static class UrlEncodedResource {
+
+        @Encoded
+        @FormParam("name")
+        private String name;
+
+        @FormParam("name")
+        private String otherName;
+
+        @POST
+        @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+        public String get(@FormParam("name") List<String> name)  {
+            return name.toString() + " " + this.name;
+        }
+
+    }
+
+    @Override
+    protected Application configure() {
+        return new ResourceConfig(UrlEncodedResource.class);
+    }
+
+    @Test
+    public void testEncodedParam() {
+        Response result = target().path("encoded").request()
+                .post(Entity.entity("name&name=George", MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+        assertEquals("[null, George] null", result.readEntity(String.class));
+    }
+}
+