Rename MailboxSession -> AbstractMailboxSession

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSession.java → bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java

@@ -9,8 +9,6 @@ import org.briarproject.bramble.api.transport.StreamContext;
 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.MailboxMessage;
-import org.briarproject.bramble.mailbox.protocol.MailboxMessage.TYPE;
 import org.briarproject.bramble.mailbox.protocol.MailboxProtocol;
 import org.briarproject.bramble.mailbox.protocol.MailboxRequest;
 import org.briarproject.bramble.mailbox.protocol.MailboxRequestEnd;
@@ -32,9 +30,9 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
-abstract class MailboxSession implements Runnable {
+abstract class AbstractMailboxSession implements Runnable {
 	private static final Logger LOG =
-			Logger.getLogger(MailboxSession.class.getName());
+			Logger.getLogger(AbstractMailboxSession.class.getName());
 	protected final Executor ioExecutor;
 	protected final ContactId contactId;
 	private KeyManager keyManager;
@@ -49,7 +47,7 @@ abstract class MailboxSession implements Runnable {
 	private AtomicBoolean remoteSessionFinished = new AtomicBoolean(false);
 	protected boolean running;
 
-	public MailboxSession(Executor ioExecutor,
+	public AbstractMailboxSession(Executor ioExecutor,
 			KeyManager keyManager,
 			SyncSessionFactory syncSessionFactory,
 			StreamWriterFactory streamWriterFactory,
@@ -208,7 +206,7 @@ abstract class MailboxSession implements Runnable {
 	}
 
 	/**
-	 * Must be called once at the end of a MailboxSession to signal the end of
+	 * Must be called once at the end of a AbstractMailboxSession to signal the end of
 	 * the session to the peer. This call blocks until the remote session
 	 * signals that it was ended.
 	 */

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java

@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.contact.ContactType;
 import org.briarproject.bramble.mailbox.protocol.MailboxProtocol;
 
 interface MailboxSessionFactory {
-	MailboxSession createMailboxSession(MailboxProtocol mailboxProtocol,
+	AbstractMailboxSession createMailboxSession(MailboxProtocol mailboxProtocol,
 			ContactId contactId, ContactType contactType,
 			int transportMaxLatency,
 			int transportMaxIdleTime);

bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java

@@ -8,9 +8,7 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.plugin.ConnectionManager;
 import org.briarproject.bramble.api.sync.SyncSessionFactory;
 import org.briarproject.bramble.api.transport.KeyManager;
-import org.briarproject.bramble.api.transport.StreamContext;
 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;
 
@@ -43,7 +41,7 @@ public class MailboxSessionFactoryImpl implements MailboxSessionFactory {
 	}
 
 	@Override
-	public MailboxSession createMailboxSession(MailboxProtocol mailboxProtocol,
+	public AbstractMailboxSession createMailboxSession(MailboxProtocol mailboxProtocol,
 			ContactId contactId, ContactType contactType,
 			int transportMaxLatency,
 			int transportMaxIdleTime) {