Author: matthieu
Date: Mon Nov 2 13:49:00 2015
New Revision: 1711995
URL: http://svn.apache.org/viewvc?rev=1711995&view=rev
Log:
JAMES-1595 implement getErrorMessage on Mapping
Modified:
james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
Modified:
james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java?rev=1711995&r1=1711994&r2=1711995&view=diff
==============================================================================
---
james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
(original)
+++
james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
Mon Nov 2 13:49:00 2015
@@ -33,4 +33,6 @@ public interface Mapping {
Mapping appendDomain(String domain);
+ String getErrorMessage();
+
}
\ No newline at end of file
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java?rev=1711995&r1=1711994&r2=1711995&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
Mon Nov 2 13:49:00 2015
@@ -88,6 +88,12 @@ public class MappingImpl implements Mapp
}
@Override
+ public String getErrorMessage() {
+
Preconditions.checkState(mapping.startsWith(RecipientRewriteTable.ERROR_PREFIX));
+ return mapping.substring(RecipientRewriteTable.ERROR_PREFIX.length());
+ }
+
+ @Override
public boolean equals(Object other) {
if (other instanceof MappingImpl) {
MappingImpl otherMapping = (MappingImpl) other;
Modified:
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java?rev=1711995&r1=1711994&r2=1711995&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
(original)
+++
james/project/trunk/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
Mon Nov 2 13:49:00 2015
@@ -111,4 +111,20 @@ public class MappingImplTest {
public void getTypeShouldReturnDomainWhenDomainPrefix() {
assertThat(MappingImpl.domain("abc").getType()).isEqualTo(Mapping.Type.Domain);
}
+
+ @Test(expected=IllegalStateException.class)
+ public void getErrorMessageShouldThrowWhenMappingIsNotAnError() {
+ MappingImpl.domain("toto").getErrorMessage();
+ }
+
+ @Test
+ public void getErrorMessageShouldReturnMessageWhenErrorWithMessage() {
+
assertThat(MappingImpl.error("toto").getErrorMessage()).isEqualTo("toto");
+ }
+
+
+ @Test
+ public void getErrorMessageShouldReturnWhenErrorWithoutMessage() {
+ assertThat(MappingImpl.error("").getErrorMessage()).isEqualTo("");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
