Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
67ea4b3a
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,发现更多精彩内容 >>
提交
67ea4b3a
编写于
4月 06, 2017
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
package-info for repackaged libraries (and other polishing)
上级
75dd8d9c
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
45 addition
and
40 deletion
+45
-40
spring-aop/src/main/java/org/aopalliance/aop/package-info.java
...g-aop/src/main/java/org/aopalliance/aop/package-info.java
+4
-0
spring-aop/src/main/java/org/aopalliance/intercept/package-info.java
...src/main/java/org/aopalliance/intercept/package-info.java
+4
-0
spring-aop/src/main/java/org/aopalliance/package-info.java
spring-aop/src/main/java/org/aopalliance/package-info.java
+4
-0
spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
...g/springframework/cache/config/CacheNamespaceHandler.java
+7
-4
spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
...org/springframework/context/annotation/Configuration.java
+1
-1
spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
.../validation/beanvalidation/LocalValidatorFactoryBean.java
+1
-0
spring-core/src/main/java/org/springframework/asm/package-info.java
...e/src/main/java/org/springframework/asm/package-info.java
+2
-4
spring-core/src/main/java/org/springframework/cglib/package-info.java
...src/main/java/org/springframework/cglib/package-info.java
+2
-4
spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
.../test/java/org/springframework/util/ObjectUtilsTests.java
+6
-1
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java
...org/springframework/jdbc/datasource/init/ScriptUtils.java
+7
-8
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
...ingframework/http/converter/FormHttpMessageConverter.java
+3
-8
spring-web/src/main/java/org/springframework/http/converter/json/GsonBuilderUtils.java
...springframework/http/converter/json/GsonBuilderUtils.java
+1
-4
spring-web/src/main/java/org/springframework/http/converter/json/GsonFactoryBean.java
.../springframework/http/converter/json/GsonFactoryBean.java
+1
-5
spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
...tp/converter/xml/Jaxb2CollectionHttpMessageConverter.java
+2
-1
未找到文件。
spring-aop/src/main/java/org/aopalliance/aop/package-info.java
0 → 100644
浏览文件 @
67ea4b3a
/**
* The core AOP Alliance advice marker.
*/
package
org.aopalliance.aop
;
spring-aop/src/main/java/org/aopalliance/intercept/package-info.java
0 → 100644
浏览文件 @
67ea4b3a
/**
* The AOP Alliance reflective interception abstraction.
*/
package
org.aopalliance.intercept
;
spring-aop/src/main/java/org/aopalliance/package-info.java
0 → 100644
浏览文件 @
67ea4b3a
/**
* Spring's variant of the AOP Alliance interfaces.
*/
package
org.aopalliance
;
spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
浏览文件 @
67ea4b3a
/*
* Copyright 2002-201
2
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.
...
...
@@ -39,10 +39,11 @@ public class CacheNamespaceHandler extends NamespaceHandlerSupport {
static
final
String
DEFAULT_CACHE_MANAGER_BEAN_NAME
=
"cacheManager"
;
static
String
extractCacheManager
(
Element
element
)
{
return
(
element
.
hasAttribute
(
CacheNamespaceHandler
.
CACHE_MANAGER_ATTRIBUTE
)
?
element
.
getAttribute
(
CacheNamespaceHandler
.
CACHE_MANAGER_ATTRIBUTE
)
:
CacheNamespaceHandler
.
DEFAULT_CACHE_MANAGER_BEAN_NAME
);
return
(
element
.
hasAttribute
(
CacheNamespaceHandler
.
CACHE_MANAGER_ATTRIBUTE
)
?
element
.
getAttribute
(
CacheNamespaceHandler
.
CACHE_MANAGER_ATTRIBUTE
)
:
CacheNamespaceHandler
.
DEFAULT_CACHE_MANAGER_BEAN_NAME
);
}
static
BeanDefinition
parseKeyGenerator
(
Element
element
,
BeanDefinition
def
)
{
...
...
@@ -53,9 +54,11 @@ public class CacheNamespaceHandler extends NamespaceHandlerSupport {
return
def
;
}
@Override
public
void
init
()
{
registerBeanDefinitionParser
(
"annotation-driven"
,
new
AnnotationDrivenCacheBeanDefinitionParser
());
registerBeanDefinitionParser
(
"advice"
,
new
CacheAdviceParser
());
}
}
spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
浏览文件 @
67ea4b3a
...
...
@@ -390,7 +390,7 @@ public @interface Configuration {
/**
* Explicitly specify the name of the Spring bean definition associated
* with this Configuration class.
If left unspecified (the common case),
* with this Configuration class. If left unspecified (the common case),
* a bean name will be automatically generated.
* <p>The custom name applies only if the Configuration class is picked up via
* component scanning or supplied directly to a {@link AnnotationConfigApplicationContext}.
...
...
spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
浏览文件 @
67ea4b3a
...
...
@@ -355,6 +355,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
@Override
public
ParameterNameProvider
getParameterNameProvider
()
{
Assert
.
notNull
(
this
.
validatorFactory
,
"No target ValidatorFactory set"
);
return
this
.
validatorFactory
.
getParameterNameProvider
();
}
...
...
spring-core/src/main/java/org/springframework/asm/package-info.java
浏览文件 @
67ea4b3a
/**
* Spring's repackaging of
* <a href="http://asm.ow2.org">
org.objectweb.asm 5.0
</a>
* <a href="http://asm.ow2.org">
ASM
</a>
* (for internal use only).
*
* <p>This repackaging technique avoids any potential conflicts with
...
...
@@ -8,8 +8,6 @@
* libraries and frameworks.
*
* <p>As this repackaging happens at the class file level, sources
* and javadocs are not available here. See the original ObjectWeb
* <a href="http://asm.ow2.org/asm50/javadoc/user">ASM 5.0 javadocs</a>
* for details when working with these classes.
* and javadocs are not available here.
*/
package
org.springframework.asm
;
spring-core/src/main/java/org/springframework/cglib/package-info.java
浏览文件 @
67ea4b3a
/**
* Spring's repackaging of
* <a href="http://cglib.sourceforge.net">
net.sf.cglib 3.2
</a>
* <a href="http://cglib.sourceforge.net">
CGLIB
</a>
* (for internal use only).
*
* <p>This repackaging technique avoids any potential conflicts with
...
...
@@ -8,8 +8,6 @@
* libraries and frameworks.
*
* <p>As this repackaging happens at the class file level, sources
* and javadocs are not available here. See the original
* <a href="http://cglib.sourceforge.net/apidocs">CGLIB 3.2 javadocs</a>
* for details when working with these classes.
* and javadocs are not available here.
*/
package
org.springframework.cglib
;
spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
浏览文件 @
67ea4b3a
/*
* 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.
...
...
@@ -239,18 +239,21 @@ public class ObjectUtilsTests {
}
@Test
@Deprecated
public
void
hashCodeWithBooleanFalse
()
{
int
expected
=
Boolean
.
FALSE
.
hashCode
();
assertEquals
(
expected
,
ObjectUtils
.
hashCode
(
false
));
}
@Test
@Deprecated
public
void
hashCodeWithBooleanTrue
()
{
int
expected
=
Boolean
.
TRUE
.
hashCode
();
assertEquals
(
expected
,
ObjectUtils
.
hashCode
(
true
));
}
@Test
@Deprecated
public
void
hashCodeWithDouble
()
{
double
dbl
=
9830.43
;
int
expected
=
(
new
Double
(
dbl
)).
hashCode
();
...
...
@@ -258,6 +261,7 @@ public class ObjectUtilsTests {
}
@Test
@Deprecated
public
void
hashCodeWithFloat
()
{
float
flt
=
34.8f
;
int
expected
=
(
new
Float
(
flt
)).
hashCode
();
...
...
@@ -265,6 +269,7 @@ public class ObjectUtilsTests {
}
@Test
@Deprecated
public
void
hashCodeWithLong
()
{
long
lng
=
883
l
;
int
expected
=
(
new
Long
(
lng
)).
hashCode
();
...
...
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java
浏览文件 @
67ea4b3a
...
...
@@ -199,7 +199,7 @@ public abstract class ScriptUtils {
}
if
(!
inSingleQuote
&&
!
inDoubleQuote
)
{
if
(
script
.
startsWith
(
separator
,
i
))
{
//
w
e've reached the end of the current statement
//
W
e've reached the end of the current statement
if
(
sb
.
length
()
>
0
)
{
statements
.
add
(
sb
.
toString
());
sb
=
new
StringBuilder
();
...
...
@@ -208,32 +208,31 @@ public abstract class ScriptUtils {
continue
;
}
else
if
(
script
.
startsWith
(
commentPrefix
,
i
))
{
//
s
kip over any content from the start of the comment to the EOL
//
S
kip over any content from the start of the comment to the EOL
int
indexOfNextNewline
=
script
.
indexOf
(
"\n"
,
i
);
if
(
indexOfNextNewline
>
i
)
{
i
=
indexOfNextNewline
;
continue
;
}
else
{
// if there's no EOL, we must be at the end
// of the script, so stop here.
// If there's no EOL, we must be at the end of the script, so stop here.
break
;
}
}
else
if
(
script
.
startsWith
(
blockCommentStartDelimiter
,
i
))
{
//
s
kip over any block comments
//
S
kip over any block comments
int
indexOfCommentEnd
=
script
.
indexOf
(
blockCommentEndDelimiter
,
i
);
if
(
indexOfCommentEnd
>
i
)
{
i
=
indexOfCommentEnd
+
blockCommentEndDelimiter
.
length
()
-
1
;
continue
;
}
else
{
throw
new
ScriptParseException
(
String
.
format
(
"Missing block comment end delimiter [%s]."
,
blockCommentEndDelimiter
)
,
resource
);
throw
new
ScriptParseException
(
"Missing block comment end delimiter: "
+
blockCommentEndDelimiter
,
resource
);
}
}
else
if
(
c
==
' '
||
c
==
'\n'
||
c
==
'\t'
)
{
//
a
void multiple adjacent whitespace characters
//
A
void multiple adjacent whitespace characters
if
(
sb
.
length
()
>
0
&&
sb
.
charAt
(
sb
.
length
()
-
1
)
!=
' '
)
{
c
=
' '
;
}
...
...
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
浏览文件 @
67ea4b3a
/*
* 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.
...
...
@@ -396,12 +396,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
* or a newly built {@link HttpEntity} wrapper for that part
*/
protected
HttpEntity
<?>
getHttpEntity
(
Object
part
)
{
if
(
part
instanceof
HttpEntity
)
{
return
(
HttpEntity
<?>)
part
;
}
else
{
return
new
HttpEntity
<>(
part
);
}
return
(
part
instanceof
HttpEntity
?
(
HttpEntity
<?>)
part
:
new
HttpEntity
<>(
part
));
}
/**
...
...
@@ -416,7 +411,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
if
(
part
instanceof
Resource
)
{
Resource
resource
=
(
Resource
)
part
;
String
filename
=
resource
.
getFilename
();
if
(
this
.
multipartCharset
!=
null
)
{
if
(
filename
!=
null
&&
this
.
multipartCharset
!=
null
)
{
filename
=
MimeDelegate
.
encode
(
filename
,
this
.
multipartCharset
.
name
());
}
return
filename
;
...
...
spring-web/src/main/java/org/springframework/http/converter/json/GsonBuilderUtils.java
浏览文件 @
67ea4b3a
/*
* 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.
...
...
@@ -47,9 +47,6 @@ public abstract class GsonBuilderUtils {
* {@link GsonBuilder#registerTypeHierarchyAdapter(Class, Object)} which
* serializes a {@code byte[]} property to and from a Base64-encoded String
* instead of a JSON array.
* <p><strong>NOTE:</strong> Use of this option requires the presence of the
* Apache Commons Codec library on the classpath when running on Java 6 or 7.
* On Java 8, the standard {@link java.util.Base64} facility is used instead.
*/
public
static
GsonBuilder
gsonBuilderWithBase64EncodedByteArrays
()
{
GsonBuilder
builder
=
new
GsonBuilder
();
...
...
spring-web/src/main/java/org/springframework/http/converter/json/GsonFactoryBean.java
浏览文件 @
67ea4b3a
/*
* Copyright 2002-201
4
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.
...
...
@@ -24,7 +24,6 @@ import com.google.gson.GsonBuilder;
import
org.springframework.beans.factory.FactoryBean
;
import
org.springframework.beans.factory.InitializingBean
;
/**
* A {@link FactoryBean} for creating a Google Gson 2.x {@link Gson} instance.
*
...
...
@@ -54,9 +53,6 @@ public class GsonFactoryBean implements FactoryBean<Gson>, InitializingBean {
* registered via {@link GsonBuilder#registerTypeHierarchyAdapter(Class, Object)}
* which serializes a {@code byte[]} property to and from a Base64-encoded String
* instead of a JSON array.
* <p><strong>NOTE:</strong> Use of this option requires the presence of the
* Apache Commons Codec library on the classpath when running on Java 6 or 7.
* On Java 8, the standard {@link java.util.Base64} facility is used instead.
* @see GsonBuilderUtils#gsonBuilderWithBase64EncodedByteArrays()
*/
public
void
setBase64EncodeByteArrays
(
boolean
base64EncodeByteArrays
)
{
...
...
spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
浏览文件 @
67ea4b3a
/*
* 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.
...
...
@@ -230,6 +230,7 @@ public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
@Override
public
void
write
(
T
t
,
Type
type
,
MediaType
contentType
,
HttpOutputMessage
outputMessage
)
throws
IOException
,
HttpMessageNotWritableException
{
throw
new
UnsupportedOperationException
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录