Fixed an encoding issue to get the multi-part values from http request

pom.xml

@@ -5,7 +5,7 @@
     <groupId>org.dataone</groupId>
     <artifactId>d1_common_java</artifactId>
     <packaging>jar</packaging>
-    <version>2.5.0</version>
+    <version>2.5.1-SNAPSHOT</version>
     <name>DataONE_Common_Java</name>
     <url>https://dataone.org</url>
     <description>DataONE Common Code with Service Interface Definitions</description>
@@ -171,6 +171,12 @@
             <type>jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-core</artifactId>
+            <version>9.23.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <licenses>
         <license>

src/main/java/org/dataone/mimemultipart/MultipartRequestResolver.java

@@ -23,6 +23,7 @@
 package org.dataone.mimemultipart;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import javax.servlet.ServletContext;
@@ -150,7 +151,7 @@ public MultipartRequest resolveMultipart(HttpServletRequest request) throws IOEx
 
             if (item.isFormField()) {
                 String name = item.getFieldName();
-                String value = item.getString();
+                String value = item.getString(StandardCharsets.UTF_8.name());
                 if (mpParams.containsKey(name)) {
                     mpParams.get(name).add(value);
                 } else {

src/test/java/org/dataone/mimemultipart/MultipartRequestResolverTest.java

@@ -0,0 +1,147 @@
+package org.dataone.mimemultipart;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
+import org.apache.wicket.protocol.http.mock.MockHttpSession;
+import org.apache.wicket.protocol.http.mock.MockServletContext;
+import org.junit.Test;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test the MultipartRequestResolver class
+ */
+public class MultipartRequestResolverTest {
+    private static final String ID_KEY = "id";
+    private static final String ID_VALUE = "test_MultipartRequestResolver";
+    private static final String QUERY_KEY = "query";
+    private static final String SPECIAL_STRING = "测试";
+
+    private static String contentType;
+
+    /**
+     * Test the resolveMultipart method to handle a multipart parameter with a special character
+     * value
+     */
+    @Test
+    public void testResolveMultipart() throws Exception {
+        HttpServletRequest request = generateMultiPartServletRequest();
+        MultipartRequestResolver resolver = new MultipartRequestResolver();
+        MultipartRequest multipartRequest = resolver.resolveMultipart(request);
+        Map<String, List<String>> multipartParams = multipartRequest.getMultipartParameters();
+        assertEquals(2, multipartParams.size());
+        String id = multipartParams.get(ID_KEY).get(0);
+        assertEquals(ID_VALUE, id);
+        String query = multipartParams.get(QUERY_KEY).get(0);
+        assertEquals(SPECIAL_STRING, query);
+    }
+
+    /**
+     * Generate a multipart servlet request
+     * @return the multipart servlet request
+     * @throws Exception
+     */
+    private HttpServletRequest generateMultiPartServletRequest() throws Exception {
+        ServletInputStream inputStream = buildMultipartStream();
+        MockServletContext context = new MockServletContext(null, "/");
+        MockHttpServletRequest request =
+            new MockHttpServletRequest(null, new MockHttpSession(context), context) {
+                @Override
+                public String getContentType() {
+                    return contentType;
+                }
+                @Override
+                public ServletInputStream getInputStream() {
+                    return inputStream;
+                }
+            };
+        return request;
+    }
+
+    /**
+     * Build a multipart servlet input stream with the special characters
+     * @return a ServletInputStream object
+     * @throws Exception
+     */
+    private ServletInputStream buildMultipartStream() throws Exception {
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+        StringBody pidBody = new StringBody(ID_VALUE, ContentType.TEXT_PLAIN);
+        builder.addPart(ID_KEY, pidBody);
+        StringBody queryBody = new StringBody(SPECIAL_STRING, ContentType.TEXT_PLAIN.withCharset(
+            StandardCharsets.UTF_8));
+        builder.addPart(QUERY_KEY, queryBody);
+        HttpEntity entity = builder.build();
+        contentType = entity.getContentType().getValue();
+        // Serialize request body
+        ByteArrayOutputStream requestContent = new ByteArrayOutputStream();
+        entity.writeTo(requestContent);
+        ByteArrayInputStream requestInput = new ByteArrayInputStream(requestContent.toByteArray());
+        ServletInputStream objectInputStream = new WrappingServletInputStream(requestInput);
+        return objectInputStream;
+    }
+}
+
+/**
+ * A wrapping class to convert an InputStream object to a ServletInputStream object
+ */
+class WrappingServletInputStream extends ServletInputStream {
+    private final InputStream sourceStream;
+
+    /**
+     * Create a DelegatingServletInputStream for the given source stream.
+     * @param sourceStream the source stream (never <code>null</code>)
+     */
+    public  WrappingServletInputStream(InputStream sourceStream) {
+
+        this.sourceStream = sourceStream;
+    }
+
+    /**
+     * Return the underlying source stream (never <code>null</code>).
+     */
+    public final InputStream getSourceStream() {
+        return this.sourceStream;
+    }
+
+    public int read() throws IOException {
+        return this.sourceStream.read();
+    }
+
+    public void close() throws IOException {
+        super.close();
+        this.sourceStream.close();
+    }
+
+
+    @Override
+    public boolean isFinished() {
+        return true;
+    }
+
+    @Override
+    public boolean isReady() {
+        return true;
+    }
+
+    @Override
+    public void setReadListener(ReadListener listener) {
+
+    }
+
+}