JAMES-2132 Extract field names into constants
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/633d2eb5 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/633d2eb5 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/633d2eb5 Branch: refs/heads/master Commit: 633d2eb5cdd57bc195e9a1fc9ad1f2c6d33d63ca Parents: 034eef6 Author: benwa <btell...@linagora.com> Authored: Mon Aug 28 20:59:19 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Thu Aug 31 18:00:20 2017 +0700 ---------------------------------------------------------------------- mdn/src/main/java/org/apache/james/mdn/fields/Disposition.java | 4 +++- .../main/java/org/apache/james/mdn/fields/OriginalMessageId.java | 3 ++- .../java/org/apache/james/mdn/fields/ReportingUserAgent.java | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/633d2eb5/mdn/src/main/java/org/apache/james/mdn/fields/Disposition.java ---------------------------------------------------------------------- diff --git a/mdn/src/main/java/org/apache/james/mdn/fields/Disposition.java b/mdn/src/main/java/org/apache/james/mdn/fields/Disposition.java index a3c802e..742893c 100644 --- a/mdn/src/main/java/org/apache/james/mdn/fields/Disposition.java +++ b/mdn/src/main/java/org/apache/james/mdn/fields/Disposition.java @@ -32,6 +32,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; public class Disposition implements Field { + public static final String FIELD_NAME = "Disposition"; + public static class Builder { private Optional<DispositionActionMode> actionMode = Optional.empty(); private Optional<DispositionSendingMode> sendingMode = Optional.empty(); @@ -106,7 +108,7 @@ public class Disposition implements Field { @Override public String formattedValue() { - return "Disposition: " + return FIELD_NAME + ": " + actionMode.getValue() + "/" + sendingMode.getValue() + ";" + type.getValue() + formattedModifiers(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/633d2eb5/mdn/src/main/java/org/apache/james/mdn/fields/OriginalMessageId.java ---------------------------------------------------------------------- diff --git a/mdn/src/main/java/org/apache/james/mdn/fields/OriginalMessageId.java b/mdn/src/main/java/org/apache/james/mdn/fields/OriginalMessageId.java index 83666dc..220a905 100644 --- a/mdn/src/main/java/org/apache/james/mdn/fields/OriginalMessageId.java +++ b/mdn/src/main/java/org/apache/james/mdn/fields/OriginalMessageId.java @@ -20,6 +20,7 @@ package org.apache.james.mdn.fields; public class OriginalMessageId implements Field { + private static final String FIELD_NAME = "Original-Message-ID"; private final String originalMessageId; public OriginalMessageId(String originalMessageId) { @@ -32,6 +33,6 @@ public class OriginalMessageId implements Field { @Override public String formattedValue() { - return "Original-Message-ID: " + originalMessageId; + return FIELD_NAME + ": " + originalMessageId; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/633d2eb5/mdn/src/main/java/org/apache/james/mdn/fields/ReportingUserAgent.java ---------------------------------------------------------------------- diff --git a/mdn/src/main/java/org/apache/james/mdn/fields/ReportingUserAgent.java b/mdn/src/main/java/org/apache/james/mdn/fields/ReportingUserAgent.java index 9124061..492e56d 100644 --- a/mdn/src/main/java/org/apache/james/mdn/fields/ReportingUserAgent.java +++ b/mdn/src/main/java/org/apache/james/mdn/fields/ReportingUserAgent.java @@ -24,6 +24,7 @@ import java.util.Optional; import com.google.common.base.Preconditions; public class ReportingUserAgent implements Field { + private static final String FIELD_NAME = "Reporting-UA"; private final String userAgentName; private final Optional<String> userAgentProduct; @@ -44,7 +45,7 @@ public class ReportingUserAgent implements Field { @Override public String formattedValue() { - return "Reporting-UA: " + userAgentName + "; " + return FIELD_NAME + ": " + userAgentName + "; " + userAgentProduct.orElse(""); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
