From 3ad8d01e58c90ff381c0846afd352f30d6ce9cd0 Mon Sep 17 00:00:00 2001 From: jansupol Date: Sat, 16 Jul 2022 23:10:33 +0200 Subject: [PATCH] Fix Multipart media type override by Jersey defaults. Signed-off-by: jansupol --- .../JerseyEntityPartBuilderProvider.java | 10 ++- .../jersey/media/multipart/MediaTypeTest.java | 73 +++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 media/multipart/src/test/java/org/glassfish/jersey/media/multipart/MediaTypeTest.java diff --git a/media/multipart/src/main/java/org/glassfish/jersey/media/multipart/JerseyEntityPartBuilderProvider.java b/media/multipart/src/main/java/org/glassfish/jersey/media/multipart/JerseyEntityPartBuilderProvider.java index 61583d1667..307eb9769c 100644 --- a/media/multipart/src/main/java/org/glassfish/jersey/media/multipart/JerseyEntityPartBuilderProvider.java +++ b/media/multipart/src/main/java/org/glassfish/jersey/media/multipart/JerseyEntityPartBuilderProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -159,7 +159,7 @@ protected FormDataBodyPart build() { final StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart(); streamDataBodyPart.setFilename(fileName); fillFormData(streamDataBodyPart); - streamDataBodyPart.setStreamEntity(content); + streamDataBodyPart.setStreamEntity(content, mediaType); return streamDataBodyPart; } } @@ -173,7 +173,11 @@ protected FileMethodData(File content) { protected FormDataBodyPart build() { final FileDataBodyPart fileDataBodyPart = new FileDataBodyPart(); fillFormData(fileDataBodyPart); - fileDataBodyPart.setFileEntity(content); + if (mediaType != null) { + fileDataBodyPart.setFileEntity(content, mediaType); + } else { + fileDataBodyPart.setFileEntity(content); + } return fileDataBodyPart; } } diff --git a/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/MediaTypeTest.java b/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/MediaTypeTest.java new file mode 100644 index 0000000000..0787a19e37 --- /dev/null +++ b/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/MediaTypeTest.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.glassfish.jersey.media.multipart; + +import jakarta.ws.rs.core.EntityPart; +import jakarta.ws.rs.core.MediaType; +import org.junit.Assert; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; + +public class MediaTypeTest { + @Test + public void testInputStreamDataMediaType() throws IOException { + ByteArrayInputStream bais = new ByteArrayInputStream("test".getBytes()); + EntityPart entityPart = EntityPart.withName("textFile").fileName("test.txt") + .content(bais) + .mediaType(MediaType.TEXT_PLAIN_TYPE) + .build(); + Assert.assertEquals(MediaType.TEXT_PLAIN_TYPE, entityPart.getMediaType()); + } + + @Test + public void testFileDataMediaType() throws IOException { + EntityPart entityPart = EntityPart.withName("textFile") + .content(new File("anyname"), File.class) + .mediaType(MediaType.TEXT_PLAIN_TYPE) + .build(); + Assert.assertEquals(MediaType.TEXT_PLAIN_TYPE, entityPart.getMediaType()); + } + + @Test + public void testGenericDataMediaType() throws IOException { + EntityPart entityPart = EntityPart.withName("textFile") + .content("Hello", String.class) + .mediaType(MediaType.TEXT_PLAIN_TYPE) + .build(); + Assert.assertEquals(MediaType.TEXT_PLAIN_TYPE, entityPart.getMediaType()); + } + + @Test + public void testInputStreamDataNullMediaType() throws IOException { + ByteArrayInputStream bais = new ByteArrayInputStream("test".getBytes()); + EntityPart entityPart = EntityPart.withName("textFile").fileName("test.txt") + .content(bais) + .build(); + Assert.assertEquals(MediaType.APPLICATION_OCTET_STREAM_TYPE, entityPart.getMediaType()); + } + + @Test + public void testGenericDataNullMediaType() throws IOException { + EntityPart entityPart = EntityPart.withName("textFile") + .content("Hello", String.class) + .build(); + Assert.assertEquals(MediaType.TEXT_PLAIN_TYPE, entityPart.getMediaType()); + } +}