Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
45e520ed
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,发现更多精彩内容 >>
提交
45e520ed
编写于
2月 14, 2018
作者:
I
igor-suhorukov
提交者:
Juergen Hoeller
2月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish: remove unused private fields, remove empty operator
上级
1908080d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
5 addition
and
32 deletion
+5
-32
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
...a/org/springframework/core/io/buffer/DataBufferUtils.java
+0
-8
spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
.../springframework/expression/spel/ast/MethodReference.java
+1
-1
spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
...ramework/test/web/servlet/result/ModelResultMatchers.java
+1
-1
spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java
...org/springframework/http/server/DefaultPathContainer.java
+0
-3
spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
...ework/http/server/reactive/ServletHttpHandlerAdapter.java
+1
-1
spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java
...rg/springframework/web/util/DefaultUriBuilderFactory.java
+1
-1
spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java
...ngframework/web/reactive/result/SimpleHandlerAdapter.java
+0
-16
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java
...socket/config/annotation/WebMvcStompEndpointRegistry.java
+1
-1
未找到文件。
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
浏览文件 @
45e520ed
...
...
@@ -31,7 +31,6 @@ import java.nio.file.StandardOpenOption;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.concurrent.atomic.AtomicLong
;
import
java.util.function.BinaryOperator
;
import
java.util.function.Consumer
;
import
org.reactivestreams.Publisher
;
...
...
@@ -57,13 +56,6 @@ public abstract class DataBufferUtils {
private
static
final
Consumer
<
DataBuffer
>
RELEASE_CONSUMER
=
DataBufferUtils:
:
release
;
private
static
final
BinaryOperator
<
DataBuffer
>
WRITE_AGGREGATOR
=
(
dataBuffer1
,
dataBuffer2
)
->
{
DataBuffer
result
=
dataBuffer1
.
write
(
dataBuffer2
);
release
(
dataBuffer2
);
return
result
;
};
//---------------------------------------------------------------------
// Reading
//---------------------------------------------------------------------
...
...
spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
浏览文件 @
45e520ed
...
...
@@ -321,7 +321,7 @@ public class MethodReference extends SpelNodeImpl {
Class
<?>
publicDeclaringClass
=
methodExecutor
.
getPublicDeclaringClass
();
Assert
.
state
(
publicDeclaringClass
!=
null
,
"No public declaring class"
);
classDesc
=
publicDeclaringClass
.
getName
().
replace
(
'.'
,
'/'
);
}
;
}
if
(!
isStaticMethod
)
{
if
(
descriptor
==
null
||
!
descriptor
.
substring
(
1
).
equals
(
classDesc
))
{
...
...
spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
浏览文件 @
45e520ed
...
...
@@ -239,7 +239,7 @@ public class ModelResultMatchers {
ModelAndView
mav
=
mvcResult
.
getModelAndView
();
if
(
mav
==
null
)
{
fail
(
"No ModelAndView found"
);
}
;
}
return
mav
;
}
...
...
spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java
浏览文件 @
45e520ed
...
...
@@ -194,8 +194,6 @@ class DefaultPathContainer implements PathContainer {
private
final
String
value
;
private
final
char
[]
valueAsChars
;
private
final
String
valueToMatch
;
private
final
char
[]
valueToMatchAsChars
;
...
...
@@ -206,7 +204,6 @@ class DefaultPathContainer implements PathContainer {
DefaultPathSegment
(
String
value
,
String
valueToMatch
,
MultiValueMap
<
String
,
String
>
params
)
{
Assert
.
isTrue
(!
value
.
contains
(
"/"
),
()
->
"Invalid path segment value: "
+
value
);
this
.
value
=
value
;
this
.
valueAsChars
=
value
.
toCharArray
();
this
.
valueToMatch
=
valueToMatch
;
this
.
valueToMatchAsChars
=
valueToMatch
.
toCharArray
();
this
.
parameters
=
CollectionUtils
.
unmodifiableMultiValueMap
(
params
);
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
浏览文件 @
45e520ed
...
...
@@ -254,7 +254,7 @@ public class ServletHttpHandlerAdapter implements Servlet {
public
void
onComplete
(
AsyncEvent
event
)
{
// no-op
}
}
;
}
private
class
HandlerResultSubscriber
implements
Subscriber
<
Void
>
{
...
...
spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java
浏览文件 @
45e520ed
...
...
@@ -40,7 +40,7 @@ import org.springframework.util.ObjectUtils;
*/
public
class
DefaultUriBuilderFactory
implements
UriBuilderFactory
{
public
enum
EncodingMode
{
URI_COMPONENT
,
VALUES_ONLY
,
NONE
}
;
public
enum
EncodingMode
{
URI_COMPONENT
,
VALUES_ONLY
,
NONE
}
private
final
UriComponentsBuilder
baseUri
;
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java
浏览文件 @
45e520ed
...
...
@@ -16,11 +16,9 @@
package
org.springframework.web.reactive.result
;
import
java.lang.reflect.Method
;
import
reactor.core.publisher.Mono
;
import
org.springframework.core.MethodParameter
;
import
org.springframework.web.reactive.DispatcherHandler
;
import
org.springframework.web.reactive.HandlerAdapter
;
import
org.springframework.web.reactive.HandlerResult
;
...
...
@@ -37,20 +35,6 @@ import org.springframework.web.server.WebHandler;
*/
public
class
SimpleHandlerAdapter
implements
HandlerAdapter
{
private
static
final
MethodParameter
RETURN_TYPE
;
static
{
try
{
Method
method
=
WebHandler
.
class
.
getMethod
(
"handle"
,
ServerWebExchange
.
class
);
RETURN_TYPE
=
new
MethodParameter
(
method
,
-
1
);
}
catch
(
NoSuchMethodException
ex
)
{
throw
new
IllegalStateException
(
"Failed to initialize the return type for WebHandler: "
+
ex
.
getMessage
());
}
}
@Override
public
boolean
supports
(
Object
handler
)
{
return
WebHandler
.
class
.
isAssignableFrom
(
handler
.
getClass
());
...
...
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java
浏览文件 @
45e520ed
...
...
@@ -90,7 +90,7 @@ public class WebMvcStompEndpointRegistry implements StompEndpointRegistry {
WebSocketHandler
actual
=
WebSocketHandlerDecorator
.
unwrap
(
handler
);
if
(!(
actual
instanceof
SubProtocolWebSocketHandler
))
{
throw
new
IllegalArgumentException
(
"No SubProtocolWebSocketHandler in "
+
handler
);
}
;
}
return
(
SubProtocolWebSocketHandler
)
actual
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录