Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
8a746702
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,发现更多精彩内容 >>
提交
8a746702
编写于
12月 15, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
37c734ec
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
32 deletion
+25
-32
spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
...springframework/util/xml/AbstractStaxHandlerTestCase.java
+18
-20
spring-core/src/test/java/org/springframework/util/xml/StaxEventHandlerTests.java
...a/org/springframework/util/xml/StaxEventHandlerTests.java
+2
-3
spring-core/src/test/java/org/springframework/util/xml/StaxStreamHandlerTests.java
.../org/springframework/util/xml/StaxStreamHandlerTests.java
+2
-3
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
.../reactive/result/method/AbstractHandlerMethodMapping.java
+1
-2
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
...ork/web/servlet/handler/AbstractHandlerMethodMapping.java
+2
-4
未找到文件。
spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
浏览文件 @
8a746702
/*
* Copyright 2002-201
5
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.
...
...
@@ -16,6 +16,16 @@
package
org.springframework.util.xml
;
import
java.io.StringReader
;
import
java.io.StringWriter
;
import
java.net.Socket
;
import
javax.xml.parsers.DocumentBuilder
;
import
javax.xml.parsers.DocumentBuilderFactory
;
import
javax.xml.stream.XMLStreamException
;
import
javax.xml.transform.Result
;
import
javax.xml.transform.dom.DOMResult
;
import
javax.xml.transform.stream.StreamResult
;
import
org.junit.Assume
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
@@ -26,19 +36,8 @@ import org.xml.sax.XMLReader;
import
org.xml.sax.helpers.XMLReaderFactory
;
import
org.xmlunit.util.Predicate
;
import
javax.xml.parsers.DocumentBuilder
;
import
javax.xml.parsers.DocumentBuilderFactory
;
import
javax.xml.stream.XMLStreamException
;
import
javax.xml.transform.Result
;
import
javax.xml.transform.dom.DOMResult
;
import
javax.xml.transform.stream.StreamResult
;
import
java.io.StringReader
;
import
java.io.StringWriter
;
import
java.net.Socket
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
xmlunit
.
matchers
.
CompareMatcher
.
isSimilarTo
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
xmlunit
.
matchers
.
CompareMatcher
.*;
/**
* @author Arjen Poutsma
...
...
@@ -57,17 +56,18 @@ public abstract class AbstractStaxHandlerTestCase {
"<?pi content?><root xmlns='namespace'><prefix:child xmlns:prefix='namespace2' prefix:attr='value'>content</prefix:child>"
+
"</root>"
;
private
static
final
Predicate
<
Node
>
nodeFilter
=
(
n
->
n
.
getNodeType
()
!=
Node
.
COMMENT_NODE
&&
n
.
getNodeType
()
!=
Node
.
DOCUMENT_TYPE_NODE
&&
n
.
getNodeType
()
!=
Node
.
PROCESSING_INSTRUCTION_NODE
);
private
XMLReader
xmlReader
;
private
Predicate
<
Node
>
nodeFilter
=
n
->
n
.
getNodeType
()
!=
Node
.
COMMENT_NODE
&&
n
.
getNodeType
()
!=
Node
.
DOCUMENT_TYPE_NODE
&&
n
.
getNodeType
()
!=
Node
.
PROCESSING_INSTRUCTION_NODE
;
@Before
public
void
createXMLReader
()
throws
Exception
{
xmlReader
=
XMLReaderFactory
.
createXMLReader
();
}
@Test
public
void
noNamespacePrefixes
()
throws
Exception
{
Assume
.
assumeTrue
(
wwwSpringframeworkOrgIsAccessible
());
...
...
@@ -114,8 +114,7 @@ public abstract class AbstractStaxHandlerTestCase {
@Test
public
void
noNamespacePrefixesDom
()
throws
Exception
{
DocumentBuilderFactory
documentBuilderFactory
=
DocumentBuilderFactory
.
newInstance
();
DocumentBuilderFactory
documentBuilderFactory
=
DocumentBuilderFactory
.
newInstance
();
documentBuilderFactory
.
setNamespaceAware
(
true
);
DocumentBuilder
documentBuilder
=
documentBuilderFactory
.
newDocumentBuilder
();
...
...
@@ -136,8 +135,7 @@ public abstract class AbstractStaxHandlerTestCase {
@Test
public
void
namespacePrefixesDom
()
throws
Exception
{
DocumentBuilderFactory
documentBuilderFactory
=
DocumentBuilderFactory
.
newInstance
();
DocumentBuilderFactory
documentBuilderFactory
=
DocumentBuilderFactory
.
newInstance
();
documentBuilderFactory
.
setNamespaceAware
(
true
);
DocumentBuilder
documentBuilder
=
documentBuilderFactory
.
newDocumentBuilder
();
...
...
spring-core/src/test/java/org/springframework/util/xml/StaxEventHandlerTests.java
浏览文件 @
8a746702
/*
* 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.
...
...
@@ -27,8 +27,7 @@ import javax.xml.transform.Result;
public
class
StaxEventHandlerTests
extends
AbstractStaxHandlerTestCase
{
@Override
protected
AbstractStaxHandler
createStaxHandler
(
Result
result
)
throws
XMLStreamException
{
protected
AbstractStaxHandler
createStaxHandler
(
Result
result
)
throws
XMLStreamException
{
XMLOutputFactory
outputFactory
=
XMLOutputFactory
.
newFactory
();
XMLEventWriter
eventWriter
=
outputFactory
.
createXMLEventWriter
(
result
);
return
new
StaxEventHandler
(
eventWriter
);
...
...
spring-core/src/test/java/org/springframework/util/xml/StaxStreamHandlerTests.java
浏览文件 @
8a746702
/*
* 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.
...
...
@@ -27,8 +27,7 @@ import javax.xml.transform.Result;
public
class
StaxStreamHandlerTests
extends
AbstractStaxHandlerTestCase
{
@Override
protected
AbstractStaxHandler
createStaxHandler
(
Result
result
)
throws
XMLStreamException
{
protected
AbstractStaxHandler
createStaxHandler
(
Result
result
)
throws
XMLStreamException
{
XMLOutputFactory
outputFactory
=
XMLOutputFactory
.
newFactory
();
XMLStreamWriter
streamWriter
=
outputFactory
.
createXMLStreamWriter
(
result
);
return
new
StaxStreamHandler
(
streamWriter
);
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
浏览文件 @
8a746702
...
...
@@ -439,8 +439,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
private
final
MultiValueMap
<
String
,
T
>
urlLookup
=
new
LinkedMultiValueMap
<>();
private
final
Map
<
HandlerMethod
,
CorsConfiguration
>
corsLookup
=
new
ConcurrentHashMap
<>();
private
final
Map
<
HandlerMethod
,
CorsConfiguration
>
corsLookup
=
new
ConcurrentHashMap
<>();
private
final
ReentrantReadWriteLock
readWriteLock
=
new
ReentrantReadWriteLock
();
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
浏览文件 @
8a746702
...
...
@@ -480,11 +480,9 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
private
final
MultiValueMap
<
String
,
T
>
urlLookup
=
new
LinkedMultiValueMap
<>();
private
final
Map
<
String
,
List
<
HandlerMethod
>>
nameLookup
=
new
ConcurrentHashMap
<>();
private
final
Map
<
String
,
List
<
HandlerMethod
>>
nameLookup
=
new
ConcurrentHashMap
<>();
private
final
Map
<
HandlerMethod
,
CorsConfiguration
>
corsLookup
=
new
ConcurrentHashMap
<>();
private
final
Map
<
HandlerMethod
,
CorsConfiguration
>
corsLookup
=
new
ConcurrentHashMap
<>();
private
final
ReentrantReadWriteLock
readWriteLock
=
new
ReentrantReadWriteLock
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录