Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1c47c8f3
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1c47c8f3
编写于
9月 03, 2013
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove TODOs (replaced with JIRA tickets)
Issue: SPR-10703
上级
8a4c6eb6
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
9 addition
and
41 deletion
+9
-41
spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java
...in/java/org/springframework/messaging/MessageHandler.java
+0
-7
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageBodyMethodArgumentResolver.java
...annotation/support/MessageBodyMethodArgumentResolver.java
+1
-2
spring-messaging/src/main/java/org/springframework/messaging/handler/method/InvocableHandlerMethod.java
...work/messaging/handler/method/InvocableHandlerMethod.java
+1
-1
spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java
...essaging/simp/handler/AnnotationMethodMessageHandler.java
+1
-2
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
...ngframework/messaging/simp/stomp/StompHeaderAccessor.java
+0
-1
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompMessageConverter.java
...framework/messaging/simp/stomp/StompMessageConverter.java
+0
-1
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java
...gframework/messaging/simp/stomp/StompProtocolHandler.java
+1
-12
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
...stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
+0
-1
spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java
...k/web/socket/client/endpoint/StandardWebSocketClient.java
+0
-2
spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
...amework/web/socket/client/jetty/JettyWebSocketClient.java
+4
-2
spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java
...gframework/web/socket/server/DefaultHandshakeHandler.java
+0
-8
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
...ransport/handler/AbstractHttpSendingTransportHandler.java
+1
-1
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
...ocket/sockjs/transport/session/AbstractSockJsSession.java
+0
-1
未找到文件。
spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java
浏览文件 @
1c47c8f3
...
...
@@ -42,11 +42,4 @@ public interface MessageHandler {
*/
void
handleMessage
(
Message
<?>
message
)
throws
MessagingException
;
/*
* TODO: exceptions
* @throws org.springframework.integration.MessageRejectedException if the handler doesn't accept the message
* @throws org.springframework.integration.MessageHandlingException when something fails during the handling
* @throws org.springframework.integration.MessageDeliveryException when this handler failed to deliver the
*/
}
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageBodyMethodArgumentResolver.java
浏览文件 @
1c47c8f3
...
...
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
/**
*
TODO
*
A resolver for extracting the body of a message.
*
* <p>This {@link HandlerMethodArgumentResolver} should be ordered last as it supports all
* types and does not require the {@link MessageBody} annotation.
...
...
@@ -62,7 +62,6 @@ public class MessageBodyMethodArgumentResolver implements HandlerMethodArgumentR
return
message
.
getPayload
();
}
else
{
// TODO: use content-type header
return
this
.
converter
.
fromMessage
(
message
,
targetClass
);
}
}
...
...
spring-messaging/src/main/java/org/springframework/messaging/handler/method/InvocableHandlerMethod.java
浏览文件 @
1c47c8f3
...
...
@@ -94,7 +94,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
}
/**
*
TODO
*
Invoke the method with the given message.
*
* @exception Exception raised if no suitable argument resolver can be found, or the
* method raised an exception
...
...
spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java
浏览文件 @
1c47c8f3
...
...
@@ -339,8 +339,7 @@ public class AnnotationMethodMessageHandler implements MessageHandler, Applicati
invokeExceptionHandler
(
message
,
handlerMethod
,
ex
);
}
catch
(
Throwable
ex
)
{
// TODO
ex
.
printStackTrace
();
logger
.
error
(
"Error while processing message "
+
message
,
ex
);
}
}
...
...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
浏览文件 @
1c47c8f3
...
...
@@ -255,7 +255,6 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor {
return
null
;
}
String
[]
rawValues
=
StringUtils
.
commaDelimitedListToStringArray
(
rawValue
);
// TODO assertions
return
new
long
[]
{
Long
.
valueOf
(
rawValues
[
0
]),
Long
.
valueOf
(
rawValues
[
1
])};
}
...
...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompMessageConverter.java
浏览文件 @
1c47c8f3
...
...
@@ -73,7 +73,6 @@ public class StompMessageConverter {
String
headerContent
=
new
String
(
byteContent
,
0
,
payloadIndex
,
STOMP_CHARSET
);
Parser
parser
=
new
Parser
(
headerContent
);
// TODO: validate command and whether a payload is allowed
StompCommand
command
=
StompCommand
.
valueOf
(
parser
.
nextToken
(
LF
).
trim
());
Assert
.
notNull
(
command
,
"No command found"
);
...
...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java
浏览文件 @
1c47c8f3
...
...
@@ -99,9 +99,6 @@ public class StompProtocolHandler implements SubProtocolHandler {
String
payload
=
((
TextMessage
)
webSocketMessage
).
getPayload
();
Message
<?>
message
=
this
.
stompMessageConverter
.
toMessage
(
payload
);
// TODO: validate size limits
// http://stomp.github.io/stomp-specification-1.2.html#Size_Limits
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"Message "
+
message
);
}
...
...
@@ -124,10 +121,6 @@ public class StompProtocolHandler implements SubProtocolHandler {
logger
.
error
(
"Terminating STOMP session due to failure to send message: "
,
t
);
sendErrorMessage
(
session
,
t
);
}
// TODO: send RECEIPT message if incoming message has "receipt" header
// http://stomp.github.io/stomp-specification-1.2.html#Header_receipt
}
catch
(
Throwable
error
)
{
sendErrorMessage
(
session
,
error
);
...
...
@@ -149,13 +142,11 @@ public class StompProtocolHandler implements SubProtocolHandler {
}
if
(
StompCommand
.
MESSAGE
.
equals
(
headers
.
getCommand
())
&&
(
headers
.
getSubscriptionId
()
==
null
))
{
// TODO: failed message delivery mechanism
logger
.
error
(
"Ignoring message, no subscriptionId header: "
+
message
);
return
;
}
if
(!(
message
.
getPayload
()
instanceof
byte
[]))
{
// TODO: failed message delivery mechanism
logger
.
error
(
"Ignoring message, expected byte[] content: "
+
message
);
return
;
}
...
...
@@ -197,7 +188,7 @@ public class StompProtocolHandler implements SubProtocolHandler {
else
{
throw
new
StompConversionException
(
"Unsupported version '"
+
acceptVersions
+
"'"
);
}
connectedHeaders
.
setHeartbeat
(
0
,
0
);
// TODO
connectedHeaders
.
setHeartbeat
(
0
,
0
);
Principal
principal
=
session
.
getPrincipal
();
if
(
principal
!=
null
)
{
...
...
@@ -210,8 +201,6 @@ public class StompProtocolHandler implements SubProtocolHandler {
}
}
// TODO: security
Message
<?>
connectedMessage
=
MessageBuilder
.
withPayloadAndHeaders
(
new
byte
[
0
],
connectedHeaders
).
build
();
byte
[]
bytes
=
this
.
stompMessageConverter
.
fromMessage
(
connectedMessage
);
session
.
sendMessage
(
new
TextMessage
(
new
String
(
bytes
,
Charset
.
forName
(
"UTF-8"
))));
...
...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
浏览文件 @
1c47c8f3
...
...
@@ -188,7 +188,6 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
stopBrokerAndAwait
();
// TODO:
// 1st message will see ERROR frame (broker shutdown is not but should be detected)
// 2nd message will be queued (a side effect of CONNECT/CONNECTED-buffering, likely to be removed)
// Finish this once the above changes are made.
...
...
spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java
浏览文件 @
1c47c8f3
...
...
@@ -89,10 +89,8 @@ public class StandardWebSocketClient extends AbstractWebSocketClient {
configBuidler
.
preferredSubprotocols
(
protocols
);
try
{
// TODO: do not block
Endpoint
endpoint
=
new
StandardWebSocketHandlerAdapter
(
webSocketHandler
,
session
);
this
.
webSocketContainer
.
connectToServer
(
endpoint
,
configBuidler
.
build
(),
uri
);
return
session
;
}
catch
(
Exception
e
)
{
...
...
spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
浏览文件 @
1c47c8f3
...
...
@@ -20,7 +20,9 @@ import java.net.URI;
import
java.security.Principal
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.Future
;
import
org.eclipse.jetty.websocket.api.Session
;
import
org.eclipse.jetty.websocket.client.ClientUpgradeRequest
;
import
org.eclipse.jetty.websocket.client.WebSocketClient
;
import
org.springframework.context.SmartLifecycle
;
...
...
@@ -158,8 +160,8 @@ public class JettyWebSocketClient extends AbstractWebSocketClient implements Sma
JettyWebSocketHandlerAdapter
listener
=
new
JettyWebSocketHandlerAdapter
(
wsHandler
,
wsSession
);
try
{
// TODO: do not block
this
.
client
.
connect
(
listener
,
uri
,
request
)
.
get
();
Future
<
Session
>
future
=
this
.
client
.
connect
(
listener
,
uri
,
request
);
future
.
get
();
return
wsSession
;
}
catch
(
Exception
e
)
{
...
...
spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java
浏览文件 @
1c47c8f3
...
...
@@ -225,14 +225,6 @@ public class DefaultHandshakeHandler implements HandshakeHandler {
}
protected
boolean
isValidOrigin
(
ServerHttpRequest
request
)
{
String
origin
=
request
.
getHeaders
().
getOrigin
();
if
(
origin
!=
null
)
{
// UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromHttpUrl(origin);
// TODO
// A simple strategy checks against the current request's scheme/port/host
// Or match scheme, port, and host against configured allowed origins (wild cards for hosts?)
// return false;
}
return
true
;
}
...
...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
浏览文件 @
1c47c8f3
...
...
@@ -50,7 +50,7 @@ public abstract class AbstractHttpSendingTransportHandler extends TransportHandl
AbstractHttpSockJsSession
sockJsSession
=
(
AbstractHttpSockJsSession
)
wsSession
;
String
protocol
=
null
;
//
TODO:
https://github.com/sockjs/sockjs-client/issues/130
String
protocol
=
null
;
// https://github.com/sockjs/sockjs-client/issues/130
sockJsSession
.
setAcceptedProtocol
(
protocol
);
// Set content type before writing
...
...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
浏览文件 @
1c47c8f3
...
...
@@ -219,7 +219,6 @@ public abstract class AbstractSockJsSession implements WebSocketSession {
}
try
{
if
(
isActive
())
{
// TODO: deliver messages "in flight" before sending close frame
try
{
// bypass writeFrame
writeFrameInternal
(
SockJsFrame
.
closeFrame
(
status
.
getCode
(),
status
.
getReason
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录