Remove isLast flag from WebSocketMessage

rstoyanchev · rstoyanchev · commit 278a5924cb53 · 2013-05-14T14:32:25.000-04:00
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java b/spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java
@@ -31,53 +31,24 @@ public final class BinaryMessage extends WebSocketMessage<ByteBuffer> {
 
 	private byte[] bytes;
 
-	private final boolean last;
-
-
-	/**
-	 * Create a new {@link BinaryMessage} instance.
-	 * @param payload a non-null payload
-	 */
-	public BinaryMessage(ByteBuffer payload) {
-		this(payload, true);
-	}
 
 	/**
 	 * Create a new {@link BinaryMessage} instance.
 	 * @param payload a non-null payload
 	 * @param isLast if the message is the last of a series of partial messages
 	 */
-	public BinaryMessage(ByteBuffer payload, boolean isLast) {
+	public BinaryMessage(ByteBuffer payload) {
 		super(payload);
 		this.bytes = null;
-		this.last = isLast;
-	}
-
-	/**
-	 * Create a new {@link BinaryMessage} instance.
-	 * @param payload a non-null payload
-	 */
-	public BinaryMessage(byte[] payload) {
-		this(payload, true);
 	}
 
 	/**
 	 * Create a new {@link BinaryMessage} instance.
 	 * @param payload a non-null payload
 	 * @param isLast if the message is the last of a series of partial messages
 	 */
-	public BinaryMessage(byte[] payload, boolean isLast) {
-		this(payload, 0, (payload == null ? 0 : payload.length), isLast);
-	}
-
-	/**
-	 * Create a new {@link BinaryMessage} instance by wrapping an existing byte array.
-	 * @param payload a non-null payload, NOTE: this value is not copied so care must be
-	 *        taken not to modify the array.
-	 * @param isLast if the message is the last of a series of partial messages
-	 */
-	public BinaryMessage(byte[] payload, int offset, int len) {
-		this(payload, offset, len, true);
+	public BinaryMessage(byte[] payload) {
+		this(payload, 0, (payload == null ? 0 : payload.length));
 	}
 
 	/**
@@ -88,20 +59,11 @@ public BinaryMessage(byte[] payload, int offset, int len) {
 	 * @param len the length of the array considered for the payload
 	 * @param isLast if the message is the last of a series of partial messages
 	 */
-	public BinaryMessage(byte[] payload, int offset, int len, boolean isLast) {
+	public BinaryMessage(byte[] payload, int offset, int len) {
 		super(payload != null ? ByteBuffer.wrap(payload, offset, len) : null);
 		if(offset == 0 && len == payload.length) {
 			this.bytes = payload;
 		}
-		this.last = isLast;
-	}
-
-	/**
-	 * Returns if this is the last part in a series of partial messages. If this is
-	 * not a partial message this method will return {@code true}.
-	 */
-	public boolean isLast() {
-		return this.last;
 	}
 
 	/**
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java
@@ -72,9 +72,4 @@ public interface WebSocketHandler {
 	 */
 	void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception;
 
-	/**
-	 * Whether this WebSocketHandler wishes to receive messages broken up in parts.
-	 */
-	boolean isStreaming();
-
 }
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardEndpointAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardEndpointAdapter.java
@@ -75,24 +75,12 @@ public void onMessage(String message) {
 				handleTextMessage(session, message);
 			}
 		});
-
-		if (!this.handler.isStreaming()) {
-			session.addMessageHandler(new MessageHandler.Whole<ByteBuffer>() {
-				@Override
-				public void onMessage(ByteBuffer message) {
-					handleBinaryMessage(session, message, true);
-				}
-			});
-		}
-		else {
-			session.addMessageHandler(new MessageHandler.Partial<ByteBuffer>() {
-				@Override
-				public void onMessage(ByteBuffer messagePart, boolean isLast) {
-					handleBinaryMessage(session, messagePart, isLast);
-				}
-			});
-		}
-
+		session.addMessageHandler(new MessageHandler.Whole<ByteBuffer>() {
+			@Override
+			public void onMessage(ByteBuffer message) {
+				handleBinaryMessage(session, message);
+			}
+		});
 	}
 
 	private void handleTextMessage(javax.websocket.Session session, String payload) {
@@ -105,8 +93,8 @@ private void handleTextMessage(javax.websocket.Session session, String payload)
 		}
 	}
 
-	private void handleBinaryMessage(javax.websocket.Session session, ByteBuffer payload, boolean isLast) {
-		BinaryMessage binaryMessage = new BinaryMessage(payload, isLast);
+	private void handleBinaryMessage(javax.websocket.Session session, ByteBuffer payload) {
+		BinaryMessage binaryMessage = new BinaryMessage(payload);
 		try {
 			this.handler.handleMessage(this.wsSession, binaryMessage);
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/WebSocketHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/WebSocketHandlerAdapter.java
@@ -68,9 +68,4 @@ public void handleTransportError(WebSocketSession session, Throwable exception)
 	public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
 	}
 
-	@Override
-	public boolean isStreaming() {
-		return false;
-	}
-
 }
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/PerConnectionWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/support/PerConnectionWebSocketHandler.java
@@ -57,22 +57,9 @@ public class PerConnectionWebSocketHandler implements WebSocketHandler, BeanFact
 	private final Map<WebSocketSession, WebSocketHandler> handlers =
 			new ConcurrentHashMap<WebSocketSession, WebSocketHandler>();
 
-	private final boolean streaming;
-
 
 	public PerConnectionWebSocketHandler(Class<? extends WebSocketHandler> handlerType) {
-		this(handlerType, false);
-	}
-
-	public PerConnectionWebSocketHandler(Class<? extends WebSocketHandler> handlerType, boolean isStreaming) {
 		this.provider = new BeanCreatingHandlerProvider<WebSocketHandler>(handlerType);
-		this.streaming = isStreaming;
-	}
-
-
-	@Override
-	public boolean isStreaming() {
-		return this.streaming;
 	}
 
 	@Override
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java b/spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java
@@ -62,11 +62,6 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus closeSta
 		this.delegate.afterConnectionClosed(session, closeStatus);
 	}
 
-	@Override
-	public boolean isStreaming() {
-		return this.delegate.isStreaming();
-	}
-
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + " [delegate=" + this.delegate + "]";

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,4 @@ public interface WebSocketHandler {`
`72`	`72`	`*/`
`73`	`73`	`void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception;`
`74`	`74`
`75`		`- /**`
`76`		`- * Whether this WebSocketHandler wishes to receive messages broken up in parts.`
`77`		`- */`
`78`		`- boolean isStreaming();`
`79`		`-`
`80`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,4 @@ public void handleTransportError(WebSocketSession session, Throwable exception)`
`68`	`68`	`public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {`
`69`	`69`	`}`
`70`	`70`
`71`		`- @Override`
`72`		`- public boolean isStreaming() {`
`73`		`- return false;`
`74`		`- }`
`75`		`-`
`76`	`71`	`}`