Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,16 @@ cannot be overridden by message headers:

[options="header"]
|===
| Option | Default | Effect when set to `false`
| `useHeaderRecipients`| `true` | Endpoint URI to/cc/bcc always used; To/CC/BCC headers ignored.
| `useHeaderFrom` | `true` | Endpoint URI from always used; From/Sender headers ignored.
| `useHeaderSubject` | `true` | Endpoint URI subject always used; Subject header ignored.
| `useHeaderReplyTo` | `true` | Endpoint URI replyTo always used; Reply-To header ignored.
| Option | Default | Effect when set to `true`
| `useHeaderRecipients`| `false` | Message To/CC/BCC headers can override the endpoint URI recipients.
| `useHeaderFrom` | `false` | Message From/Sender headers can override the endpoint URI sender.
| `useHeaderSubject` | `false` | Message Subject header can override the endpoint URI subject.
| `useHeaderReplyTo` | `false` | Message Reply-To header can override the endpoint URI replyTo.
|===

All four default to `true` so existing behaviour is preserved. Example:
All four default to `false`. Set to `true` to let message headers override the endpoint configuration.

Example:

[tabs]
====
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions components/camel-mail/src/main/docs/mail-component.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,16 @@ cannot be overridden by message headers:

[options="header"]
|===
| Option | Default | Effect when set to `false`
| `useHeaderRecipients`| `true` | Endpoint URI to/cc/bcc always used; To/CC/BCC headers ignored.
| `useHeaderFrom` | `true` | Endpoint URI from always used; From/Sender headers ignored.
| `useHeaderSubject` | `true` | Endpoint URI subject always used; Subject header ignored.
| `useHeaderReplyTo` | `true` | Endpoint URI replyTo always used; Reply-To header ignored.
| Option | Default | Effect when set to `true`
| `useHeaderRecipients`| `false` | Message To/CC/BCC headers can override the endpoint URI recipients.
| `useHeaderFrom` | `false` | Message From/Sender headers can override the endpoint URI sender.
| `useHeaderSubject` | `false` | Message Subject header can override the endpoint URI subject.
| `useHeaderReplyTo` | `false` | Message Reply-To header can override the endpoint URI replyTo.
|===

All four default to `true` so existing behaviour is preserved. Example:
All four default to `false`. Set to `true` to let message headers override the endpoint configuration.

Example:

[tabs]
====
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ public boolean isUseHeaderRecipients() {

/**
* Whether message headers To, CC, and BCC override the recipients pre-configured in the endpoint URI. Defaults to
* true. Set to false to always use the endpoint URI recipients, ignoring any recipient headers from the message.
* false. Set to true to let message headers override the endpoint URI recipients.
*/
public void setUseHeaderRecipients(boolean useHeaderRecipients) {
this.useHeaderRecipients = useHeaderRecipients;
Expand All @@ -741,8 +741,8 @@ public boolean isUseHeaderFrom() {
}

/**
* Whether message headers From and Sender override the sender pre-configured in the endpoint URI. Defaults to true.
* Set to false to always use the endpoint URI sender, ignoring any From or Sender headers from the message.
* Whether message headers From and Sender override the sender pre-configured in the endpoint URI. Defaults to
* false. Set to true to let message headers From and Sender override the endpoint URI sender.
*/
public void setUseHeaderFrom(boolean useHeaderFrom) {
this.useHeaderFrom = useHeaderFrom;
Expand All @@ -753,8 +753,8 @@ public boolean isUseHeaderSubject() {
}

/**
* Whether message header Subject overrides the subject pre-configured in the endpoint URI. Defaults to true. Set to
* false to always use the endpoint URI subject, ignoring any Subject header from the message.
* Whether message header Subject overrides the subject pre-configured in the endpoint URI. Defaults to false. Set
* to true to let the message Subject header override the endpoint URI subject.
*/
public void setUseHeaderSubject(boolean useHeaderSubject) {
this.useHeaderSubject = useHeaderSubject;
Expand All @@ -765,8 +765,8 @@ public boolean isUseHeaderReplyTo() {
}

/**
* Whether message header Reply-To overrides the replyTo pre-configured in the endpoint URI. Defaults to true. Set
* to false to always use the endpoint URI replyTo, ignoring any Reply-To header from the message.
* Whether message header Reply-To overrides the replyTo pre-configured in the endpoint URI. Defaults to false. Set
* to true to let the message Reply-To header override the endpoint URI replyTo.
*/
public void setUseHeaderReplyTo(boolean useHeaderReplyTo) {
this.useHeaderReplyTo = useHeaderReplyTo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,8 @@ default ImapComponentBuilder to(java.lang.String to) {

/**
* Whether message headers From and Sender override the sender
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI sender, ignoring any From or Sender
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers From and Sender override the endpoint URI sender.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -556,9 +555,8 @@ default ImapComponentBuilder useHeaderFrom(boolean useHeaderFrom) {

/**
* Whether message headers To, CC, and BCC override the recipients
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI recipients, ignoring any recipient
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers override the endpoint URI recipients.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -576,8 +574,8 @@ default ImapComponentBuilder useHeaderRecipients(boolean useHeaderRecipients) {

/**
* Whether message header Reply-To overrides the replyTo pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI replyTo, ignoring any Reply-To header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Reply-To header override the endpoint URI replyTo.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -595,8 +593,8 @@ default ImapComponentBuilder useHeaderReplyTo(boolean useHeaderReplyTo) {

/**
* Whether message header Subject overrides the subject pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI subject, ignoring any Subject header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Subject header override the endpoint URI subject.
*
* The option is a: <code>boolean</code> type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,8 @@ default ImapsComponentBuilder to(java.lang.String to) {

/**
* Whether message headers From and Sender override the sender
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI sender, ignoring any From or Sender
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers From and Sender override the endpoint URI sender.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -556,9 +555,8 @@ default ImapsComponentBuilder useHeaderFrom(boolean useHeaderFrom) {

/**
* Whether message headers To, CC, and BCC override the recipients
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI recipients, ignoring any recipient
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers override the endpoint URI recipients.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -576,8 +574,8 @@ default ImapsComponentBuilder useHeaderRecipients(boolean useHeaderRecipients) {

/**
* Whether message header Reply-To overrides the replyTo pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI replyTo, ignoring any Reply-To header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Reply-To header override the endpoint URI replyTo.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -595,8 +593,8 @@ default ImapsComponentBuilder useHeaderReplyTo(boolean useHeaderReplyTo) {

/**
* Whether message header Subject overrides the subject pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI subject, ignoring any Subject header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Subject header override the endpoint URI subject.
*
* The option is a: <code>boolean</code> type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,8 @@ default Pop3ComponentBuilder to(java.lang.String to) {

/**
* Whether message headers From and Sender override the sender
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI sender, ignoring any From or Sender
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers From and Sender override the endpoint URI sender.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -556,9 +555,8 @@ default Pop3ComponentBuilder useHeaderFrom(boolean useHeaderFrom) {

/**
* Whether message headers To, CC, and BCC override the recipients
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI recipients, ignoring any recipient
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers override the endpoint URI recipients.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -576,8 +574,8 @@ default Pop3ComponentBuilder useHeaderRecipients(boolean useHeaderRecipients) {

/**
* Whether message header Reply-To overrides the replyTo pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI replyTo, ignoring any Reply-To header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Reply-To header override the endpoint URI replyTo.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -595,8 +593,8 @@ default Pop3ComponentBuilder useHeaderReplyTo(boolean useHeaderReplyTo) {

/**
* Whether message header Subject overrides the subject pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI subject, ignoring any Subject header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Subject header override the endpoint URI subject.
*
* The option is a: <code>boolean</code> type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,8 @@ default Pop3sComponentBuilder to(java.lang.String to) {

/**
* Whether message headers From and Sender override the sender
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI sender, ignoring any From or Sender
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers From and Sender override the endpoint URI sender.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -556,9 +555,8 @@ default Pop3sComponentBuilder useHeaderFrom(boolean useHeaderFrom) {

/**
* Whether message headers To, CC, and BCC override the recipients
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI recipients, ignoring any recipient
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers override the endpoint URI recipients.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -576,8 +574,8 @@ default Pop3sComponentBuilder useHeaderRecipients(boolean useHeaderRecipients) {

/**
* Whether message header Reply-To overrides the replyTo pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI replyTo, ignoring any Reply-To header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Reply-To header override the endpoint URI replyTo.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -595,8 +593,8 @@ default Pop3sComponentBuilder useHeaderReplyTo(boolean useHeaderReplyTo) {

/**
* Whether message header Subject overrides the subject pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI subject, ignoring any Subject header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Subject header override the endpoint URI subject.
*
* The option is a: <code>boolean</code> type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,8 @@ default SmtpComponentBuilder to(java.lang.String to) {

/**
* Whether message headers From and Sender override the sender
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI sender, ignoring any From or Sender
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers From and Sender override the endpoint URI sender.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -556,9 +555,8 @@ default SmtpComponentBuilder useHeaderFrom(boolean useHeaderFrom) {

/**
* Whether message headers To, CC, and BCC override the recipients
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI recipients, ignoring any recipient
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers override the endpoint URI recipients.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -576,8 +574,8 @@ default SmtpComponentBuilder useHeaderRecipients(boolean useHeaderRecipients) {

/**
* Whether message header Reply-To overrides the replyTo pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI replyTo, ignoring any Reply-To header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Reply-To header override the endpoint URI replyTo.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -595,8 +593,8 @@ default SmtpComponentBuilder useHeaderReplyTo(boolean useHeaderReplyTo) {

/**
* Whether message header Subject overrides the subject pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI subject, ignoring any Subject header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Subject header override the endpoint URI subject.
*
* The option is a: <code>boolean</code> type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,8 @@ default SmtpsComponentBuilder to(java.lang.String to) {

/**
* Whether message headers From and Sender override the sender
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI sender, ignoring any From or Sender
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers From and Sender override the endpoint URI sender.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -556,9 +555,8 @@ default SmtpsComponentBuilder useHeaderFrom(boolean useHeaderFrom) {

/**
* Whether message headers To, CC, and BCC override the recipients
* pre-configured in the endpoint URI. Defaults to true. Set to false to
* always use the endpoint URI recipients, ignoring any recipient
* headers from the message.
* pre-configured in the endpoint URI. Defaults to false. Set to true to
* let message headers override the endpoint URI recipients.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -576,8 +574,8 @@ default SmtpsComponentBuilder useHeaderRecipients(boolean useHeaderRecipients) {

/**
* Whether message header Reply-To overrides the replyTo pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI replyTo, ignoring any Reply-To header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Reply-To header override the endpoint URI replyTo.
*
* The option is a: <code>boolean</code> type.
*
Expand All @@ -595,8 +593,8 @@ default SmtpsComponentBuilder useHeaderReplyTo(boolean useHeaderReplyTo) {

/**
* Whether message header Subject overrides the subject pre-configured
* in the endpoint URI. Defaults to true. Set to false to always use the
* endpoint URI subject, ignoring any Subject header from the message.
* in the endpoint URI. Defaults to false. Set to true to let the
* message Subject header override the endpoint URI subject.
*
* The option is a: <code>boolean</code> type.
*
Expand Down
Loading
Loading