Author: matthieu
Date: Wed Dec 16 15:31:09 2015
New Revision: 1720372
URL: http://svn.apache.org/viewvc?rev=1720372&view=rev
Log:
JAMES-1646 move mailbox related model classes into a mailbox package
Added:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
- copied, changed from r1720371,
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Mailbox.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
- copied, changed from r1720371,
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Role.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
- copied, changed from r1720371,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RoleTest.java
- copied, changed from r1720371,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/RoleTest.java
Removed:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Mailbox.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Role.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/RoleTest.java
Modified:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/BeansTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
Modified:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java?rev=1720372&r1=1720371&r2=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMailboxesMethod.java
Wed Dec 16 15:31:09 2015
@@ -23,11 +23,10 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.james.jmap.methods.Method.Response.Name;
import org.apache.james.jmap.model.GetMailboxesRequest;
import org.apache.james.jmap.model.GetMailboxesResponse;
-import org.apache.james.jmap.model.Mailbox;
-import org.apache.james.jmap.model.Role;
+import org.apache.james.jmap.model.mailbox.Mailbox;
+import org.apache.james.jmap.model.mailbox.Role;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
Modified:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java?rev=1720372&r1=1720371&r2=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java
Wed Dec 16 15:31:09 2015
@@ -25,6 +25,7 @@ import org.apache.commons.lang.NotImplem
import org.apache.james.jmap.methods.Method;
import com.google.common.collect.ImmutableList;
+import org.apache.james.jmap.model.mailbox.Mailbox;
public class GetMailboxesResponse implements Method.Response {
Copied:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
(from r1720371,
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Mailbox.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java?p2=james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java&p1=james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Mailbox.java&r1=1720371&r2=1720372&rev=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Mailbox.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
Wed Dec 16 15:31:09 2015
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.model;
+package org.apache.james.jmap.model.mailbox;
import java.util.Objects;
import java.util.Optional;
Copied:
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
(from r1720371,
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Role.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java?p2=james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java&p1=james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Role.java&r1=1720371&r2=1720372&rev=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Role.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
Wed Dec 16 15:31:09 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.jmap.model;
+package org.apache.james.jmap.model.mailbox;
import java.util.Locale;
import java.util.Optional;
Modified:
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/BeansTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/BeansTest.java?rev=1720372&r1=1720371&r2=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/BeansTest.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/BeansTest.java
Wed Dec 16 15:31:09 2015
@@ -19,7 +19,7 @@
package org.apache.james.jmap;
-import org.apache.james.jmap.model.Mailbox;
+import org.apache.james.jmap.model.mailbox.Mailbox;
import org.junit.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
Modified:
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java?rev=1720372&r1=1720371&r2=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
Wed Dec 16 15:31:09 2015
@@ -27,7 +27,7 @@ import javax.mail.Flags;
import org.apache.james.jmap.model.GetMailboxesRequest;
import org.apache.james.jmap.model.GetMailboxesResponse;
-import org.apache.james.jmap.model.Mailbox;
+import org.apache.james.jmap.model.mailbox.Mailbox;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
Copied:
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
(from r1720371,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java?p2=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java&p1=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxTest.java&r1=1720371&r2=1720372&rev=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxTest.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
Wed Dec 16 15:31:09 2015
@@ -17,12 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.model;
+package org.apache.james.jmap.model.mailbox;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
+import org.apache.james.jmap.model.mailbox.Mailbox;
+import org.apache.james.jmap.model.mailbox.Role;
import org.junit.Test;
public class MailboxTest {
@@ -86,7 +88,7 @@ public class MailboxTest {
@Test
public void buildShouldWork() {
- Mailbox expectedMailbox = new Mailbox("id", "name",
Optional.of("parentId"), Optional.of(Role.DRAFTS), 123,
+ Mailbox expectedMailbox = new Mailbox("id", "name",
Optional.of("parentId"), Optional.of(Role.DRAFTS), 123,
true, true, true, true, true, true, true, 456, 789, 741, 852);
Mailbox mailbox = Mailbox.builder()
Copied:
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RoleTest.java
(from r1720371,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/RoleTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RoleTest.java?p2=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RoleTest.java&p1=james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/RoleTest.java&r1=1720371&r2=1720372&rev=1720372&view=diff
==============================================================================
---
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/RoleTest.java
(original)
+++
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RoleTest.java
Wed Dec 16 15:31:09 2015
@@ -1,4 +1,3 @@
-package org.apache.james.jmap.model;
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,9 +16,11 @@ package org.apache.james.jmap.model;
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
+package org.apache.james.jmap.model.mailbox;
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.james.jmap.model.mailbox.Role;
import org.junit.Test;
import java.util.Locale;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
