Add more headers in platform-http multipart uploads

Author: Croway

components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpConsumer.java

@@ -332,6 +332,7 @@ private void populateMultiFormData(
     }
 
     protected void populateAttachments(List<FileUpload> uploads, Message message) {
+        message.setHeader(Exchange.ATTACHMENTS_SIZE, uploads.size());
         for (FileUpload upload : uploads) {
             final String name = upload.name();
             final String fileName = upload.fileName();
@@ -357,13 +358,15 @@ protected void populateAttachments(List<FileUpload> uploads, Message message) {
 
                 // populate body in case there is only one attachment
                 if (uploads.size() == 1) {
+                    message.setHeader(Exchange.FILE_PATH, localFile.getAbsolutePath());
+                    message.setHeader(Exchange.FILE_LENGTH, upload.size());
                     message.setHeader(Exchange.FILE_NAME, upload.fileName());
                     String ct = MimeTypeHelper.probeMimeType(upload.fileName());
                     if (ct == null) {
                         ct = upload.contentType();
                     }
                     if (ct != null) {
-                        message.setHeader(Exchange.CONTENT_TYPE, ct);
+                        message.setHeader(Exchange.FILE_CONTENT_TYPE, ct);
                     }
                     message.setBody(localFile);
                 }

components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngineTest.java

@@ -430,7 +430,8 @@ public void configure() {
                                 }
 
                                 exchange.getIn().setHeader("ConcatFileContent", result);
-                            });
+                            })
+                            .setHeader("UploadedAttachments", simple("${headers.CamelAttachmentsSize}"));
                 }
             });
 
@@ -444,6 +445,7 @@ public void configure() {
                     .then()
                     .statusCode(204)
                     .body(emptyOrNullString())
+                    .header("UploadedAttachments", is(String.valueOf(attachmentIds.size())))
                     .header("ConcatFileContent",
                             is("Test multipart upload content myFirstTestFileTest multipart upload content mySecondTestFile"));
         } finally {
@@ -476,7 +478,9 @@ public void configure() {
                                 AttachmentMessage message = exchange.getMessage(AttachmentMessage.class);
                                 DataHandler attachment = message.getAttachment(attachmentId);
                                 exchange.getMessage().setHeader("myDataHandler", attachment);
-                            });
+                            })
+                            .setHeader("UploadedFileContentType", simple("${header.CamelFileContentType}"))
+                            .setHeader("UploadedFileSize", simple("${header.CamelFileLength}"));
                 }
             });
 
@@ -489,6 +493,8 @@ public void configure() {
                     .then()
                     .statusCode(200)
                     .header("myDataHandler", containsString("jakarta.activation.DataHandler"))
+                    .header("UploadedFileContentType", is("text/plain"))
+                    .header("UploadedFileSize", is(String.valueOf(fileContent.getBytes().length)))
                     .body(is(fileContent));
         } finally {
             context.stop();

components/camel-platform-http/src/main/docs/platform-http-component.adoc

@@ -91,6 +91,9 @@ Since Apache Camel 4.10, multipart file uploads are easier and harmonized across
 * The Apache Camel message contains:
 ** The uploaded file in the message body
 ** The file name in the "CamelFileName" message header
-** The file's content type in the "Content-Type" message header
+** The file's content type in the "CamelFileContentType" message header
+** The file's size in the "CamelFileLength" message header
+
+In case of multiple uploads, the header "CamelAttachmentsSize" contains the number of files uploaded.
 
 include::spring-boot:partial$starter.adoc[]

core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java

@@ -13,7 +13,7 @@ public class ExchangeConstantProvider {
 
     private static final Map<String, String> MAP;
     static {
-        Map<String, String> map = new HashMap<>(160);
+        Map<String, String> map = new HashMap<>(161);
         map.put("ACCEPT_CONTENT_TYPE", "CamelAcceptContentType");
         map.put("AGGREGATED_COLLECTION_GUARD", "CamelAggregatedCollectionGuard");
         map.put("AGGREGATED_COMPLETED_BY", "CamelAggregatedCompletedBy");
@@ -25,6 +25,7 @@ public class ExchangeConstantProvider {
         map.put("AGGREGATION_COMPLETE_CURRENT_GROUP", "CamelAggregationCompleteCurrentGroup");
         map.put("AGGREGATION_STRATEGY", "CamelAggregationStrategy");
         map.put("ASYNC_WAIT", "CamelAsyncWait");
+        map.put("ATTACHMENTS_SIZE", "CamelAttachmentsSize");
         map.put("AUTHENTICATION", "CamelAuthentication");
         map.put("AUTHENTICATION_FAILURE_POLICY_ID", "CamelAuthenticationFailurePolicyId");
         map.put("BATCH_COMPLETE", "CamelBatchComplete");

core/camel-api/src/main/java/org/apache/camel/Exchange.java

@@ -117,6 +117,7 @@ public interface Exchange extends VariableAware {
     String CONTENT_TYPE = "Content-Type";
     String COOKIE_HANDLER = "CamelCookieHandler";
     String CORRELATION_ID = "CamelCorrelationId";
+    String ATTACHMENTS_SIZE = "CamelAttachmentsSize";
 
     // The schema of the message payload
     String CONTENT_SCHEMA = "CamelContentSchema";