Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
25131ebf
S
spring-framework
项目概览
带水的鱼儿
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
25131ebf
编写于
7月 13, 2021
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resource handler initialized only once
Closes gh-27153
上级
0267b00a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
41 addition
and
32 deletion
+41
-32
spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
...ramework/web/reactive/config/ResourceHandlerRegistry.java
+19
-13
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
...eb/servlet/config/annotation/ResourceHandlerRegistry.java
+22
-19
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
浏览文件 @
25131ebf
/*
* Copyright 2002-20
18
the original author or authors.
* Copyright 2002-20
21
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.
...
...
@@ -28,6 +28,7 @@ import org.springframework.core.io.ResourceLoader;
import
org.springframework.lang.Nullable
;
import
org.springframework.web.reactive.handler.AbstractUrlHandlerMapping
;
import
org.springframework.web.reactive.handler.SimpleUrlHandlerMapping
;
import
org.springframework.web.reactive.resource.ResourceTransformer
;
import
org.springframework.web.reactive.resource.ResourceTransformerSupport
;
import
org.springframework.web.reactive.resource.ResourceUrlProvider
;
import
org.springframework.web.reactive.resource.ResourceWebHandler
;
...
...
@@ -136,23 +137,28 @@ public class ResourceHandlerRegistry {
}
Map
<
String
,
WebHandler
>
urlMap
=
new
LinkedHashMap
<>();
for
(
ResourceHandlerRegistration
registration
:
this
.
registrations
)
{
ResourceWebHandler
handler
=
getRequestHandler
(
registration
);
for
(
String
pathPattern
:
registration
.
getPathPatterns
())
{
ResourceWebHandler
handler
=
registration
.
getRequestHandler
();
handler
.
getResourceTransformers
().
forEach
(
transformer
->
{
if
(
transformer
instanceof
ResourceTransformerSupport
)
{
((
ResourceTransformerSupport
)
transformer
).
setResourceUrlProvider
(
this
.
resourceUrlProvider
);
}
});
try
{
handler
.
afterPropertiesSet
();
}
catch
(
Throwable
ex
)
{
throw
new
BeanInitializationException
(
"Failed to init ResourceHttpRequestHandler"
,
ex
);
}
urlMap
.
put
(
pathPattern
,
handler
);
}
}
return
new
SimpleUrlHandlerMapping
(
urlMap
,
this
.
order
);
}
private
ResourceWebHandler
getRequestHandler
(
ResourceHandlerRegistration
registration
)
{
ResourceWebHandler
handler
=
registration
.
getRequestHandler
();
for
(
ResourceTransformer
transformer
:
handler
.
getResourceTransformers
())
{
if
(
transformer
instanceof
ResourceTransformerSupport
)
{
((
ResourceTransformerSupport
)
transformer
).
setResourceUrlProvider
(
this
.
resourceUrlProvider
);
}
}
try
{
handler
.
afterPropertiesSet
();
}
catch
(
Throwable
ex
)
{
throw
new
BeanInitializationException
(
"Failed to init ResourceHttpRequestHandler"
,
ex
);
}
return
handler
;
}
}
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
浏览文件 @
25131ebf
/*
* Copyright 2002-202
0
the original author or authors.
* Copyright 2002-202
1
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.
...
...
@@ -159,35 +159,38 @@ public class ResourceHandlerRegistry {
* of no registrations.
*/
@Nullable
@SuppressWarnings
(
"deprecation"
)
protected
AbstractHandlerMapping
getHandlerMapping
()
{
if
(
this
.
registrations
.
isEmpty
())
{
return
null
;
}
Map
<
String
,
HttpRequestHandler
>
urlMap
=
new
LinkedHashMap
<>();
for
(
ResourceHandlerRegistration
registration
:
this
.
registrations
)
{
ResourceHttpRequestHandler
handler
=
getRequestHandler
(
registration
);
for
(
String
pathPattern
:
registration
.
getPathPatterns
())
{
ResourceHttpRequestHandler
handler
=
registration
.
getRequestHandler
();
if
(
this
.
pathHelper
!=
null
)
{
handler
.
setUrlPathHelper
(
this
.
pathHelper
);
}
if
(
this
.
contentNegotiationManager
!=
null
)
{
handler
.
setContentNegotiationManager
(
this
.
contentNegotiationManager
);
}
handler
.
setServletContext
(
this
.
servletContext
);
handler
.
setApplicationContext
(
this
.
applicationContext
);
try
{
handler
.
afterPropertiesSet
();
}
catch
(
Throwable
ex
)
{
throw
new
BeanInitializationException
(
"Failed to init ResourceHttpRequestHandler"
,
ex
);
}
urlMap
.
put
(
pathPattern
,
handler
);
}
}
return
new
SimpleUrlHandlerMapping
(
urlMap
,
this
.
order
);
}
@SuppressWarnings
(
"deprecation"
)
private
ResourceHttpRequestHandler
getRequestHandler
(
ResourceHandlerRegistration
registration
)
{
ResourceHttpRequestHandler
handler
=
registration
.
getRequestHandler
();
if
(
this
.
pathHelper
!=
null
)
{
handler
.
setUrlPathHelper
(
this
.
pathHelper
);
}
if
(
this
.
contentNegotiationManager
!=
null
)
{
handler
.
setContentNegotiationManager
(
this
.
contentNegotiationManager
);
}
handler
.
setServletContext
(
this
.
servletContext
);
handler
.
setApplicationContext
(
this
.
applicationContext
);
try
{
handler
.
afterPropertiesSet
();
}
catch
(
Throwable
ex
)
{
throw
new
BeanInitializationException
(
"Failed to init ResourceHttpRequestHandler"
,
ex
);
}
return
handler
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录