Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
19ff7d84
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,发现更多精彩内容 >>
提交
19ff7d84
编写于
10月 30, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
19107649
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
14 addition
and
17 deletion
+14
-17
spring-context/src/main/java/org/springframework/context/annotation/DeferredImportSelector.java
...gframework/context/annotation/DeferredImportSelector.java
+7
-5
spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java
...springframework/core/annotation/RepeatableContainers.java
+1
-2
spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
...otation/SynthesizedMergedAnnotationInvocationHandler.java
+1
-2
spring-core/src/main/java/org/springframework/util/unit/DataUnit.java
...src/main/java/org/springframework/util/unit/DataUnit.java
+1
-3
spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
...ramework/messaging/simp/user/MultiServerUserRegistry.java
+0
-1
spring-web/src/main/java/org/springframework/http/MediaType.java
...web/src/main/java/org/springframework/http/MediaType.java
+4
-4
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/DeferredImportSelector.java
浏览文件 @
19ff7d84
...
...
@@ -16,8 +16,6 @@
package
org.springframework.context.annotation
;
import
java.util.Objects
;
import
org.springframework.core.type.AnnotationMetadata
;
import
org.springframework.lang.Nullable
;
...
...
@@ -108,13 +106,17 @@ public interface DeferredImportSelector extends ImportSelector {
return
false
;
}
Entry
entry
=
(
Entry
)
other
;
return
(
Objects
.
equals
(
this
.
metadata
,
entry
.
metadata
)
&&
Objects
.
equals
(
this
.
importClassName
,
entry
.
importClassName
));
return
(
this
.
metadata
.
equals
(
entry
.
metadata
)
&&
this
.
importClassName
.
equals
(
entry
.
importClassName
));
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
this
.
metadata
,
this
.
importClassName
);
return
(
this
.
metadata
.
hashCode
()
*
31
+
this
.
importClassName
.
hashCode
());
}
@Override
public
String
toString
()
{
return
this
.
importClassName
;
}
}
}
...
...
spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java
浏览文件 @
19ff7d84
...
...
@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
import
java.lang.annotation.Repeatable
;
import
java.lang.reflect.Method
;
import
java.util.Map
;
import
java.util.Objects
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.Assert
;
...
...
@@ -83,7 +82,7 @@ public abstract class RepeatableContainers {
if
(
other
==
null
||
getClass
()
!=
other
.
getClass
())
{
return
false
;
}
return
Object
s
.
e
quals
(
this
.
parent
,
((
RepeatableContainers
)
other
).
parent
);
return
Object
Utils
.
nullSafeE
quals
(
this
.
parent
,
((
RepeatableContainers
)
other
).
parent
);
}
@Override
...
...
spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
浏览文件 @
19ff7d84
...
...
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import
java.lang.reflect.Proxy
;
import
java.util.Arrays
;
import
java.util.NoSuchElementException
;
import
java.util.Objects
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.Assert
;
...
...
@@ -90,7 +89,7 @@ final class SynthesizedMergedAnnotationInvocationHandler<A extends Annotation> i
}
private
boolean
isAnnotationTypeMethod
(
Method
method
)
{
return
(
Objects
.
equals
(
method
.
getName
(),
"annotationType"
)
&&
method
.
getParameterCount
()
==
0
);
return
(
method
.
getName
().
equals
(
"annotationType"
)
&&
method
.
getParameterCount
()
==
0
);
}
/**
...
...
spring-core/src/main/java/org/springframework/util/unit/DataUnit.java
浏览文件 @
19ff7d84
...
...
@@ -16,8 +16,6 @@
package
org.springframework.util.unit
;
import
java.util.Objects
;
/**
* A standard set of {@link DataSize} units.
*
...
...
@@ -92,7 +90,7 @@ public enum DataUnit {
*/
public
static
DataUnit
fromSuffix
(
String
suffix
)
{
for
(
DataUnit
candidate
:
values
())
{
if
(
Objects
.
equals
(
candidate
.
suffix
,
suffix
))
{
if
(
candidate
.
suffix
.
equals
(
suffix
))
{
return
candidate
;
}
}
...
...
spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
浏览文件 @
19ff7d84
...
...
@@ -560,7 +560,6 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
}
return
map
;
}
}
}
spring-web/src/main/java/org/springframework/http/MediaType.java
浏览文件 @
19ff7d84
...
...
@@ -109,7 +109,7 @@ public class MediaType extends MimeType implements Serializable {
/**
* Public constant media type for {@code application/json;charset=UTF-8}.
* @deprecated
Deprecated as of Spring Framework
5.2 in favor of {@link #APPLICATION_JSON}
* @deprecated
as of
5.2 in favor of {@link #APPLICATION_JSON}
* since major browsers like Chrome
* <a href="https://bugs.chromium.org/p/chromium/issues/detail?id=438464">
* now comply with the specification</a> and interpret correctly UTF-8 special
...
...
@@ -120,7 +120,7 @@ public class MediaType extends MimeType implements Serializable {
/**
* A String equivalent of {@link MediaType#APPLICATION_JSON_UTF8}.
* @deprecated
Deprecated as of Spring Framework
5.2 in favor of {@link #APPLICATION_JSON_VALUE}
* @deprecated
as of
5.2 in favor of {@link #APPLICATION_JSON_VALUE}
* since major browsers like Chrome
* <a href="https://bugs.chromium.org/p/chromium/issues/detail?id=438464">
* now comply with the specification</a> and interpret correctly UTF-8 special
...
...
@@ -170,7 +170,7 @@ public class MediaType extends MimeType implements Serializable {
* @since 5.0
* @see <a href="https://tools.ietf.org/html/rfc7807#section-6.1">
* Problem Details for HTTP APIs, 6.1. application/problem+json</a>
* @deprecated
Deprecated as of Spring Framework
5.2 in favor of {@link #APPLICATION_PROBLEM_JSON}
* @deprecated
as of
5.2 in favor of {@link #APPLICATION_PROBLEM_JSON}
* since major browsers like Chrome
* <a href="https://bugs.chromium.org/p/chromium/issues/detail?id=438464">
* now comply with the specification</a> and interpret correctly UTF-8 special
...
...
@@ -182,7 +182,7 @@ public class MediaType extends MimeType implements Serializable {
/**
* A String equivalent of {@link MediaType#APPLICATION_PROBLEM_JSON_UTF8}.
* @since 5.0
* @deprecated
Deprecated as of Spring Framework
5.2 in favor of {@link #APPLICATION_PROBLEM_JSON_VALUE}
* @deprecated
as of
5.2 in favor of {@link #APPLICATION_PROBLEM_JSON_VALUE}
* since major browsers like Chrome
* <a href="https://bugs.chromium.org/p/chromium/issues/detail?id=438464">
* now comply with the specification</a> and interpret correctly UTF-8 special
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录