Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
94a7624c
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,发现更多精彩内容 >>
提交
94a7624c
编写于
3月 07, 2017
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
f30c4981
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
40 addition
and
37 deletion
+40
-37
spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
...type/classreading/AnnotationAttributesReadingVisitor.java
+4
-3
spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
...core/type/classreading/AnnotationReadingVisitorUtils.java
+2
-2
spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
...pringframework/web/context/request/RequestScopeTests.java
+3
-2
spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
...ramework/web/context/request/RequestScopedProxyTests.java
+5
-4
spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java
...eb/context/request/ServletWebRequestHttpMethodsTests.java
+9
-9
spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
...framework/web/context/request/ServletWebRequestTests.java
+7
-6
spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
...ework/web/context/request/async/WebAsyncManagerTests.java
+3
-2
spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
...eb/context/request/async/WebAsyncManagerTimeoutTests.java
+7
-9
未找到文件。
spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -99,13 +99,14 @@ final class AnnotationAttributesReadingVisitor extends RecursiveAnnotationAttrib
// accessibility in a SecurityManager environment.
if
(
Modifier
.
isPublic
(
annotation
.
annotationType
().
getModifiers
()))
{
String
annotationName
=
annotation
.
annotationType
().
getName
();
this
.
attributesMap
.
add
(
annotationName
,
AnnotationUtils
.
getAnnotationAttributes
(
annotation
,
false
,
true
));
this
.
attributesMap
.
add
(
annotationName
,
AnnotationUtils
.
getAnnotationAttributes
(
annotation
,
false
,
true
));
}
for
(
Annotation
metaMetaAnnotation
:
annotation
.
annotationType
().
getAnnotations
())
{
recursivelyCollectMetaAnnotations
(
visited
,
metaMetaAnnotation
);
}
}
catch
(
Exception
ex
)
{
catch
(
Throwable
ex
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"Failed to introspect meta-annotations on ["
+
annotation
+
"]: "
+
ex
);
}
...
...
spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -94,7 +94,7 @@ abstract class AnnotationReadingVisitorUtils {
}
entry
.
setValue
(
value
);
}
catch
(
Exception
ex
)
{
catch
(
Throwable
ex
)
{
// Class not found - can't resolve class reference in annotation attribute.
result
.
put
(
entry
.
getKey
(),
ex
);
}
...
...
spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -46,7 +46,7 @@ public class RequestScopeTests {
@Before
public
void
set
U
p
()
throws
Exception
{
public
void
set
u
p
()
throws
Exception
{
this
.
beanFactory
.
registerScope
(
"request"
,
new
RequestScope
());
this
.
beanFactory
.
setBeanExpressionResolver
(
new
StandardBeanExpressionResolver
());
XmlBeanDefinitionReader
reader
=
new
XmlBeanDefinitionReader
(
this
.
beanFactory
);
...
...
@@ -59,6 +59,7 @@ public class RequestScopeTests {
RequestContextHolder
.
setRequestAttributes
(
null
);
}
@Test
public
void
getFromScope
()
throws
Exception
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
();
...
...
spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -38,17 +38,18 @@ import static org.junit.Assert.*;
*/
public
class
RequestScopedProxyTests
{
private
DefaultListableBeanFactory
beanFactory
;
private
final
DefaultListableBeanFactory
beanFactory
=
new
DefaultListableBeanFactory
();
@Before
public
void
setUp
()
throws
Exception
{
this
.
beanFactory
=
new
DefaultListableBeanFactory
();
public
void
setup
()
{
this
.
beanFactory
.
registerScope
(
"request"
,
new
RequestScope
());
XmlBeanDefinitionReader
reader
=
new
XmlBeanDefinitionReader
(
this
.
beanFactory
);
reader
.
loadBeanDefinitions
(
new
ClassPathResource
(
"requestScopedProxyTests.xml"
,
getClass
()));
this
.
beanFactory
.
preInstantiateSingletons
();
}
@Test
public
void
testGetFromScope
()
throws
Exception
{
String
name
=
"requestScopedObject"
;
...
...
spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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,8 +16,6 @@
package
org.springframework.web.context.request
;
import
static
org
.
junit
.
Assert
.*;
import
java.text.SimpleDateFormat
;
import
java.util.Arrays
;
import
java.util.Date
;
...
...
@@ -34,6 +32,8 @@ import org.junit.runners.Parameterized.Parameters;
import
org.springframework.mock.web.test.MockHttpServletRequest
;
import
org.springframework.mock.web.test.MockHttpServletResponse
;
import
static
org
.
junit
.
Assert
.*;
/**
* Parameterized tests for ServletWebRequest
* @author Juergen Hoeller
...
...
@@ -66,8 +66,9 @@ public class ServletWebRequestHttpMethodsTests {
});
}
@Before
public
void
set
U
p
()
{
public
void
set
u
p
()
{
currentDate
=
new
Date
();
dateFormat
=
new
SimpleDateFormat
(
"EEE, dd MMM yyyy HH:mm:ss z"
,
Locale
.
US
);
dateFormat
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"GMT"
));
...
...
@@ -76,6 +77,7 @@ public class ServletWebRequestHttpMethodsTests {
request
=
new
ServletWebRequest
(
servletRequest
,
servletResponse
);
}
@Test
public
void
checkNotModifiedNon2xxStatus
()
{
long
epochTime
=
currentDate
.
getTime
();
...
...
@@ -87,8 +89,7 @@ public class ServletWebRequestHttpMethodsTests {
assertNull
(
servletResponse
.
getHeader
(
"Last-Modified"
));
}
// SPR-13516
@Test
@Test
// SPR-13516
public
void
checkNotModifiedInvalidStatus
()
{
long
epochTime
=
currentDate
.
getTime
();
servletRequest
.
addHeader
(
"If-Modified-Since"
,
epochTime
);
...
...
@@ -97,7 +98,7 @@ public class ServletWebRequestHttpMethodsTests {
assertFalse
(
request
.
checkNotModified
(
epochTime
));
}
@Test
// SPR-14559
@Test
// SPR-14559
public
void
checkNotModifiedInvalidIfNoneMatchHeader
()
{
String
eTag
=
"\"etagvalue\""
;
servletRequest
.
addHeader
(
"If-None-Match"
,
"missingquotes"
);
...
...
@@ -223,8 +224,7 @@ public class ServletWebRequestHttpMethodsTests {
assertEquals
(
dateFormat
.
format
(
currentDate
.
getTime
()),
servletResponse
.
getHeader
(
"Last-Modified"
));
}
// SPR-14224
@Test
@Test
// SPR-14224
public
void
checkNotModifiedETagAndModifiedTimestamp
()
{
String
eTag
=
"\"Foo\""
;
servletRequest
.
addHeader
(
"If-None-Match"
,
eTag
);
...
...
spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
7
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,11 +16,8 @@
package
org.springframework.web.context.request
;
import
static
org
.
junit
.
Assert
.*;
import
java.util.Locale
;
import
java.util.Map
;
import
javax.servlet.ServletRequest
;
import
javax.servlet.ServletResponse
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -35,6 +32,8 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
import
org.springframework.mock.web.test.MockHttpServletResponse
;
import
org.springframework.web.multipart.MultipartRequest
;
import
static
org
.
junit
.
Assert
.*;
/**
* @author Juergen Hoeller
*/
...
...
@@ -46,13 +45,15 @@ public class ServletWebRequestTests {
private
ServletWebRequest
request
;
@Before
public
void
set
U
p
()
{
public
void
set
u
p
()
{
servletRequest
=
new
MockHttpServletRequest
();
servletResponse
=
new
MockHttpServletResponse
();
request
=
new
ServletWebRequest
(
servletRequest
,
servletResponse
);
}
@Test
public
void
parameters
()
{
servletRequest
.
addParameter
(
"param1"
,
"value1"
);
...
...
@@ -114,4 +115,4 @@ public class ServletWebRequestTests {
assertNull
(
request
.
getNativeResponse
(
MultipartRequest
.
class
));
}
}
\ No newline at end of file
}
spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -44,7 +44,7 @@ public class WebAsyncManagerTests {
@Before
public
void
set
U
p
()
{
public
void
set
u
p
()
{
this
.
servletRequest
=
new
MockHttpServletRequest
();
this
.
asyncManager
=
WebAsyncUtils
.
getAsyncManager
(
servletRequest
);
this
.
asyncManager
.
setTaskExecutor
(
new
SyncTaskExecutor
());
...
...
@@ -54,6 +54,7 @@ public class WebAsyncManagerTests {
reset
(
this
.
asyncWebRequest
);
}
@Test
public
void
startAsyncProcessingWithoutAsyncWebRequest
()
throws
Exception
{
WebAsyncManager
manager
=
WebAsyncUtils
.
getAsyncManager
(
new
MockHttpServletRequest
());
...
...
spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
浏览文件 @
94a7624c
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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,12 +28,9 @@ import org.springframework.mock.web.test.MockHttpServletRequest;
import
org.springframework.mock.web.test.MockHttpServletResponse
;
import
org.springframework.web.context.request.NativeWebRequest
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
BDDMockito
.
mock
;
import
static
org
.
mockito
.
BDDMockito
.
verify
;
import
static
org
.
springframework
.
web
.
context
.
request
.
async
.
CallableProcessingInterceptor
.
RESULT_NONE
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.*;
import
static
org
.
springframework
.
web
.
context
.
request
.
async
.
CallableProcessingInterceptor
.*;
/**
* {@link WebAsyncManager} tests where container-triggered timeout/completion
...
...
@@ -53,8 +50,9 @@ public class WebAsyncManagerTimeoutTests {
private
MockHttpServletResponse
servletResponse
;
@Before
public
void
set
U
p
()
{
public
void
set
u
p
()
{
this
.
servletRequest
=
new
MockHttpServletRequest
(
"GET"
,
"/test"
);
this
.
servletRequest
.
setAsyncSupported
(
true
);
this
.
servletResponse
=
new
MockHttpServletResponse
();
...
...
@@ -67,9 +65,9 @@ public class WebAsyncManagerTimeoutTests {
this
.
asyncManager
.
setAsyncWebRequest
(
this
.
asyncWebRequest
);
}
@Test
public
void
startCallableProcessingTimeoutAndComplete
()
throws
Exception
{
StubCallable
callable
=
new
StubCallable
();
CallableProcessingInterceptor
interceptor
=
mock
(
CallableProcessingInterceptor
.
class
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录