root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing 

Issue: SPR-11963
This commit is contained in:
Juergen Hoeller 2014-07-07 19:41:39 +02:00
parent 6bcb48f95d
commit 387da221c3
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/AbstractSockJsMessageCodec.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -27,9 +27,8 @@ import org.springframework.util.Assert;
*/
public abstract class AbstractSockJsMessageCodec implements SockJsMessageCodec {
@Override
public String encode(String[] messages) {
public String encode(String... messages) {
Assert.notNull(messages, "messages must not be null");
StringBuilder sb = new StringBuilder();
sb.append("a[");
@ -76,9 +75,9 @@ public abstract class AbstractSockJsMessageCodec implements SockJsMessageCodec {
* See `escapable_by_server` variable in the SockJS protocol test suite.
*/
private boolean isSockJsSpecialChar(char ch) {
return (ch >= '\u0000' && ch <= '\u001F') || (ch >= '\u200C' && ch <= '\u200F')
|| (ch >= '\u2028' && ch <= '\u202F') || (ch >= '\u2060' && ch <= '\u206F')
|| (ch >= '\uFFF0' && ch <= '\uFFFF') || (ch >= '\uD800' && ch <= '\uDFFF');
return (ch >= '\u0000' && ch <= '\u001F') || (ch >= '\u200C' && ch <= '\u200F') ||
(ch >= '\u2028' && ch <= '\u202F') || (ch >= '\u2060' && ch <= '\u206F') ||
(ch >= '\uFFF0' && ch <= '\uFFFF') || (ch >= '\uD800' && ch <= '\uDFFF');
}
}

16
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsMessageCodec.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -20,10 +20,10 @@ import java.io.IOException;
import java.io.InputStream;
/**
* Encode and decode messages to and from a SockJS message frame, essentially an array of
* JSON-encoded messages. For example:
* Encode and decode messages to and from a SockJS message frame,
* essentially an array of JSON-encoded messages. For example:
*
* <pre>
* <pre class="code">
* a["message1","message2"]
* </pre>
*
@ -38,14 +38,14 @@ public interface SockJsMessageCodec {
* rules. See the "JSON Unicode Encoding" section of SockJS protocol (i.e. the
* protocol test suite).
* @param messages the messages to encode
* @return the content for a SockJS message frame, never {@code null}
* @return the content for a SockJS message frame (never {@code null})
*/
String encode(String[] messages);
String encode(String... messages);
/**
* Decode the given SockJS message frame.
* @param content the SockJS message frame
* @return an array of messages or {@code null}
* @return an array of messages, or {@code null} if none
* @throws IOException if the content could not be parsed
*/
String[] decode(String content) throws IOException;
@ -53,7 +53,7 @@ public interface SockJsMessageCodec {
/**
* Decode the given SockJS message frame.
* @param content the SockJS message frame
* @return an array of messages or {@code null}
* @return an array of messages, or {@code null} if none
* @throws IOException if the content could not be parsed
*/
String[] decodeInputStream(InputStream content) throws IOException;

11
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -56,7 +56,8 @@ public abstract class AbstractHttpReceivingTransportHandler extends AbstractTran
}
catch (IOException ex) {
logger.error("Failed to read message", ex);
if(ex.getClass().getName().contains("Mapping")) {
if (ex.getClass().getName().contains("Mapping")) {
// e.g. Jackson's JsonMappingException, indicating an incomplete payload
handleReadError(response, "Payload expected.", sockJsSession.getId());
}
else {
@ -85,10 +86,10 @@ public abstract class AbstractHttpReceivingTransportHandler extends AbstractTran
sockJsSession.delegateMessages(messages);
}
private void handleReadError(ServerHttpResponse resp, String error, String sessionId) {
private void handleReadError(ServerHttpResponse response, String error, String sessionId) {
try {
resp.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
resp.getBody().write(error.getBytes("UTF-8"));
response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
response.getBody().write(error.getBytes("UTF-8"));
}
catch (IOException ex) {
throw new SockJsException("Failed to send error: " + error, sessionId, ex);

8
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -55,7 +55,7 @@ public class JsonpReceivingTransportHandler extends AbstractHttpReceivingTranspo
try {
response.getBody().write("ok".getBytes("UTF-8"));
}
catch(IOException ex) {
catch (IOException ex) {
throw new SockJsException("Failed to write to the response body", sockJsSession.getId(), ex);
}
}
@ -64,10 +64,10 @@ public class JsonpReceivingTransportHandler extends AbstractHttpReceivingTranspo
protected String[] readMessages(ServerHttpRequest request) throws IOException {
SockJsMessageCodec messageCodec = getServiceConfig().getMessageCodec();
MediaType contentType = request.getHeaders().getContentType();
if ((contentType != null) && MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType)) {
if (contentType != null && MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType)) {
MultiValueMap<String, String> map = this.formConverter.read(null, request);
String d = map.getFirst("d");
return (StringUtils.hasText(d)) ? messageCodec.decode(d) : null;
return (StringUtils.hasText(d) ? messageCodec.decode(d) : null);
}
else {
return messageCodec.decodeInputStream(request.getBody());