Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9dd7f6e5
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,发现更多精彩内容 >>
提交
9dd7f6e5
编写于
7月 05, 2013
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update MessagingOperations hieararchy
上级
ef823721
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
217 addition
and
162 deletion
+217
-162
spring-context/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java
...g/core/AbstractDestinationResolvingMessagingTemplate.java
+4
-2
spring-context/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java
...mework/messaging/core/AbstractMessageSendingTemplate.java
+101
-0
spring-context/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
...ngframework/messaging/core/AbstractMessagingTemplate.java
+35
-44
spring-context/src/main/java/org/springframework/messaging/core/AbstractReceivingMessagingTemplate.java
...rk/messaging/core/AbstractReceivingMessagingTemplate.java
+0
-92
spring-context/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageReceivingOperations.java
.../core/DestinationResolvingMessageReceivingOperations.java
+32
-0
spring-context/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java
...re/DestinationResolvingMessageRequestReplyOperations.java
+1
-7
spring-context/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java
...ng/core/DestinationResolvingMessageSendingOperations.java
+1
-1
spring-context/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java
...ingframework/messaging/core/GenericMessagingTemplate.java
+1
-1
spring-context/src/main/java/org/springframework/messaging/core/MessageReceivingOperations.java
...gframework/messaging/core/MessageReceivingOperations.java
+1
-13
spring-context/src/main/java/org/springframework/messaging/core/MessageRequestReplyOperations.java
...amework/messaging/core/MessageRequestReplyOperations.java
+39
-0
spring-websocket/src/main/java/org/springframework/web/messaging/support/WebMessagingTemplate.java
...framework/web/messaging/support/WebMessagingTemplate.java
+2
-2
未找到文件。
spring-context/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java
浏览文件 @
9dd7f6e5
...
...
@@ -23,8 +23,10 @@ import org.springframework.util.Assert;
* @author Mark Fisher
* @since 4.0
*/
public
abstract
class
AbstractDestinationResolvingMessagingTemplate
<
D
>
extends
AbstractReceivingMessagingTemplate
<
D
>
implements
ResolvableDestinationMessageReceivingOperations
<
D
>
{
public
abstract
class
AbstractDestinationResolvingMessagingTemplate
<
D
>
extends
AbstractMessagingTemplate
<
D
>
implements
DestinationResolvingMessageSendingOperations
<
D
>,
DestinationResolvingMessageReceivingOperations
<
D
>,
DestinationResolvingMessageRequestReplyOperations
<
D
>
{
private
volatile
DestinationResolver
<
D
>
destinationResolver
;
...
...
spring-context/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java
0 → 100644
浏览文件 @
9dd7f6e5
/*
* Copyright 2002-2013 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.messaging.core
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessagingException
;
import
org.springframework.messaging.converter.DefaultMessageConverter
;
import
org.springframework.messaging.converter.MessageConverter
;
import
org.springframework.util.Assert
;
/**
* @author Mark Fisher
* @since 4.0
*/
public
abstract
class
AbstractMessageSendingTemplate
<
D
>
implements
MessageSendingOperations
<
D
>
{
protected
final
Log
logger
=
LogFactory
.
getLog
(
this
.
getClass
());
private
volatile
D
defaultDestination
;
protected
volatile
MessageConverter
converter
=
new
DefaultMessageConverter
();
public
void
setDefaultDestination
(
D
defaultDestination
)
{
this
.
defaultDestination
=
defaultDestination
;
}
/**
* Set the {@link MessageConverter} that is to be used to convert
* between Messages and objects for this template.
* <p>The default is {@link DefaultMessageConverter}.
*/
public
void
setMessageConverter
(
MessageConverter
messageConverter
)
{
Assert
.
notNull
(
messageConverter
,
"'messageConverter' must not be null"
);
this
.
converter
=
messageConverter
;
}
@Override
public
<
P
>
void
send
(
Message
<
P
>
message
)
{
this
.
send
(
getRequiredDefaultDestination
(),
message
);
}
protected
final
D
getRequiredDefaultDestination
()
{
Assert
.
state
(
this
.
defaultDestination
!=
null
,
"No 'defaultDestination' specified for MessagingTemplate. "
+
"Unable to invoke method without an explicit destination argument."
);
return
this
.
defaultDestination
;
}
@Override
public
<
P
>
void
send
(
D
destination
,
Message
<
P
>
message
)
{
this
.
doSend
(
destination
,
message
);
}
protected
abstract
void
doSend
(
D
destination
,
Message
<?>
message
)
;
@Override
public
<
T
>
void
convertAndSend
(
T
message
)
{
this
.
convertAndSend
(
getRequiredDefaultDestination
(),
message
);
}
@Override
public
<
T
>
void
convertAndSend
(
D
destination
,
T
object
)
{
this
.
convertAndSend
(
destination
,
object
,
null
);
}
@Override
public
<
T
>
void
convertAndSend
(
T
object
,
MessagePostProcessor
postProcessor
)
{
this
.
convertAndSend
(
getRequiredDefaultDestination
(),
object
,
postProcessor
);
}
@Override
public
<
T
>
void
convertAndSend
(
D
destination
,
T
object
,
MessagePostProcessor
postProcessor
)
throws
MessagingException
{
Message
<?>
message
=
this
.
converter
.
toMessage
(
object
);
if
(
postProcessor
!=
null
)
{
message
=
postProcessor
.
postProcessMessage
(
message
);
}
this
.
send
(
destination
,
message
);
}
}
spring-context/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
浏览文件 @
9dd7f6e5
...
...
@@ -15,87 +15,78 @@
*/
package
org.springframework.messaging.core
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessagingException
;
import
org.springframework.messaging.converter.DefaultMessageConverter
;
import
org.springframework.messaging.converter.MessageConverter
;
import
org.springframework.util.Assert
;
/**
* @author Mark Fisher
* @since 4.0
*/
public
abstract
class
AbstractMessagingTemplate
<
D
>
implements
MessageSendingOperations
<
D
>
{
public
abstract
class
AbstractMessagingTemplate
<
D
>
extends
AbstractMessageSendingTemplate
<
D
>
implements
MessageRequestReplyOperations
<
D
>,
MessageReceivingOperations
<
D
>
{
protected
final
Log
logger
=
LogFactory
.
getLog
(
this
.
getClass
());
private
volatile
D
defaultDestination
;
@Override
public
<
P
>
Message
<
P
>
receive
()
{
return
this
.
receive
(
getRequiredDefaultDestination
());
}
protected
volatile
MessageConverter
converter
=
new
DefaultMessageConverter
();
@Override
public
<
P
>
Message
<
P
>
receive
(
D
destination
)
{
return
this
.
doReceive
(
destination
);
}
protected
abstract
<
P
>
Message
<
P
>
doReceive
(
D
destination
);
public
void
setDefaultDestination
(
D
defaultDestination
)
{
this
.
defaultDestination
=
defaultDestination
;
}
/**
* Set the {@link MessageConverter} that is to be used to convert
* between Messages and objects for this template.
* <p>The default is {@link DefaultMessageConverter}.
*/
public
void
setMessageConverter
(
MessageConverter
messageConverter
)
{
Assert
.
notNull
(
messageConverter
,
"'messageConverter' must not be null"
);
this
.
converter
=
messageConverter
;
@Override
public
Object
receiveAndConvert
()
{
return
this
.
receiveAndConvert
(
getRequiredDefaultDestination
());
}
@Override
public
<
P
>
void
send
(
Message
<
P
>
message
)
{
this
.
send
(
getRequiredDefaultDestination
(),
message
);
public
Object
receiveAndConvert
(
D
destination
)
{
Message
<
Object
>
message
=
this
.
doReceive
(
destination
);
return
(
message
!=
null
)
?
this
.
converter
.
fromMessage
(
message
)
:
null
;
}
protected
final
D
getRequiredDefaultDestination
()
{
Assert
.
state
(
this
.
defaultDestination
!=
null
,
"No 'defaultDestination' specified for MessagingTemplate. "
+
"Unable to invoke method without an explicit destination argument."
);
return
this
.
defaultDestination
;
@Override
public
Message
<?>
sendAndReceive
(
Message
<?>
requestMessage
)
{
return
this
.
sendAndReceive
(
getRequiredDefaultDestination
(),
requestMessage
);
}
@Override
public
<
P
>
void
send
(
D
destination
,
Message
<
P
>
m
essage
)
{
this
.
doSend
(
destination
,
m
essage
);
public
Message
<?>
sendAndReceive
(
D
destination
,
Message
<?>
requestM
essage
)
{
return
this
.
doSendAndReceive
(
destination
,
requestM
essage
);
}
protected
abstract
void
doSend
(
D
destination
,
Message
<?>
message
)
;
protected
abstract
<
S
,
R
>
Message
<
R
>
doSendAndReceive
(
D
destination
,
Message
<
S
>
requestMessage
)
;
@Override
public
<
T
>
void
convertAndSend
(
T
message
)
{
this
.
convertAndSend
(
getRequiredDefaultDestination
(),
message
);
public
Object
convertSendAndReceive
(
Object
request
)
{
return
this
.
convertSendAndReceive
(
getRequiredDefaultDestination
(),
request
);
}
@Override
public
<
T
>
void
convertAndSend
(
D
destination
,
T
objec
t
)
{
this
.
convertAndSend
(
destination
,
objec
t
,
null
);
public
Object
convertSendAndReceive
(
D
destination
,
Object
reques
t
)
{
return
this
.
convertSendAndReceive
(
destination
,
reques
t
,
null
);
}
@Override
public
<
T
>
void
convertAndSend
(
T
objec
t
,
MessagePostProcessor
postProcessor
)
{
this
.
convertAndSend
(
getRequiredDefaultDestination
(),
objec
t
,
postProcessor
);
public
Object
convertSendAndReceive
(
Object
reques
t
,
MessagePostProcessor
postProcessor
)
{
return
this
.
convertSendAndReceive
(
getRequiredDefaultDestination
(),
reques
t
,
postProcessor
);
}
@Override
public
<
T
>
void
convertAndSend
(
D
destination
,
T
object
,
MessagePostProcessor
postProcessor
)
throws
MessagingException
{
Message
<?>
message
=
this
.
converter
.
toMessage
(
object
);
public
Object
convertSendAndReceive
(
D
destination
,
Object
request
,
MessagePostProcessor
postProcessor
)
{
Message
<?>
requestMessage
=
this
.
converter
.
toMessage
(
request
);
if
(
postProcessor
!=
null
)
{
message
=
postProcessor
.
postProcessMessage
(
m
essage
);
requestMessage
=
postProcessor
.
postProcessMessage
(
requestM
essage
);
}
this
.
send
(
destination
,
message
);
Message
<?>
replyMessage
=
this
.
sendAndReceive
(
destination
,
requestMessage
);
return
this
.
converter
.
fromMessage
(
replyMessage
);
}
}
spring-context/src/main/java/org/springframework/messaging/core/AbstractReceivingMessagingTemplate.java
已删除
100644 → 0
浏览文件 @
ef823721
/*
* Copyright 2002-2013 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.messaging.core
;
import
org.springframework.messaging.Message
;
/**
* @author Mark Fisher
* @since 4.0
*/
public
abstract
class
AbstractReceivingMessagingTemplate
<
D
>
extends
AbstractMessagingTemplate
<
D
>
implements
MessageReceivingOperations
<
D
>
{
@Override
public
<
P
>
Message
<
P
>
receive
()
{
return
this
.
receive
(
getRequiredDefaultDestination
());
}
@Override
public
<
P
>
Message
<
P
>
receive
(
D
destination
)
{
return
this
.
doReceive
(
destination
);
}
protected
abstract
<
P
>
Message
<
P
>
doReceive
(
D
destination
);
@Override
public
Object
receiveAndConvert
()
{
return
this
.
receiveAndConvert
(
getRequiredDefaultDestination
());
}
@Override
public
Object
receiveAndConvert
(
D
destination
)
{
Message
<
Object
>
message
=
this
.
doReceive
(
destination
);
return
(
message
!=
null
)
?
this
.
converter
.
fromMessage
(
message
)
:
null
;
}
@Override
public
Message
<?>
sendAndReceive
(
Message
<?>
requestMessage
)
{
return
this
.
sendAndReceive
(
getRequiredDefaultDestination
(),
requestMessage
);
}
@Override
public
Message
<?>
sendAndReceive
(
D
destination
,
Message
<?>
requestMessage
)
{
return
this
.
doSendAndReceive
(
destination
,
requestMessage
);
}
protected
abstract
<
S
,
R
>
Message
<
R
>
doSendAndReceive
(
D
destination
,
Message
<
S
>
requestMessage
);
@Override
public
Object
convertSendAndReceive
(
Object
request
)
{
return
this
.
convertSendAndReceive
(
getRequiredDefaultDestination
(),
request
);
}
@Override
public
Object
convertSendAndReceive
(
D
destination
,
Object
request
)
{
return
this
.
convertSendAndReceive
(
destination
,
request
,
null
);
}
@Override
public
Object
convertSendAndReceive
(
Object
request
,
MessagePostProcessor
postProcessor
)
{
return
this
.
convertSendAndReceive
(
getRequiredDefaultDestination
(),
request
,
postProcessor
);
}
@Override
public
Object
convertSendAndReceive
(
D
destination
,
Object
request
,
MessagePostProcessor
postProcessor
)
{
Message
<?>
requestMessage
=
this
.
converter
.
toMessage
(
request
);
if
(
postProcessor
!=
null
)
{
requestMessage
=
postProcessor
.
postProcessMessage
(
requestMessage
);
}
Message
<?>
replyMessage
=
this
.
sendAndReceive
(
destination
,
requestMessage
);
return
this
.
converter
.
fromMessage
(
replyMessage
);
}
}
spring-context/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageReceivingOperations.java
0 → 100644
浏览文件 @
9dd7f6e5
/*
* Copyright 2002-2013 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.messaging.core
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessagingException
;
/**
* @author Mark Fisher
* @since 4.0
*/
public
interface
DestinationResolvingMessageReceivingOperations
<
D
>
extends
MessageReceivingOperations
<
D
>
{
<
P
>
Message
<
P
>
receive
(
String
destinationName
)
throws
MessagingException
;
Object
receiveAndConvert
(
String
destinationName
)
throws
MessagingException
;
}
spring-context/src/main/java/org/springframework/messaging/core/
ResolvableDestinationMessageReceiving
Operations.java
→
spring-context/src/main/java/org/springframework/messaging/core/
DestinationResolvingMessageRequestReply
Operations.java
浏览文件 @
9dd7f6e5
...
...
@@ -16,19 +16,13 @@
package
org.springframework.messaging.core
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessagingException
;
/**
* @author Mark Fisher
* @since 4.0
*/
public
interface
ResolvableDestinationMessageReceivingOperations
<
D
>
extends
MessageReceivingOperations
<
D
>,
ResolvableDestinationMessageSendingOperations
<
D
>
{
<
P
>
Message
<
P
>
receive
(
String
destinationName
)
throws
MessagingException
;
Object
receiveAndConvert
(
String
destinationName
)
throws
MessagingException
;
public
interface
DestinationResolvingMessageRequestReplyOperations
<
D
>
extends
MessageRequestReplyOperations
<
D
>
{
Message
<?>
sendAndReceive
(
String
destinationName
,
Message
<?>
requestMessage
);
...
...
spring-context/src/main/java/org/springframework/messaging/core/
ResolvableDestination
MessageSendingOperations.java
→
spring-context/src/main/java/org/springframework/messaging/core/
DestinationResolving
MessageSendingOperations.java
浏览文件 @
9dd7f6e5
...
...
@@ -23,7 +23,7 @@ import org.springframework.messaging.MessagingException;
* @author Mark Fisher
* @since 4.0
*/
public
interface
ResolvableDestination
MessageSendingOperations
<
D
>
extends
MessageSendingOperations
<
D
>
{
public
interface
DestinationResolving
MessageSendingOperations
<
D
>
extends
MessageSendingOperations
<
D
>
{
<
P
>
void
send
(
String
destinationName
,
Message
<
P
>
message
)
throws
MessagingException
;
...
...
spring-context/src/main/java/org/springframework/messaging/core/
Default
MessagingTemplate.java
→
spring-context/src/main/java/org/springframework/messaging/core/
Generic
MessagingTemplate.java
浏览文件 @
9dd7f6e5
...
...
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
* @author Mark Fisher
* @since 4.0
*/
public
class
Default
MessagingTemplate
extends
AbstractDestinationResolvingMessagingTemplate
<
MessageChannel
>
public
class
Generic
MessagingTemplate
extends
AbstractDestinationResolvingMessagingTemplate
<
MessageChannel
>
implements
BeanFactoryAware
{
private
volatile
long
sendTimeout
=
-
1
;
...
...
spring-context/src/main/java/org/springframework/messaging/core/MessageReceivingOperations.java
浏览文件 @
9dd7f6e5
...
...
@@ -23,7 +23,7 @@ import org.springframework.messaging.MessagingException;
* @author Mark Fisher
* @since 4.0
*/
public
interface
MessageReceivingOperations
<
D
>
extends
MessageSendingOperations
<
D
>
{
public
interface
MessageReceivingOperations
<
D
>
{
<
P
>
Message
<
P
>
receive
()
throws
MessagingException
;
...
...
@@ -33,16 +33,4 @@ public interface MessageReceivingOperations<D> extends MessageSendingOperations<
Object
receiveAndConvert
(
D
destination
)
throws
MessagingException
;
Message
<?>
sendAndReceive
(
Message
<?>
requestMessage
);
Message
<?>
sendAndReceive
(
D
destination
,
Message
<?>
requestMessage
);
Object
convertSendAndReceive
(
Object
request
);
Object
convertSendAndReceive
(
D
destination
,
Object
request
);
Object
convertSendAndReceive
(
Object
request
,
MessagePostProcessor
requestPostProcessor
);
Object
convertSendAndReceive
(
D
destination
,
Object
request
,
MessagePostProcessor
requestPostProcessor
);
}
spring-context/src/main/java/org/springframework/messaging/core/MessageRequestReplyOperations.java
0 → 100644
浏览文件 @
9dd7f6e5
/*
* Copyright 2002-2013 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.messaging.core
;
import
org.springframework.messaging.Message
;
/**
* @author Mark Fisher
* @since 4.0
*/
public
interface
MessageRequestReplyOperations
<
D
>
{
Message
<?>
sendAndReceive
(
Message
<?>
requestMessage
);
Message
<?>
sendAndReceive
(
D
destination
,
Message
<?>
requestMessage
);
Object
convertSendAndReceive
(
Object
request
);
Object
convertSendAndReceive
(
D
destination
,
Object
request
);
Object
convertSendAndReceive
(
Object
request
,
MessagePostProcessor
requestPostProcessor
);
Object
convertSendAndReceive
(
D
destination
,
Object
request
,
MessagePostProcessor
requestPostProcessor
);
}
spring-websocket/src/main/java/org/springframework/web/messaging/support/WebMessagingTemplate.java
浏览文件 @
9dd7f6e5
...
...
@@ -3,13 +3,13 @@ package org.springframework.web.messaging.support;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessageChannel
;
import
org.springframework.messaging.MessageDeliveryException
;
import
org.springframework.messaging.core.AbstractMessagingTemplate
;
import
org.springframework.messaging.core.AbstractMessag
eSend
ingTemplate
;
import
org.springframework.messaging.support.MessageBuilder
;
import
org.springframework.util.Assert
;
import
org.springframework.web.messaging.MessageType
;
public
class
WebMessagingTemplate
extends
AbstractMessagingTemplate
<
String
>
{
public
class
WebMessagingTemplate
extends
AbstractMessag
eSend
ingTemplate
<
String
>
{
private
final
MessageChannel
outputChannel
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录