Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
82c1c859
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,发现更多精彩内容 >>
提交
82c1c859
编写于
12月 20, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
(cherry picked from commit
9cb4de8b
)
上级
154ef8bf
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
25 deletion
+23
-25
spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
...rg/springframework/core/env/AbstractPropertyResolver.java
+4
-4
spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
...rg/springframework/jdbc/support/SQLErrorCodesFactory.java
+1
-1
spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java
...va/org/springframework/oxm/xstream/CatchAllConverter.java
+12
-12
spring-web/src/main/java/org/springframework/web/client/RestOperations.java
...n/java/org/springframework/web/client/RestOperations.java
+6
-6
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
...amework/web/socket/messaging/StompSubProtocolHandler.java
+0
-2
未找到文件。
spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
浏览文件 @
82c1c859
...
...
@@ -248,16 +248,16 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
if
(
targetType
==
null
)
{
return
(
T
)
value
;
}
ConversionService
c
s
ToUse
=
this
.
conversionService
;
if
(
c
s
ToUse
==
null
)
{
ConversionService
c
onversionService
ToUse
=
this
.
conversionService
;
if
(
c
onversionService
ToUse
==
null
)
{
// Avoid initialization of shared DefaultConversionService if
// no standard type conversion is needed in the first place...
if
(
ClassUtils
.
isAssignableValue
(
targetType
,
value
))
{
return
(
T
)
value
;
}
c
s
ToUse
=
DefaultConversionService
.
getSharedInstance
();
c
onversionService
ToUse
=
DefaultConversionService
.
getSharedInstance
();
}
return
c
s
ToUse
.
convert
(
value
,
targetType
);
return
c
onversionService
ToUse
.
convert
(
value
,
targetType
);
}
...
...
spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
浏览文件 @
82c1c859
...
...
@@ -250,7 +250,7 @@ public class SQLErrorCodesFactory {
/**
* Clear the cache for the specified {@link DataSource}, if registered.
* @param dataSource the {@code DataSource} identifying the database
* @return the corresponding {@code SQLErrorCodes} object,
* @return the corresponding {@code SQLErrorCodes} object
that got removed
,
* or {@code null} if not registered
* @since 4.3.5
* @see #registerDatabase(DataSource, String)
...
...
spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java
浏览文件 @
82c1c859
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -23,27 +23,27 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import
com.thoughtworks.xstream.io.HierarchicalStreamWriter
;
/**
* XStream {@link Converter} that supports all classes
but throws exceptions
*
for
(un)marshalling.
* XStream {@link Converter} that supports all classes
, but throws exceptions for
* (un)marshalling.
*
* <p>
M
ain purpose of this class is to
* {@linkplain com.thoughtworks.xstream.XStream#registerConverter(Converter, int) register}
* this converter as a catch-all converter with a
* <p>
The m
ain purpose of this class is to
* {@linkplain com.thoughtworks.xstream.XStream#registerConverter(
com.thoughtworks.xstream.converters.
Converter, int) register}
* this converter as a catch-all
last
converter with a
* {@linkplain com.thoughtworks.xstream.XStream#PRIORITY_NORMAL normal}
* or higher priority, in addition to converters that explicitly
support
the domain
* classes that should be supported. As a result, default XStream converters with
lower
* priorities and possible security vulnerabilities do not get invoked.
* or higher priority, in addition to converters that explicitly
handle
the domain
* classes that should be supported. As a result, default XStream converters with
*
lower
priorities and possible security vulnerabilities do not get invoked.
*
* <p>For instance:
</p>
* <p>For instance:
* <pre class="code">
* XStreamMarshaller unmarshaller = new XStreamMarshaller();
* unmarshaller.getXStream().registerConverter(new MyDomainClassConverter(), XStream.PRIORITY_VERY_HIGH);
* unmarshaller.getXStream().registerConverter(new CatchAllConverter(), XStream.PRIORITY_NORMAL);
* MyDomainClass
o
= unmarshaller.unmarshal(source);
* MyDomainClass
myObject
= unmarshaller.unmarshal(source);
* </pre
*
* @author Arjen Poutsma
* @since
4.0
* @since
3.2.5
*/
public
class
CatchAllConverter
implements
Converter
{
...
...
spring-web/src/main/java/org/springframework/web/client/RestOperations.java
浏览文件 @
82c1c859
...
...
@@ -310,12 +310,12 @@ public interface RestOperations {
/**
* Update a resource by PATCHing the given object to the URI template,
* and return
s
the representation found in the response.
* and return the representation found in the response.
* <p>URI Template variables are expanded using the given URI variables, if any.
* <p>The {@code request} parameter can be a {@link HttpEntity} in order to
* add additional HTTP headers to the request.
* @param url the URL
* @param request the
O
bject to be PATCHed (may be {@code null})
* @param request the
o
bject to be PATCHed (may be {@code null})
* @param responseType the type of the return value
* @param uriVariables the variables to expand the template
* @return the converted object
...
...
@@ -327,12 +327,12 @@ public interface RestOperations {
/**
* Update a resource by PATCHing the given object to the URI template,
* and return
s
the representation found in the response.
* and return the representation found in the response.
* <p>URI Template variables are expanded using the given map.
* <p>The {@code request} parameter can be a {@link HttpEntity} in order to
* add additional HTTP headers to the request.
* @param url the URL
* @param request the
O
bject to be PATCHed (may be {@code null})
* @param request the
o
bject to be PATCHed (may be {@code null})
* @param responseType the type of the return value
* @param uriVariables the variables to expand the template
* @return the converted object
...
...
@@ -344,11 +344,11 @@ public interface RestOperations {
/**
* Update a resource by PATCHing the given object to the URL,
* and return
s
the representation found in the response.
* and return the representation found in the response.
* <p>The {@code request} parameter can be a {@link HttpEntity} in order to
* add additional HTTP headers to the request.
* @param url the URL
* @param request the
O
bject to be PATCHed (may be {@code null})
* @param request the
o
bject to be PATCHed (may be {@code null})
* @param responseType the type of the return value
* @return the converted object
* @since 4.3.5
...
...
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
浏览文件 @
82c1c859
...
...
@@ -150,7 +150,6 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
/**
* Configure a {@link StompEncoder} for encoding STOMP frames
* @param encoder the encoder
* @since 4.3.5
*/
public
void
setEncoder
(
StompEncoder
encoder
)
{
...
...
@@ -159,7 +158,6 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
/**
* Configure a {@link StompDecoder} for decoding STOMP frames
* @param decoder the decoder
* @since 4.3.5
*/
public
void
setDecoder
(
StompDecoder
decoder
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录