fix PR. add test cases

robaho · robaho · commit 56b3a0f75fc7 · 2025-09-22T12:36:54.000-05:00
diff --git a/src/main/java/robaho/net/httpserver/extras/MultipartFormParser.java b/src/main/java/robaho/net/httpserver/extras/MultipartFormParser.java
@@ -120,12 +120,12 @@ public static Map<String, List<Part>> parse(String encoding, String content_type
             if (meta.filename == null) {
                 var bos = new ByteArrayOutputStream();
                 os = bos;
-                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, null, bos.toString(charset), null));
+                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, null, bos.toString(charset), null));
             } else {
                 File file = Path.of(storage.toString(), meta.filename).toFile();
                 file.deleteOnExit();
                 os = new NoSyncBufferedOutputStream(new FileOutputStream(file));
-                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, meta.filename, null, file));
+                addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, meta.filename, null, file));
             }
 
             try (os) {
@@ -190,7 +190,7 @@ private static PartMetadata parseHeaders(List<String> headers) {
                 }
 
             } else if ("content-type".equalsIgnoreCase(parts[0])) {
-                contentType = parts[1];
+                contentType = parts[1].trim();
             }
         }
         return new PartMetadata(contentType, name, filename);
diff --git a/src/test/java/robaho/net/httpserver/extras/MultipartFormParserTest.java b/src/test/java/robaho/net/httpserver/extras/MultipartFormParserTest.java
@@ -52,13 +52,16 @@ public void testFiles() throws UnsupportedEncodingException, IOException {
         s += "111Y\r\n";
         s += "111Z\rCCCC\nCCCC\r\nCCCCC@\r\n";
 
+        Assert.assertEquals(values.get(0).contentType(),"text/plain");
         Assert.assertEquals(s.getBytes("UTF-8"), Files.readAllBytes((values.get(0).file()).toPath()), "file1 failed");
 
+
         s = "\r\n";
         s += "@22X";
         s += "222Y\r\n";
         s += "222Z\r222W\n2220\r\n666@";
 
+        Assert.assertEquals(values.get(1).contentType(),"text/plain");
         Assert.assertEquals(s.getBytes("UTF-8"), Files.readAllBytes((values.get(1).file()).toPath()), "file2 failed");
     }
 
@@ -118,6 +121,7 @@ public void testFormSample() throws IOException {
 
         Assert.assertEquals(results.size(), 1);
         List<Part> values = results.get("myfile");
+        Assert.assertEquals(values.get(0).contentType(), "text/plain");
         Assert.assertEquals(values.size(), 1);
     }
 
@@ -133,6 +137,12 @@ public void testMultiFileFormSample() throws IOException {
 
         Assert.assertEquals(results.size(), 2);
         List<Part> values = results.get("myfile");
+        Assert.assertEquals(values.get(0).contentType(), "text/plain");
+        Assert.assertEquals(values.size(), 1);
+
+        values = results.get("myfile2");
+        Assert.assertEquals(values.get(0).contentType(), "image/png");
         Assert.assertEquals(values.size(), 1);
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,12 @@ public static Map<String, List<Part>> parse(String encoding, String content_type`
`120`	`120`	`if (meta.filename == null) {`
`121`	`121`	`var bos = new ByteArrayOutputStream();`
`122`	`122`	`os = bos;`
`123`		`- addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, null, bos.toString(charset), null));`
	`123`	`+ addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, null, bos.toString(charset), null));`
`124`	`124`	`} else {`
`125`	`125`	`File file = Path.of(storage.toString(), meta.filename).toFile();`
`126`	`126`	`file.deleteOnExit();`
`127`	`127`	`os = new NoSyncBufferedOutputStream(new FileOutputStream(file));`
`128`		`- addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(null, meta.filename, null, file));`
	`128`	`+ addToResults = () -> results.computeIfAbsent(meta.name, k -> new LinkedList<Part>()).add(new Part(meta.contentType, meta.filename, null, file));`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`try (os) {`
`@@ -190,7 +190,7 @@ private static PartMetadata parseHeaders(List<String> headers) {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`} else if ("content-type".equalsIgnoreCase(parts[0])) {`
`193`		`- contentType = parts[1];`
	`193`	`+ contentType = parts[1].trim();`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`return new PartMetadata(contentType, name, filename);`