diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSession.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSockJsSession.java similarity index 95% rename from spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSession.java rename to spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSockJsSession.java index 43473eb9972..54be439ddec 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSession.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/AbstractServerSockJsSession.java @@ -35,14 +35,14 @@ import org.springframework.util.Assert; * @author Rossen Stoyanchev * @since 4.0 */ -public abstract class AbstractServerSession extends SockJsSessionSupport { +public abstract class AbstractServerSockJsSession extends SockJsSessionSupport { private final SockJsConfiguration sockJsConfig; private ScheduledFuture heartbeatTask; - public AbstractServerSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { + public AbstractServerSockJsSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { super(sessionId, sockJsHandler); this.sockJsConfig = sockJsConfig; } diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpSendingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpSendingTransportHandler.java index aff6cea280d..d917ef035b6 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpSendingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpSendingTransportHandler.java @@ -66,12 +66,12 @@ public abstract class AbstractHttpSendingTransportHandler // Set content type before writing response.getHeaders().setContentType(getContentType()); - AbstractHttpServerSession httpServerSession = (AbstractHttpServerSession) session; + AbstractHttpServerSockJsSession httpServerSession = (AbstractHttpServerSockJsSession) session; handleRequestInternal(request, response, httpServerSession); } protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response, - AbstractHttpServerSession httpServerSession) throws Exception, IOException { + AbstractHttpServerSockJsSession httpServerSession) throws Exception, IOException { if (httpServerSession.isNew()) { handleNewSession(request, response, httpServerSession); @@ -87,7 +87,7 @@ public abstract class AbstractHttpSendingTransportHandler } protected void handleNewSession(ServerHttpRequest request, ServerHttpResponse response, - AbstractHttpServerSession session) throws Exception { + AbstractHttpServerSockJsSession session) throws Exception { logger.debug("Opening " + getTransportType() + " connection"); session.setFrameFormat(getFrameFormat(request)); diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSession.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSockJsSession.java similarity index 93% rename from spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSession.java rename to spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSockJsSession.java index 47efdea55b8..b71b4287a9d 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSession.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSockJsSession.java @@ -23,7 +23,7 @@ import org.springframework.http.server.AsyncServerHttpRequest; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.sockjs.SockJsHandler; -import org.springframework.sockjs.server.AbstractServerSession; +import org.springframework.sockjs.server.AbstractServerSockJsSession; import org.springframework.sockjs.server.SockJsConfiguration; import org.springframework.sockjs.server.SockJsFrame; import org.springframework.sockjs.server.SockJsFrame.FrameFormat; @@ -36,7 +36,7 @@ import org.springframework.util.Assert; * @author Rossen Stoyanchev * @since 4.0 */ -public abstract class AbstractHttpServerSession extends AbstractServerSession { +public abstract class AbstractHttpServerSockJsSession extends AbstractServerSockJsSession { private FrameFormat frameFormat; @@ -47,7 +47,7 @@ public abstract class AbstractHttpServerSession extends AbstractServerSession { private ServerHttpResponse response; - public AbstractHttpServerSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { + public AbstractHttpServerSockJsSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { super(sessionId, sockJsConfig, sockJsHandler); } diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractStreamingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractStreamingTransportHandler.java index 5aa8eb11be2..f8dc637c166 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractStreamingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractStreamingTransportHandler.java @@ -33,14 +33,14 @@ public abstract class AbstractStreamingTransportHandler extends AbstractHttpSend @Override - public StreamingHttpServerSession createSession(String sessionId, SockJsHandler sockJsHandler) { + public StreamingServerSockJsSession createSession(String sessionId, SockJsHandler sockJsHandler) { Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration"); - return new StreamingHttpServerSession(sessionId, getSockJsConfig(), sockJsHandler); + return new StreamingServerSockJsSession(sessionId, getSockJsConfig(), sockJsHandler); } @Override public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response, - AbstractHttpServerSession session) throws Exception { + AbstractHttpServerSockJsSession session) throws Exception { writePrelude(request, response); super.handleRequestInternal(request, response, session); @@ -51,7 +51,7 @@ public abstract class AbstractStreamingTransportHandler extends AbstractHttpSend @Override protected void handleNewSession(ServerHttpRequest request, ServerHttpResponse response, - AbstractHttpServerSession session) throws IOException, Exception { + AbstractHttpServerSockJsSession session) throws IOException, Exception { super.handleNewSession(request, response, session); diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/HtmlFileTransportHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/HtmlFileTransportHandler.java index d6568fa7972..eb752cd302c 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/HtmlFileTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/HtmlFileTransportHandler.java @@ -78,7 +78,7 @@ public class HtmlFileTransportHandler extends AbstractStreamingTransportHandler @Override public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response, - AbstractHttpServerSession session) throws Exception { + AbstractHttpServerSockJsSession session) throws Exception { String callback = request.getQueryParams().getFirst("c"); if (! StringUtils.hasText(callback)) { diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/JsonpPollingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/JsonpPollingTransportHandler.java index a00c5de6b74..23c9f07efbe 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/JsonpPollingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/JsonpPollingTransportHandler.java @@ -50,14 +50,14 @@ public class JsonpPollingTransportHandler extends AbstractHttpSendingTransportHa } @Override - public PollingHttpServerSession createSession(String sessionId, SockJsHandler sockJsHandler) { + public PollingServerSockJsSession createSession(String sessionId, SockJsHandler sockJsHandler) { Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration"); - return new PollingHttpServerSession(sessionId, getSockJsConfig(), sockJsHandler); + return new PollingServerSockJsSession(sessionId, getSockJsConfig(), sockJsHandler); } @Override public void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response, - AbstractHttpServerSession session) throws Exception { + AbstractHttpServerSockJsSession session) throws Exception { String callback = request.getQueryParams().getFirst("c"); if (! StringUtils.hasText(callback)) { diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingHttpServerSession.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingServerSockJsSession.java similarity index 86% rename from spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingHttpServerSession.java rename to spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingServerSockJsSession.java index d48fa31a2c2..baac23d5874 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingHttpServerSession.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/PollingServerSockJsSession.java @@ -22,9 +22,9 @@ import org.springframework.sockjs.server.SockJsConfiguration; import org.springframework.sockjs.server.SockJsFrame; -public class PollingHttpServerSession extends AbstractHttpServerSession { +public class PollingServerSockJsSession extends AbstractHttpServerSockJsSession { - public PollingHttpServerSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { + public PollingServerSockJsSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { super(sessionId, sockJsConfig, sockJsHandler); } diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java index 2da57cbf354..c23863f9012 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.sockjs.SockJsHandler; import org.springframework.sockjs.SockJsSessionSupport; -import org.springframework.sockjs.server.AbstractServerSession; +import org.springframework.sockjs.server.AbstractServerSockJsSession; import org.springframework.sockjs.server.SockJsConfiguration; import org.springframework.sockjs.server.SockJsFrame; import org.springframework.util.Assert; @@ -82,7 +82,7 @@ public class SockJsWebSocketHandler implements WebSocketHandler { if (logger.isDebugEnabled()) { logger.debug("New session: " + wsSession); } - SockJsSessionSupport session = new WebSocketServerSession(wsSession, getSockJsConfig()); + SockJsSessionSupport session = new WebSocketServerSockJsSession(wsSession, getSockJsConfig()); this.sessions.put(wsSession, session); } @@ -126,12 +126,12 @@ public class SockJsWebSocketHandler implements WebSocketHandler { } - private class WebSocketServerSession extends AbstractServerSession { + private class WebSocketServerSockJsSession extends AbstractServerSockJsSession { private WebSocketSession webSocketSession; - public WebSocketServerSession(WebSocketSession wsSession, SockJsConfiguration sockJsConfig) throws Exception { + public WebSocketServerSockJsSession(WebSocketSession wsSession, SockJsConfiguration sockJsConfig) throws Exception { super(String.valueOf(wsSession.hashCode()), sockJsConfig, getSockJsHandler()); this.webSocketSession = wsSession; this.webSocketSession.sendText(SockJsFrame.openFrame().getContent()); diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingHttpServerSession.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingServerSockJsSession.java similarity index 90% rename from spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingHttpServerSession.java rename to spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingServerSockJsSession.java index 71bdf2d9dd4..e0293a73724 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingHttpServerSession.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/StreamingServerSockJsSession.java @@ -23,12 +23,12 @@ import org.springframework.sockjs.server.SockJsConfiguration; import org.springframework.sockjs.server.SockJsFrame; -public class StreamingHttpServerSession extends AbstractHttpServerSession { +public class StreamingServerSockJsSession extends AbstractHttpServerSockJsSession { private int byteCount; - public StreamingHttpServerSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { + public StreamingServerSockJsSession(String sessionId, SockJsConfiguration sockJsConfig, SockJsHandler sockJsHandler) { super(sessionId, sockJsConfig, sockJsHandler); } diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketSockJsHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketSockJsHandlerAdapter.java index 1c266860e07..560335693cd 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketSockJsHandlerAdapter.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/WebSocketSockJsHandlerAdapter.java @@ -75,7 +75,7 @@ public class WebSocketSockJsHandlerAdapter implements WebSocketHandler { if (logger.isDebugEnabled()) { logger.debug("New session: " + wsSession); } - SockJsSessionSupport session = new WebSocketSessionAdapter(wsSession); + SockJsSessionSupport session = new SockJsWebSocketSessionAdapter(wsSession); this.sessions.put(wsSession, session); } @@ -108,12 +108,12 @@ public class WebSocketSockJsHandlerAdapter implements WebSocketHandler { } - private class WebSocketSessionAdapter extends SockJsSessionSupport { + private class SockJsWebSocketSessionAdapter extends SockJsSessionSupport { private WebSocketSession wsSession; - public WebSocketSessionAdapter(WebSocketSession wsSession) throws Exception { + public SockJsWebSocketSessionAdapter(WebSocketSession wsSession) throws Exception { super(String.valueOf(wsSession.hashCode()), getSockJsHandler()); this.wsSession = wsSession; connectionInitialized(); diff --git a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/XhrPollingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/XhrPollingTransportHandler.java index 7655e42948d..e424bac91a0 100644 --- a/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/XhrPollingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/sockjs/server/transport/XhrPollingTransportHandler.java @@ -50,9 +50,9 @@ public class XhrPollingTransportHandler extends AbstractHttpSendingTransportHand return new DefaultFrameFormat("%s\n"); } - public PollingHttpServerSession createSession(String sessionId, SockJsHandler sockJsHandler) { + public PollingServerSockJsSession createSession(String sessionId, SockJsHandler sockJsHandler) { Assert.notNull(getSockJsConfig(), "This transport requires SockJsConfiguration"); - return new PollingHttpServerSession(sessionId, getSockJsConfig(), sockJsHandler); + return new PollingServerSockJsSession(sessionId, getSockJsConfig(), sockJsHandler); } }