This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a173ffc04c7 Regen
a173ffc04c7 is described below
commit a173ffc04c71ba20b3c9afb50836e68574a5a105
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Sep 30 16:43:30 2022 -0400
Regen
---
.../java/org/apache/camel/component/mail/MailBinding.java | 15 +++++++--------
.../apache/camel/component/mail/MailConfiguration.java | 5 +++--
.../camel/component/mail/MailAttachmentNamesTest.java | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index c812fce011c..90632ddecc0 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -386,12 +386,12 @@ public class MailBinding {
if (validDisposition(disposition, fileName)) {
LOG.debug("Mail contains file attachment: {}", fileName);
- if(handleDuplicateAttachmentNames != null){
+ if (handleDuplicateAttachmentNames != null) {
if (handleDuplicateAttachmentNames
-
.equalsIgnoreCase(MailConstants.MAIL_HANDLE_DUPLICATE_ATTACHMENT_NAMES_UUID_PREFIX))
{
+
.equalsIgnoreCase(MailConstants.MAIL_HANDLE_DUPLICATE_ATTACHMENT_NAMES_UUID_PREFIX))
{
fileName = prefixDuplicateFilenames(map, fileName);
- } else if(handleDuplicateAttachmentNames
-
.equalsIgnoreCase(MailConstants.MAIL_HANDLE_DUPLICATE_ATTACHMENT_NAMES_UUID_SUFFIX)){
+ } else if (handleDuplicateAttachmentNames
+
.equalsIgnoreCase(MailConstants.MAIL_HANDLE_DUPLICATE_ATTACHMENT_NAMES_UUID_SUFFIX))
{
fileName = suffixDuplicateFilenames(map, fileName);
}
}
@@ -449,10 +449,9 @@ public class MailBinding {
}
/**
- * Updates already existing filenames in the map and suffixes the current
filename
- * Filename will be suffixed, the file extension will remain
- * If the string starts with a dot and no further dots are contained in
the string,
- * this is considered as a filename without file extension
+ * Updates already existing filenames in the map and suffixes the current
filename Filename will be suffixed, the
+ * file extension will remain If the string starts with a dot and no
further dots are contained in the string, this
+ * is considered as a filename without file extension
*
* @param map
* @param fileName
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index d1ec32b80f3..25adde6f1b5 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -871,8 +871,9 @@ public class MailConfiguration implements Cloneable {
/**
* Set the strategy to handle duplicate filenames of attachments never:
attachments that have a filename which is
* already present in the attachments will be ignored unless
failOnDuplicateFileAttachment is set to true.
- * uuidPrefix: this will prefix the duplicate attachment filenames each
with a uuid and underscore (uuid_filename.fileextension).
- * uuidSuffix: this will suffix the duplicate attachment filenames each
with a underscore and uuid (filename_uuid.fileextension).
+ * uuidPrefix: this will prefix the duplicate attachment filenames each
with a uuid and underscore
+ * (uuid_filename.fileextension). uuidSuffix: this will suffix the
duplicate attachment filenames each with a
+ * underscore and uuid (filename_uuid.fileextension).
*
* @param handleDuplicateAttachmentNames
*/
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
index 4e08ca8440b..f37e92e4614 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
@@ -71,12 +71,12 @@ public class MailAttachmentNamesTest extends
CamelTestSupport {
return new RoutesBuilder[] { new RouteBuilder() {
public void configure() {
from("pop3://james@localhost?password=foo&initialDelay=100&delay=100&generateMissingAttachmentNames=uuid&handleDuplicateAttachmentNames=uuidPrefix")
- .to("mock:result");
+ .to("mock:result");
}
}, new RouteBuilder() {
public void configure() {
from("pop3://suffix@localhost?password=foo&initialDelay=100&delay=100&generateMissingAttachmentNames=uuid&handleDuplicateAttachmentNames=uuidSuffix")
- .to("mock:result");
+ .to("mock:result");
}
}, new RouteBuilder() {
public void configure() {