chibenwa commented on code in PR #2490:
URL: https://github.com/apache/james-project/pull/2490#discussion_r1834026677
##########
mailet/standard/src/main/java/org/apache/james/transport/mailets/FoldLongLines.java:
##########
@@ -73,16 +72,33 @@ public void service(Mail mail) throws MessagingException {
mail.getMessage().addHeader(header.getName(),
header.getValue());
}
}));
- mail.getMessage().saveChanges();
+ if (!longHeaders.isEmpty()) {
+ mail.getMessage().saveChanges();
+ }
+ }
+
+ private Set<String> getHeadersExceedingMaxCharacters(Mail mail) throws
MessagingException {
+ return Streams.of(mail.getMessage().getAllHeaders().asIterator())
+ .filter(this::exceedLineLimit)
+ .map(Header::getName)
+ .collect(ImmutableSet.toImmutableSet());
+ }
+
+ private List<Header> getHeadersWithTheSameNameAsLongHeaders(Mail mail,
Set<String> longHeaders) throws MessagingException {
+ return Streams.of(mail.getMessage().getAllHeaders().asIterator())
+ .filter(header -> longHeaders.contains(header.getName()))
+ .toList();
}
private String fold(Header header) {
+ int headerNameLength = header.getName().length() +
HEADER_SEPARATOR.length();
// TODO After new release of mime4j with commit
https://github.com/apache/james-mime4j/commit/66a09219457854c7a26e5b7c0e4c9dd59b4b0c32,
update to use MimeUtil of mime4j and remove MimeUtil class file
- return MimeUtil.fold(header.getValue(), header.getName().length() +
HEADER_SEPARATOR.length(), maxCharacters);
+ String s = MimeUtil.fold(header.getValue(), headerNameLength,
maxCharacters);
+ return s;
}
private boolean exceedLineLimit(Header header) {
String fullHeader = header.getName() + HEADER_SEPARATOR +
header.getValue();
- return
Arrays.stream(fullHeader.split(SEPARATE_LINE_REGEX)).anyMatch(line ->
line.length() > maxCharacters);
+ return Splitter.on(SEPARATOR).splitToStream(fullHeader).anyMatch(line
-> line.length() > maxCharacters);
Review Comment:
Ident?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
