From acdefddd24b7d89c6abe7fde6179bfdae756e21c Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Thu, 6 Sep 2018 16:00:40 +0200
Subject: [PATCH] Rename MailboxSession -> AbstractMailboxSession
---
...MailboxSession.java => AbstractMailboxSession.java} | 10 ++++------
.../bramble/mailbox/MailboxSessionFactory.java | 2 +-
.../bramble/mailbox/MailboxSessionFactoryImpl.java | 4 +---
3 files changed, 6 insertions(+), 10 deletions(-)
rename bramble-core/src/main/java/org/briarproject/bramble/mailbox/{MailboxSession.java => AbstractMailboxSession.java} (95%)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
similarity index 95%
rename from bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSession.java
rename to bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
index 8aac031fb..9461e2c91 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSession.java
+++ b/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.
*/
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java
index 6de47d0f7..5bf20cac9 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactory.java
+++ b/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);
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java
index 03e2c2768..936125e5d 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSessionFactoryImpl.java
+++ b/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) {
--
GitLab