You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/01/16 06:59:19 UTC
[11/17] james-project git commit: JAMES-2637 add asMailAddressString
method to MappingSource
JAMES-2637 add asMailAddressString method to MappingSource
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8ea2c22e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8ea2c22e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8ea2c22e
Branch: refs/heads/master
Commit: 8ea2c22ef39ada4de2b31161c37327bce40b1ffa
Parents: 331a888
Author: Rene Cordier <rc...@linagora.com>
Authored: Tue Jan 15 14:43:27 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Jan 16 13:48:56 2019 +0700
----------------------------------------------------------------------
.../org/apache/james/rrt/lib/MappingSource.java | 4 ++
.../apache/james/rrt/lib/MappingSourceTest.java | 67 ++++++++++++++++++++
2 files changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ea2c22e/server/data/data-api/src/main/java/org/apache/james/rrt/lib/MappingSource.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/MappingSource.java b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/MappingSource.java
index 68ad8b4..9e5d90f 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/MappingSource.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/MappingSource.java
@@ -146,6 +146,10 @@ public class MappingSource implements Serializable, Comparable<MappingSource> {
return Objects.hash(domain, user, wildcard);
}
+ public String asMailAddressString() {
+ return getFixedUser() + "@" + getFixedDomain();
+ }
+
@Override
public int compareTo(MappingSource mappingSource) {
final int result;
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ea2c22e/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingSourceTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingSourceTest.java b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingSourceTest.java
new file mode 100644
index 0000000..9088b42
--- /dev/null
+++ b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingSourceTest.java
@@ -0,0 +1,67 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.rrt.lib;
+
+import org.apache.james.core.Domain;
+import org.apache.james.core.MailAddress;
+import org.apache.james.core.User;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+class MappingSourceTest {
+ private static final String DOMAIN = "domain.tld";
+ private static final String USER = "alice";
+ private static final String MAIL_ADDRESS = USER + "@" + DOMAIN;
+
+ @Test
+ void asMailAddressStringShouldSerializeWilcard() {
+ MappingSource mappingSource = MappingSource.wildCard();
+
+ assertThat(mappingSource.asMailAddressString()).isEqualTo("*@*");
+ }
+
+ @Test
+ void asMailAddressStringShouldSerializeDomain() {
+ MappingSource mappingSource = MappingSource.fromDomain(Domain.of(DOMAIN));
+
+ assertThat(mappingSource.asMailAddressString()).isEqualTo("*@" + DOMAIN);
+ }
+
+ @Test
+ void asMailAddressStringShouldSerializeUser() {
+ MappingSource mappingSource = MappingSource.fromUser(USER, DOMAIN);
+
+ assertThat(mappingSource.asMailAddressString()).isEqualTo(MAIL_ADDRESS);
+ }
+
+ @Test
+ void asMailAddressStringShouldSerializeUserWithoutDomain() {
+ MappingSource mappingSource = MappingSource.fromUser(User.fromUsername(USER));
+
+ assertThat(mappingSource.asMailAddressString()).isEqualTo(USER + "@*");
+ }
+
+ @Test
+ void asMailAddressStringShouldSerializeMailAddress() throws Exception {
+ MappingSource mappingSource = MappingSource.fromMailAddress(new MailAddress(MAIL_ADDRESS));
+
+ assertThat(mappingSource.asMailAddressString()).isEqualTo(MAIL_ADDRESS);
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org