Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7a690df9
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,体验更适合开发者的 AI 搜索 >>
提交
7a690df9
编写于
5月 06, 2015
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove trailing whitespace from Java source code
上级
edc66d76
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
27 addition
and
27 deletion
+27
-27
spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java
...gframework/context/annotation/AutoProxyLazyInitTests.java
+1
-1
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
...pringframework/core/annotation/AnnotatedElementUtils.java
+1
-1
spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
...k/core/convert/support/GenericConversionServiceTests.java
+1
-1
spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
...mework/util/concurrent/SettableListenableFutureTests.java
+2
-2
spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
...in/java/org/springframework/expression/spel/CodeFlow.java
+1
-1
spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
...xpression/spel/standard/InternalSpelExpressionParser.java
+2
-2
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
...ork/expression/spel/support/ReflectiveMethodExecutor.java
+1
-1
spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java
...st/java/org/springframework/expression/spel/MapTests.java
+3
-3
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
...amework/expression/spel/SpelCompilationCoverageTests.java
+11
-11
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
...rg/springframework/messaging/simp/stomp/StompHeaders.java
+2
-2
spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
...a/org/springframework/test/annotation/DirtiesContext.java
+1
-1
spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java
...st/context/cache/ClassLevelDirtiesContextTestNGTests.java
+1
-1
未找到文件。
spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java
浏览文件 @
7a690df9
...
...
@@ -41,7 +41,7 @@ public class AutoProxyLazyInitTests {
ApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
(
ConfigWithStatic
.
class
);
MyBean
bean
=
ctx
.
getBean
(
"myBean"
,
MyBean
.
class
);
assertFalse
(
MyBeanImpl
.
initialized
);
bean
.
doIt
();
assertTrue
(
MyBeanImpl
.
initialized
);
...
...
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
浏览文件 @
7a690df9
...
...
@@ -67,7 +67,7 @@ import org.springframework.util.MultiValueMap;
* <li>Searching on methods in interfaces, if the annotated element is a method
* <li>Searching on methods in superclasses, if the annotated element is a method
* </ul>
*
*
* <h3>Support for {@code @Inherited}</h3>
* <p>Methods following <em>get semantics</em> will honor the contract of
* Java's {@link java.lang.annotation.Inherited @Inherited} annotation.
...
...
spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
浏览文件 @
7a690df9
...
...
@@ -56,7 +56,7 @@ import static org.junit.Assert.*;
/**
* Unit tests for the {@link GenericConversionService}.
*
* <p>For tests involving the {@link DefaultConversionService}, see
* <p>For tests involving the {@link DefaultConversionService}, see
* {@link DefaultConversionServiceTests}.
*
* @author Keith Donald
...
...
spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
浏览文件 @
7a690df9
...
...
@@ -320,12 +320,12 @@ public class SettableListenableFutureTests {
private
static
class
InterruptableSettableListenableFuture
extends
SettableListenableFuture
<
String
>
{
private
boolean
interrupted
=
false
;
@Override
protected
void
interruptTask
()
{
interrupted
=
true
;
}
boolean
calledInterruptTask
()
{
return
interrupted
;
}
...
...
spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
浏览文件 @
7a690df9
...
...
@@ -222,7 +222,7 @@ public class CodeFlow implements Opcodes {
mv
.
visitTypeInsn
(
CHECKCAST
,
"java/lang/Number"
);
}
mv
.
visitMethodInsn
(
INVOKEVIRTUAL
,
"java/lang/Number"
,
"doubleValue"
,
"()D"
,
false
);
break
;
break
;
case
'F'
:
if
(
stackDescriptor
.
equals
(
"Ljava/lang/Object"
))
{
mv
.
visitTypeInsn
(
CHECKCAST
,
"java/lang/Number"
);
...
...
spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
浏览文件 @
7a690df9
...
...
@@ -628,7 +628,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
// '}' - end of list
// ',' - more expressions in this list
// ':' - this is a map!
if
(
peekToken
(
TokenKind
.
RCURLY
))
{
// list with one item in it
List
<
SpelNodeImpl
>
listElements
=
new
ArrayList
<
SpelNodeImpl
>();
listElements
.
add
(
firstExpression
);
...
...
@@ -644,7 +644,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
while
(
peekToken
(
TokenKind
.
COMMA
,
true
));
closingCurly
=
eatToken
(
TokenKind
.
RCURLY
);
expr
=
new
InlineList
(
toPos
(
t
.
startPos
,
closingCurly
.
endPos
),
listElements
.
toArray
(
new
SpelNodeImpl
[
listElements
.
size
()]));
}
else
if
(
peekToken
(
TokenKind
.
COLON
,
true
))
{
// map!
List
<
SpelNodeImpl
>
mapElements
=
new
ArrayList
<
SpelNodeImpl
>();
...
...
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
浏览文件 @
7a690df9
...
...
@@ -81,7 +81,7 @@ public class ReflectiveMethodExecutor implements MethodExecutor {
clazz
.
getDeclaredMethod
(
method
.
getName
(),
method
.
getParameterTypes
());
return
clazz
;
}
catch
(
NoSuchMethodException
nsme
)
{
}
}
Class
<?>[]
intfaces
=
clazz
.
getInterfaces
();
...
...
spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java
浏览文件 @
7a690df9
...
...
@@ -136,7 +136,7 @@ public class MapTests extends AbstractExpressionTests {
// list should be unmodifiable
evaluate
(
"{a:1, b:2, c:3, d:4, e:5}[a]=6"
,
"[a:1,b: 2,c: 3,d: 4,e: 5]"
,
unmodifiableClass
);
}
@Test
public
void
testMapKeysThatAreAlsoSpELKeywords
()
{
SpelExpressionParser
parser
=
new
SpelExpressionParser
();
...
...
@@ -166,7 +166,7 @@ public class MapTests extends AbstractExpressionTests {
expression
=
(
SpelExpression
)
parser
.
parseExpression
(
"foo['abc.def']"
);
o
=
expression
.
getValue
(
new
MapHolder
());
assertEquals
(
"value"
,
o
);
expression
=
(
SpelExpression
)
parser
.
parseExpression
(
"foo[foo[NEW]]"
);
o
=
expression
.
getValue
(
new
MapHolder
());
assertEquals
(
"37"
,
o
);
...
...
@@ -174,7 +174,7 @@ public class MapTests extends AbstractExpressionTests {
expression
=
(
SpelExpression
)
parser
.
parseExpression
(
"foo[foo[new]]"
);
o
=
expression
.
getValue
(
new
MapHolder
());
assertEquals
(
"38"
,
o
);
expression
=
(
SpelExpression
)
parser
.
parseExpression
(
"foo[foo[foo[T]]]"
);
o
=
expression
.
getValue
(
new
MapHolder
());
assertEquals
(
"value"
,
o
);
...
...
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
浏览文件 @
7a690df9
...
...
@@ -123,7 +123,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
assertEquals
(
String
.
class
,
expression
.
getValue
());
assertCanCompile
(
expression
);
assertEquals
(
String
.
class
,
expression
.
getValue
());
expression
=
parse
(
"T(java.io.IOException)"
);
assertEquals
(
IOException
.
class
,
expression
.
getValue
());
assertCanCompile
(
expression
);
...
...
@@ -2999,7 +2999,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
context
.
setVariable
(
"it"
,
person
);
expression
.
setEvaluationContext
(
context
);
assertTrue
(
expression
.
getValue
(
Boolean
.
class
));
assertTrue
(
expression
.
getValue
(
Boolean
.
class
));
assertTrue
(
expression
.
getValue
(
Boolean
.
class
));
assertCanCompile
(
expression
);
assertTrue
(
expression
.
getValue
(
Boolean
.
class
));
}
...
...
@@ -3108,7 +3108,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
assertTrue
((
Boolean
)
ex
.
getValue
(
context
));
assertTrue
((
Boolean
)
ex
.
getValue
(
context
));
}
public
class
Person
{
private
int
age
;
...
...
@@ -3127,7 +3127,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
public
class
Person3
{
private
int
age
;
public
Person3
(
String
name
,
int
age
)
{
...
...
@@ -3899,7 +3899,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
float
[]
fs
=
new
float
[]{
6.0f
,
7.0f
,
8.0f
};
byte
[]
bs
=
new
byte
[]{(
byte
)
2
,(
byte
)
3
,(
byte
)
4
};
char
[]
cs
=
new
char
[]{
'a'
,
'b'
,
'c'
};
// Access String (reference type) array
expression
=
parser
.
parseExpression
(
"[0]"
);
assertEquals
(
"a"
,
expression
.
getValue
(
sss
));
...
...
@@ -5022,7 +5022,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
for
(
String
[]
varg:
vargs
)
{
s
+=
"{"
;
for
(
String
v:
varg
)
{
s
+=
v
;
s
+=
v
;
}
s
+=
"}"
;
}
...
...
@@ -5038,7 +5038,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
for
(
int
[]
varg:
vargs
)
{
s
+=
"{"
;
for
(
int
v:
varg
)
{
s
+=
Integer
.
toString
(
v
);
s
+=
Integer
.
toString
(
v
);
}
s
+=
"}"
;
}
...
...
@@ -5104,7 +5104,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
public
TestClass8
()
{
}
public
TestClass8
(
Integer
i
)
{
...
...
@@ -5150,7 +5150,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
output
=
b
.
toString
();
}
public
Obj3
(
String
s
,
Float
f
,
int
...
ints
)
{
StringBuilder
b
=
new
StringBuilder
();
b
.
append
(
s
);
...
...
@@ -5163,9 +5163,9 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
output
=
b
.
toString
();
}
}
public
static
class
Obj4
{
public
final
String
output
;
public
Obj4
(
int
[]
params
)
{
...
...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
浏览文件 @
7a690df9
...
...
@@ -104,9 +104,9 @@ public class StompHeaders implements MultiValueMap<String, String>, Serializable
* Create a new instance to be populated with new header values.
*/
public
StompHeaders
()
{
this
(
new
LinkedMultiValueMap
<
String
,
String
>(
4
),
false
);
this
(
new
LinkedMultiValueMap
<
String
,
String
>(
4
),
false
);
}
private
StompHeaders
(
Map
<
String
,
List
<
String
>>
headers
,
boolean
readOnly
)
{
Assert
.
notNull
(
headers
,
"'headers' must not be null"
);
if
(
readOnly
)
{
...
...
spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
浏览文件 @
7a690df9
...
...
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
*
* <p>{@code @DirtiesContext} may be used as a class-level and method-level
* annotation within the same class or class hierarchy. In such scenarios, the
* {@code ApplicationContext} will be marked as <em>dirty</em> before or
* {@code ApplicationContext} will be marked as <em>dirty</em> before or
* after any such annotated method as well as before or after the current test
* class, depending on the configured {@link #methodMode} and {@link #classMode}.
*
...
...
spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java
浏览文件 @
7a690df9
...
...
@@ -45,7 +45,7 @@ import static org.springframework.test.context.cache.ContextCacheTestUtils.*;
* JUnit 4 based integration test which verifies correct {@linkplain ContextCache
* application context caching} in conjunction with Spring's TestNG support
* and {@link DirtiesContext @DirtiesContext} at the class level.
*
*
* <p>This class is a direct copy of {@link ClassLevelDirtiesContextTests},
* modified to verify behavior in conjunction with TestNG.
*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录