Skip to content

replace try-finally statement with try-with-resources #1502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christophd merged 1 commit into from
Mar 28, 2026
+14 −55
Merged

replace try-finally statement with try-with-resources #1502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 14 additions & 55 deletions ...ints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@
*/
public class MailMessageConverter implements MessageConverter<MimeMailMessage, MimeMailMessage, MailEndpointConfiguration> {

/** Logger */
private static final Logger logger = LoggerFactory.getLogger(MailMessageConverter.class);

/** Mail delivery date format */
/**
* Mail delivery date format
*/
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");

@Override
Expand Down Expand Up @@ -133,18 +134,14 @@ public MailMessage convertInbound(MimeMailMessage message, MailEndpointConfigura

/**
* Creates a new mail message model object from message headers.
* @param messageHeaders
* @param bodyPart
* @param marshaller
* @return
*/
public MailMessage createMailRequest(Map<String, Object> messageHeaders, BodyPart bodyPart, MailMarshaller marshaller) {
MailMessage message = MailMessage.request(messageHeaders)
.marshaller(marshaller)
.from(messageHeaders.get(CitrusMailMessageHeaders.MAIL_FROM).toString())
.to(messageHeaders.get(CitrusMailMessageHeaders.MAIL_TO).toString())
.subject(messageHeaders.get(CitrusMailMessageHeaders.MAIL_SUBJECT).toString())
.body(bodyPart);
.marshaller(marshaller)
.from(messageHeaders.get(CitrusMailMessageHeaders.MAIL_FROM).toString())
.to(messageHeaders.get(CitrusMailMessageHeaders.MAIL_TO).toString())
.subject(messageHeaders.get(CitrusMailMessageHeaders.MAIL_SUBJECT).toString())
.body(bodyPart);

if (StringUtils.hasText(messageHeaders.get(CitrusMailMessageHeaders.MAIL_CC).toString())) {
message.cc(messageHeaders.get(CitrusMailMessageHeaders.MAIL_CC).toString());
Expand All @@ -159,10 +156,8 @@ public MailMessage createMailRequest(Map<String, Object> messageHeaders, BodyPar

/**
* Reads basic message information such as sender, recipients and mail subject to message headers.
* @param msg
* @return
*/
protected Map<String,Object> createMessageHeaders(MimeMailMessage msg) throws MessagingException, IOException {
protected Map<String, Object> createMessageHeaders(MimeMailMessage msg) throws MessagingException, IOException {
Map<String, Object> headers = new HashMap<>();
headers.put(CitrusMailMessageHeaders.MAIL_MESSAGE_ID, msg.getMimeMessage().getMessageID());
headers.put(CitrusMailMessageHeaders.MAIL_FROM, String.join(",", Optional.ofNullable(msg.getMimeMessage().getFrom()).stream().flatMap(Arrays::stream).map(Object::toString).toList()));
Expand All @@ -179,9 +174,6 @@ protected Map<String,Object> createMessageHeaders(MimeMailMessage msg) throws Me

/**
* Process message part. Can be a text, binary or multipart instance.
* @param part
* @return
* @throws java.io.IOException
*/
protected BodyPart handlePart(MimePart part) throws IOException, MessagingException {
String contentType = parseContentType(part.getContentType());
Expand All @@ -201,9 +193,6 @@ protected BodyPart handlePart(MimePart part) throws IOException, MessagingExcept

/**
* Construct multipart body with first part being the body content and further parts being the attachments.
* @param body
* @return
* @throws IOException
*/
private BodyPart handleMultiPart(Multipart body) throws IOException, MessagingException {
BodyPart bodyPart = null;
Expand All @@ -224,10 +213,6 @@ private BodyPart handleMultiPart(Multipart body) throws IOException, MessagingEx
/**
* Construct body part form special application data. Based on known application content types delegate to text,
* image or binary body construction.
* @param applicationData
* @param contentType
* @return
* @throws IOException
*/
protected BodyPart handleApplicationContentPart(MimePart applicationData, String contentType) throws IOException, MessagingException {
if (applicationData.isMimeType("application/pdf")) {
Expand All @@ -251,10 +236,6 @@ protected BodyPart handleApplicationContentPart(MimePart applicationData, String

/**
* Construct base64 body part from image data.
* @param image
* @param contentType
* @return
* @throws IOException
*/
protected BodyPart handleImageBinaryPart(MimePart image, String contentType) throws IOException, MessagingException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Expand All @@ -268,10 +249,6 @@ protected BodyPart handleImageBinaryPart(MimePart image, String contentType) thr

/**
* Construct simple body part from binary data just adding file name as content.
* @param mediaPart
* @param contentType
* @return
* @throws IOException
*/
protected BodyPart handleBinaryPart(MimePart mediaPart, String contentType) throws IOException, MessagingException {
String contentId = mediaPart.getContentID() != null ? "(" + mediaPart.getContentID() + ")" : "";
Expand All @@ -280,10 +257,6 @@ protected BodyPart handleBinaryPart(MimePart mediaPart, String contentType) thro

/**
* Construct simple binary body part with base64 data.
* @param textPart
* @param contentType
* @return
* @throws IOException
*/
protected BodyPart handleTextPart(MimePart textPart, String contentType) throws IOException, MessagingException {

Expand All @@ -302,8 +275,6 @@ protected BodyPart handleTextPart(MimePart textPart, String contentType) throws
/**
* Removes SMTP mail body ending which is defined by single '.' character in separate line marking
* the mail body end of file.
* @param textBody
* @return
*/
private String stripMailBodyEnding(String textBody) throws IOException {
BufferedReader reader = null;
Expand Down Expand Up @@ -334,10 +305,6 @@ private String stripMailBodyEnding(String textBody) throws IOException {
/**
* Reads Citrus internal mail message model object from message payload. Either payload is actually a mail message object or
* XML payload String is unmarshalled to mail message object.
*
* @param message
* @param endpointConfiguration
* @return
*/
private MailRequest getMailRequest(Message message, MailEndpointConfiguration endpointConfiguration) {
Object payload = message.getPayload();
Expand All @@ -362,27 +329,18 @@ private MailRequest getMailRequest(Message message, MailEndpointConfiguration en
/**
* When content type has multiple lines this method just returns plain content type information in first line.
* This is the case when multipart mixed content type has boundary information in next line.
* @param contentType
* @return
* @throws IOException
*/
static String parseContentType(String contentType) throws IOException {
if (contentType.indexOf(System.getProperty("line.separator")) > 0) {
BufferedReader reader = new BufferedReader(new StringReader(contentType));

try {
if (contentType.indexOf(System.lineSeparator()) > 0) {
try (BufferedReader reader = new BufferedReader(new StringReader(contentType))) {
String plainContentType = reader.readLine();
if (plainContentType != null && plainContentType.trim().endsWith(";")) {
plainContentType = plainContentType.trim().substring(0, plainContentType.length() - 1);
}

return plainContentType;
} finally {
try {
reader.close();
} catch (IOException e) {
logger.warn("Failed to close reader", e);
}
} catch (IOException e) {
logger.warn("Failed to close reader", e);
}
}

Expand All @@ -391,6 +349,7 @@ static String parseContentType(String contentType) throws IOException {

/**
* Parses the charset definition from a "Content-Type" header value, e.g. text/plain; charset=UTF-8, and returns it exclusively.
*
* @param contentType 'Content-Type' header value as String
* @return a charset information parsed from the Content-Type, or {@link CitrusSettings#CITRUS_FILE_ENCODING} as default if there is no charset definition
*/
Expand Down
Loading