You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/06/11 20:22:20 UTC

[cxf] 01/02: Remove use of some deprecated classes in tests

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 9afb64616b57f03f5ccbec644f0d15f2b4ee1b12
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Jun 11 15:31:47 2018 -0400

    Remove use of some deprecated classes in tests
---
 .../org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index f9ed988..b2e5c6d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -60,10 +60,11 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.provider.json.JSONProvider;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.ByteArrayBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
@@ -904,8 +905,9 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         String ct = "multipart/mixed";
         post.setHeader("Content-Type", ct);
 
-        MultipartEntity entity = new MultipartEntity();
-        entity.addPart("image", new ByteArrayBody(new byte[1024 * 11], "testfile.png"));
+        HttpEntity entity = MultipartEntityBuilder.create()
+            .addPart("image", new ByteArrayBody(new byte[1024 * 11], "testfile.png"))
+            .build();
 
         post.setEntity(entity);
 
@@ -925,9 +927,10 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         String ct = "multipart/mixed";
         post.setHeader("Content-Type", ct);
 
-        MultipartEntity entity = new MultipartEntity();
-        entity.addPart("image", new ByteArrayBody(new byte[1024 * 9], "testfile.png"));
-        entity.addPart("image", new ByteArrayBody(new byte[1024 * 11], "testfile2.png"));
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        
+        HttpEntity entity = builder.addPart("image", new ByteArrayBody(new byte[1024 * 9], "testfile.png"))
+                                   .addPart("image", new ByteArrayBody(new byte[1024 * 11], "testfile2.png")).build();
 
         post.setEntity(entity);
 

-- 
To stop receiving notification emails like this one, please contact
dkulp@apache.org.