(cxf) branch main updated: CXF-9178: Run Jakarta RESTful Web Services 4.0 TCK

[reta]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 00aec76244 CXF-9178: Run Jakarta RESTful Web Services 4.0 TCK
00aec76244 is described below

commit 00aec76244493f757effc706b2b2f429881a205e
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Wed Jan 28 22:19:23 2026 -0500

    CXF-9178: Run Jakarta RESTful Web Services 4.0 TCK
---
 .../org/apache/cxf/jaxrs/provider/EntityPartProvider.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/EntityPartProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/EntityPartProvider.java
index f38a8a449a..d02fc8de8c 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/EntityPartProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/EntityPartProvider.java
@@ -44,7 +44,6 @@ import jakarta.ws.rs.ext.MessageBodyReader;
 import jakarta.ws.rs.ext.MessageBodyWriter;
 import jakarta.ws.rs.ext.Provider;
 import jakarta.ws.rs.ext.Providers;
-import org.apache.cxf.attachment.AttachmentUtil;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
@@ -161,13 +160,13 @@ public class EntityPartProvider extends 
AbstractConfigurableProvider
             final String fileName = (cd != null) ? cd.getFilename() : null;
             final String cdName = cd == null ? null : cd.getParameter("name");
             final String contentId = attachment.getContentId();
-            final String name = StringUtils.isEmpty(cdName) ? contentId : 
cdName.replace("\"", "").replace("'", "");
 
             if (!StringUtils.isEmpty(fileName)) {
-                return new EntityPartImpl(mc.getProviders(), name, fileName, 
is, c, genericType, headers,
-                    attachment.getContentType());
+                return new EntityPartImpl(mc.getProviders(), contentId, 
fileName, is, c, genericType,
+                    attachment.getHeaders(), attachment.getContentType());
             } else {
-                return new EntityPartImpl(mc.getProviders(), name, null, is, 
c, genericType, headers,
+                final String name = StringUtils.isEmpty(cdName) ? contentId : 
cdName.replace("\"", "").replace("'", "");
+                return new EntityPartImpl(mc.getProviders(), name, null, is, 
c, genericType, attachment.getHeaders(),
                     attachment.getContentType());
             }
         } else {
@@ -207,7 +206,7 @@ public class EntityPartProvider extends 
AbstractConfigurableProvider
         return part.getFileName()
             .map(fileName -> {
                 final ContentDisposition cd = new 
ContentDisposition("form-data;name=file;filename=" + fileName);
-                return new Attachment(AttachmentUtil.BODY_ATTACHMENT_ID, 
part.getContent(), cd);
+                return new Attachment(part.getName(), part.getContent(), cd);
             })
             .orElseGet(() -> {
                 headers.putSingle("Content-Type", mt);