This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 26a2c103b4d2d0a00c7b9aa98b0a11be80dda538 Author: Benoit TELLIER <[email protected]> AuthorDate: Tue Dec 9 16:43:42 2025 +0100 JMAP: normalize charset case --- .../jmap/rfc8621/contract/EmailGetMethodContract.scala | 18 +++++++++--------- .../jmap/rfc8621/contract/EmailImportContract.scala | 8 ++++---- .../rfc8621/contract/EmailParseMethodContract.scala | 4 ++-- .../jmap/rfc8621/contract/EmailSetMethodContract.scala | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala index c060a30b48..df5b608f4d 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala @@ -2459,7 +2459,7 @@ trait EmailGetMethodContract { | "blobId": "${messageId.serialize}_2", | "size": 8, | "type": "text/plain", - | "charset": "utf-8" + | "charset": "UTF-8" | } | ], | "attachments": [ @@ -2497,7 +2497,7 @@ trait EmailGetMethodContract { | "blobId": "${messageId.serialize}_2", | "size": 8, | "type": "text/plain", - | "charset": "utf-8" + | "charset": "UTF-8" | } | ], | "bodyValues": {}, @@ -3947,7 +3947,7 @@ trait EmailGetMethodContract { | ], | "size": 8, | "type": "text/plain", - | "charset": "utf-8" + | "charset": "UTF-8" | }, | { | "partId": "3", @@ -4199,7 +4199,7 @@ trait EmailGetMethodContract { | "size": 19, | "name": "avertissement.txt", | "type": "text/plain", - | "charset": "iso-8859-1", + | "charset": "ISO-8859-1", | "disposition": "inline", | "cid": "[email protected]" | } @@ -4268,7 +4268,7 @@ trait EmailGetMethodContract { | "blobId": "${messageId.serialize}_2", | "size": 8, | "type": "text/plain", - | "charset": "utf-8" + | "charset": "UTF-8" | } | ] | } @@ -4336,7 +4336,7 @@ trait EmailGetMethodContract { | "charset": "ISO-8859-1" | }, | { - | "charset": "iso-8859-1", + | "charset": "ISO-8859-1", | "disposition": "inline", | "size": 19, | "partId": "5", @@ -4411,7 +4411,7 @@ trait EmailGetMethodContract { | "charset": "ISO-8859-1" | }, | { - | "charset": "iso-8859-1", + | "charset": "ISO-8859-1", | "disposition": "inline", | "size": 19, | "partId": "5", @@ -4927,7 +4927,7 @@ trait EmailGetMethodContract { | "size": 4334, | "name": "Screenshot 2025-05-06 at 09.50.27.png", | "type": "image/png", - | "charset": "base64", + | "charset": "BASE64", | "disposition": "inline", | "cid": "e612b3e0-2a24-11f0-aacf-77a69744ec20" | } @@ -6189,7 +6189,7 @@ trait EmailGetMethodContract { | "size": 19, | "name": "avertissement.txt", | "type": "text/plain", - | "charset": "iso-8859-1", + | "charset": "ISO-8859-1", | "disposition": "inline", | "cid": "[email protected]" | } diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailImportContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailImportContract.scala index 539cb0dc62..fd595488c4 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailImportContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailImportContract.scala @@ -239,7 +239,7 @@ trait EmailImportContract { | "id": "$messageId", | "htmlBody": [ | { - | "charset": "utf-8", + | "charset": "UTF-8", | "size": 39, | "partId": "2", | "blobId": "${messageId}_2", @@ -364,7 +364,7 @@ trait EmailImportContract { | "id": "$messageId", | "htmlBody": [ | { - | "charset": "utf-8", + | "charset": "UTF-8", | "size": 39, | "partId": "2", | "blobId": "${messageId}_2", @@ -486,7 +486,7 @@ trait EmailImportContract { | "id": "$messageId", | "htmlBody": [ | { - | "charset": "utf-8", + | "charset": "UTF-8", | "size": 39, | "partId": "2", | "blobId": "${messageId}_2", @@ -606,7 +606,7 @@ trait EmailImportContract { | "id": "$messageId", | "htmlBody": [ | { - | "charset": "utf-8", + | "charset": "UTF-8", | "size": 39, | "partId": "2", | "blobId": "${messageId}_2", diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala index d825748c89..18508647a8 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala @@ -109,7 +109,7 @@ trait EmailParseMethodContract { | "references": null, | "textBody": [ | { - | "charset": "utf-8", + | "charset": "UTF-8", | "size": 39, | "partId": "2", | "blobId": "${messageId.serialize()}_2", @@ -153,7 +153,7 @@ trait EmailParseMethodContract { | "preview": "Send concerted from html", | "htmlBody": [ | { - | "charset": "utf-8", + | "charset": "UTF-8", | "size": 39, | "partId": "2", | "blobId": "${messageId.serialize()}_2", diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala index 0a2047e40c..98d8e130ad 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala @@ -2474,7 +2474,7 @@ trait EmailSetMethodContract { | "blobId": "${messageId}_4", | "size": 11, | "type": "text/plain", - | "charset": "ascii", + | "charset": "ASCII", | "disposition": "attachment" | } | ] @@ -4593,7 +4593,7 @@ trait EmailSetMethodContract { | "id": "$messageId", | "bodyStructure": { | "type": "multipart/alternative", - | "charset": "us-ascii", + | "charset": "US-ASCII", | "subParts": [ | { | "type": "text/plain", @@ -5006,7 +5006,7 @@ trait EmailSetMethodContract { | "blobId": "${messageId}_4", | "size": 155, | "type": "message/rfc822", - | "charset": "us-ascii", + | "charset": "US-ASCII", | "disposition": "attachment" | } | ] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
