-
Notifications
You must be signed in to change notification settings - Fork 564
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support Multipart with HelidonConnector/WebClient (#8270)
* Support Multipart with HelidonConnector/WebClient Signed-off-by: jansupol <[email protected]> * Use hamcrest instead of junit Assertions --------- Signed-off-by: jansupol <[email protected]> Co-authored-by: Romain Grecourt <[email protected]>
- Loading branch information
1 parent
46dddb6
commit 7f3024d
Showing
4 changed files
with
149 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
jersey/connector/src/test/java/io/helidon/jersey/connector/MultipartTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Copyright (c) 2024 Oracle and/or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.helidon.jersey.connector; | ||
|
|
||
| import io.helidon.microprofile.server.JaxRsCdiExtension; | ||
| import io.helidon.microprofile.server.ServerCdiExtension; | ||
| import io.helidon.microprofile.tests.junit5.AddBean; | ||
| import io.helidon.microprofile.tests.junit5.AddExtension; | ||
| import io.helidon.microprofile.tests.junit5.DisableDiscovery; | ||
| import io.helidon.microprofile.tests.junit5.HelidonTest; | ||
| import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider; | ||
| import org.glassfish.jersey.media.multipart.BodyPart; | ||
| import org.glassfish.jersey.media.multipart.BodyPartEntity; | ||
| import org.glassfish.jersey.media.multipart.MultiPart; | ||
| import org.glassfish.jersey.media.multipart.MultiPartFeature; | ||
| import org.glassfish.jersey.message.internal.ReaderWriter; | ||
|
|
||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.EnumSource; | ||
|
|
||
| import jakarta.ws.rs.Consumes; | ||
| import jakarta.ws.rs.POST; | ||
| import jakarta.ws.rs.Path; | ||
| import jakarta.ws.rs.client.ClientBuilder; | ||
| import jakarta.ws.rs.client.Entity; | ||
| import jakarta.ws.rs.client.WebTarget; | ||
| import jakarta.ws.rs.core.Application; | ||
| import jakarta.ws.rs.core.Context; | ||
| import jakarta.ws.rs.core.HttpHeaders; | ||
| import jakarta.ws.rs.core.MediaType; | ||
| import jakarta.ws.rs.core.Response; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| @HelidonTest | ||
| @DisableDiscovery | ||
| @AddExtension(ServerCdiExtension.class) | ||
| @AddExtension(JaxRsCdiExtension.class) | ||
| @AddExtension(CdiComponentProvider.class) | ||
|
|
||
| @AddBean(MultipartTest.MultipartApplication.class) | ||
| public class MultipartTest { | ||
| private static final String ENTITY = "hello"; | ||
|
|
||
| public static class MultipartApplication extends Application { | ||
| @Override | ||
| public Set<Class<?>> getClasses() { | ||
| Set<Class<?>> set = new HashSet<>(); | ||
| set.add(MultiPartFeature.class); | ||
| set.add(MultipartResource.class); | ||
| return set; | ||
| } | ||
| } | ||
|
|
||
| @Path("/") | ||
| public static class MultipartResource { | ||
| @POST | ||
| @Path("upload") | ||
| @Consumes(MediaType.MULTIPART_FORM_DATA) | ||
| public String upload(@Context HttpHeaders headers, MultiPart multiPart) throws IOException { | ||
| return ReaderWriter.readFromAsString( | ||
| ((BodyPartEntity) multiPart.getBodyParts().get(0).getEntity()).getInputStream(), | ||
| MediaType.TEXT_PLAIN_TYPE); | ||
| } | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @EnumSource(value = HelidonEntity.HelidonEntityType.class) | ||
| void testMultipart(HelidonEntity.HelidonEntityType entityType, WebTarget webTarget) { | ||
| // For each entity type make 10 consecutive requests | ||
| for (int i = 0; i != 10; i++) { | ||
| MultiPart multipart = new MultiPart().bodyPart(new BodyPart().entity(ENTITY)); | ||
| multipart.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE); | ||
| try (Response r = ClientBuilder.newBuilder() | ||
| .property(HelidonConnector.INTERNAL_ENTITY_TYPE, entityType.name()) | ||
| .build().target(webTarget.getUri()) | ||
| .path("upload") | ||
| .register(MultiPartFeature.class) | ||
| .request() | ||
| .post(Entity.entity(multipart, multipart.getMediaType()))) { | ||
| assertThat(r.getStatus(), is(Response.Status.OK.getStatusCode())); | ||
| assertThat(r.readEntity(String.class), is(ENTITY)); | ||
| } | ||
| } | ||
| } | ||
| } |