Rename server session classes

3 files changed, 10 insertions, 16 deletions

diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
index 5415779e..c11cb1f6 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -126,7 +126,7 @@ public class SshDaemon {
 				gitblit.getBaseFolder(), HOST_KEY_STORE).getPath()));
 		sshd.setPublickeyAuthenticator(publickeyAuthenticator);
 		sshd.setPasswordAuthenticator(new UsernamePasswordAuthenticator(gitblit));
-		sshd.setSessionFactory(new SshSessionFactory());
+		sshd.setSessionFactory(new SshServerSessionFactory());
 		sshd.setFileSystemFactory(new DisabledFilesystemFactory());
 		sshd.setTcpipForwardingFilter(new NonForwardingFilter());
 
diff --git a/src/main/java/com/gitblit/transport/ssh/GitblitServerSession.java b/src/main/java/com/gitblit/transport/ssh/SshServerSession.java
index e5336025..d12a6be2 100644
--- a/src/main/java/com/gitblit/transport/ssh/GitblitServerSession.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshServerSession.java
@@ -22,10 +22,9 @@ import org.apache.sshd.server.ServerFactoryManager;
 import org.apache.sshd.server.session.ServerSession;
 
 // Expose addition of close session listeners
-class GitblitServerSession extends ServerSession {
+class SshServerSession extends ServerSession {
 
-	GitblitServerSession(ServerFactoryManager server, IoSession ioSession)
-			throws Exception {
+	SshServerSession(ServerFactoryManager server, IoSession ioSession) throws Exception {
 		super(server, ioSession);
 	}
 
diff --git a/src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java b/src/main/java/com/gitblit/transport/ssh/SshServerSessionFactory.java
index 66fe057d..dd3c139d 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshServerSessionFactory.java
@@ -27,33 +27,29 @@ import org.apache.sshd.server.session.SessionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  *
  * @author James Moger
  *
  */
-public class SshSessionFactory extends SessionFactory {
+public class SshServerSessionFactory extends SessionFactory {
 
 	private final Logger log = LoggerFactory.getLogger(getClass());
 
-	public SshSessionFactory() {
+	public SshServerSessionFactory() {
 	}
 
 	@Override
-	protected AbstractSession createSession(final IoSession io)
-			throws Exception {
+	protected AbstractSession createSession(final IoSession io) throws Exception {
 		log.info("connection accepted on " + io);
 
 		if (io instanceof MinaSession) {
 			if (((MinaSession) io).getSession().getConfig() instanceof SocketSessionConfig) {
-				((SocketSessionConfig) ((MinaSession) io).getSession()
-						.getConfig()).setKeepAlive(true);
+				((SocketSessionConfig) ((MinaSession) io).getSession().getConfig()).setKeepAlive(true);
 			}
 		}
 
-		final GitblitServerSession session = (GitblitServerSession) super
-				.createSession(io);
+		final SshServerSession session = (SshServerSession) super.createSession(io);
 		SocketAddress peer = io.getRemoteAddress();
 		SshDaemonClient client = new SshDaemonClient(peer);
 		session.setAttribute(SshDaemonClient.KEY, client);
@@ -70,8 +66,7 @@ public class SshSessionFactory extends SessionFactory {
 	}
 
 	@Override
-	protected AbstractSession doCreateSession(IoSession ioSession)
-			throws Exception {
-		return new GitblitServerSession(server, ioSession);
+	protected AbstractSession doCreateSession(IoSession ioSession) throws Exception {
+		return new SshServerSession(server, ioSession);
 	}
 }