From 2c3c3884f208346d01fa5c062fe547c9f8c8a56f Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Tue, 25 Sep 2018 14:15:00 +0200
Subject: [PATCH] Move Mailbox Sessions to own packet

---
 .../org/briarproject/bramble/mailbox/MailboxManagerImpl.java    | 2 ++
 .../java/org/briarproject/bramble/mailbox/MailboxModule.java    | 2 ++
 .../bramble/mailbox/{ => sessions}/AbstractMailboxSession.java  | 2 +-
 .../bramble/mailbox/{ => sessions}/ContactMailboxSession.java   | 2 +-
 .../bramble/mailbox/{ => sessions}/FeedableSyncInputStream.java | 2 +-
 .../bramble/mailbox/{ => sessions}/MailboxContactSession.java   | 2 +-
 .../bramble/mailbox/{ => sessions}/MailboxOwnerSession.java     | 2 +-
 .../bramble/mailbox/{ => sessions}/MailboxSessionFactory.java   | 2 +-
 .../mailbox/{ => sessions}/MailboxSessionFactoryImpl.java       | 2 +-
 .../mailbox/{ => sessions}/MailboxSyncRequestWriter.java        | 2 +-
 .../bramble/mailbox/{ => sessions}/PrivateMailboxSession.java   | 2 +-
 11 files changed, 13 insertions(+), 9 deletions(-)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/AbstractMailboxSession.java (99%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/ContactMailboxSession.java (98%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/FeedableSyncInputStream.java (96%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/MailboxContactSession.java (98%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/MailboxOwnerSession.java (98%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/MailboxSessionFactory.java (90%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/MailboxSessionFactoryImpl.java (98%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/MailboxSyncRequestWriter.java (97%)
 rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{ => sessions}/PrivateMailboxSession.java (98%)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
index 3a9283316..8c9c76223 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
@@ -23,6 +23,8 @@ import org.briarproject.bramble.api.transport.StreamReaderFactory;
 import org.briarproject.bramble.api.transport.StreamWriter;
 import org.briarproject.bramble.api.transport.StreamWriterFactory;
 import org.briarproject.bramble.mailbox.protocol.MailboxProtocol;
+import org.briarproject.bramble.mailbox.sessions.MailboxSessionFactory;
+import org.briarproject.bramble.mailbox.sessions.PrivateMailboxSession;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
index ac73a278c..e2f3ad3a3 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
@@ -3,6 +3,8 @@ package org.briarproject.bramble.mailbox;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.mailbox.MailboxManager;
 import org.briarproject.bramble.api.mailbox.MailboxService;
+import org.briarproject.bramble.mailbox.sessions.MailboxSessionFactory;
+import org.briarproject.bramble.mailbox.sessions.MailboxSessionFactoryImpl;
 
 import javax.inject.Singleton;
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
similarity index 99%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
index 23df67adc..d39e05cf5 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java
similarity index 98%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxSession.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java
index bf5d916ff..7503f5e7d 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/FeedableSyncInputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java
similarity index 96%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/FeedableSyncInputStream.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java
index f7538c6e0..e5310130f 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/FeedableSyncInputStream.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxContactSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxContactSession.java
similarity index 98%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxContactSession.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxContactSession.java
index 115f318ee..04c933687 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxContactSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxContactSession.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxOwnerSession.java
similarity index 98%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxOwnerSession.java
index 0e313cf37..3bb2d2edc 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxOwnerSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxOwnerSession.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactory.java
similarity index 90%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactory.java
index 70331ff9b..c5e448164 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactory.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactType;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java
similarity index 98%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java
index 9dd424c57..9fa258617 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactType;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncRequestWriter.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java
similarity index 97%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncRequestWriter.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java
index 5e8c57fda..f4cb424f4 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncRequestWriter.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.transport.StreamWriter;
 import org.briarproject.bramble.mailbox.protocol.MailboxProtocol;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/PrivateMailboxSession.java
similarity index 98%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/PrivateMailboxSession.java
index 1d24dd3f3..a43c6601d 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/PrivateMailboxSession.java
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.mailbox;
+package org.briarproject.bramble.mailbox.sessions;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-- 
GitLab