MAILBOX-279: Mailbox interface supports setMailboxId and its refactor

apache · Dec 7, 2016 · ee3fe49 · ee3fe49
1 parent ec03688
commit ee3fe49
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 10 deletions.
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java
@@ -22,6 +22,7 @@
 
 import org.apache.james.mailbox.hbase.HBaseId;
 import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.SimpleMailboxACL;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
@@ -64,8 +65,9 @@ public HBaseId getMailboxId() {
         return mailboxId;
     }
 
-    public void setMailboxId(HBaseId mailboxId) {
+    @Override
-        this.mailboxId = mailboxId;
+    public void setMailboxId(MailboxId mailboxId) {
+        this.mailboxId = (HBaseId)mailboxId;
     }
     /*
      * (non-Javadoc)

diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
@@ -27,6 +27,7 @@
 import org.apache.james.mailbox.jcr.JCRImapConstants;
 import org.apache.james.mailbox.jcr.Persistent;
 import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.SimpleMailboxACL;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
@@ -198,10 +199,7 @@ public boolean equals(Object obj) {
         return true;
     }
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
-     */
     public JCRId getMailboxId() {
         if (isPersistent()) {
             try {
@@ -213,6 +211,10 @@ public JCRId getMailboxId() {
         return null;      
     }
 
+    @Override
+    public void setMailboxId(MailboxId mailboxId) {
+
+    }
     /*
      * (non-Javadoc)
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()

diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -29,6 +29,7 @@
 
 import org.apache.james.mailbox.jpa.JPAId;
 import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.SimpleMailboxACL;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
@@ -118,6 +119,10 @@ public JPAId getMailboxId() {
         return JPAId.of(mailboxId);
     }
 
+    @Override
+    public void setMailboxId(MailboxId mailboxId) {
+        this.mailboxId = ((JPAId)mailboxId).getRawId();
+    }
     /**
      * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
      */

diff --git a/...test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/...test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
@@ -606,12 +606,16 @@ public void notOperatorShouldReverseMatching() throws Exception {
     }
 
     private final class SimpleMailbox implements Mailbox {
-        private final TestId id;
+        private TestId id;
 
         public SimpleMailbox(long id) {
         	this.id = TestId.of(id);
         }
 
+        public void setMailboxId(MailboxId id) {
+            this.id = (TestId)id;
+        }
+
         public TestId getMailboxId() {
             return id;
         }

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
@@ -25,7 +25,7 @@
  * Models long term mailbox data.
  */
 public interface Mailbox {
-
+    void setMailboxId(MailboxId id);
     /**
      * Gets the unique mailbox ID.
      * @return mailbox id

diff --git a/...box/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java b/...box/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
@@ -138,7 +138,9 @@ public int hashCode() {
         final int PRIME = 31;
         int result = 1;
         result = PRIME * result + namespace.hashCode();
-        result = PRIME * result + user.hashCode();
+        if (user != null) {
+            result = PRIME * result + user.hashCode();
+        }
         result = PRIME * result + name.hashCode();
         return result;
     }
@@ -151,7 +153,7 @@ public String toString() {
         return namespace + ":" + user + ":" + name;
     }
 
-
+    @Override
     public void setMailboxId(MailboxId id) {
         this.id = id;
     }

diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java
@@ -37,6 +37,7 @@
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.mock.MockMailboxSession;
 import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageResult;
 import org.apache.james.mailbox.model.SimpleMailboxACL;
 import org.apache.james.mailbox.model.UpdatedFlags;
@@ -113,6 +114,10 @@ public MailboxACL getACL() {
         public void setACL(MailboxACL acl) {
         }
 
+        @Override
+        public void setMailboxId(MailboxId id) {
+        }
+
     };
 
     @Before