Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
770f6786
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 搜索 >>
提交
770f6786
编写于
5月 07, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
e0e720cd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
9 deletion
+19
-9
spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
...main/java/org/springframework/util/PatternMatchUtils.java
+6
-3
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
...work/http/converter/json/Jackson2ObjectMapperBuilder.java
+13
-6
未找到文件。
spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
浏览文件 @
770f6786
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -37,20 +37,22 @@ public abstract class PatternMatchUtils {
if
(
pattern
==
null
||
str
==
null
)
{
return
false
;
}
int
firstIndex
=
pattern
.
indexOf
(
'*'
);
if
(
firstIndex
==
-
1
)
{
return
pattern
.
equals
(
str
);
}
if
(
firstIndex
==
0
)
{
if
(
pattern
.
length
()
==
1
)
{
return
true
;
}
int
nextIndex
=
pattern
.
indexOf
(
'*'
,
firstIndex
+
1
);
int
nextIndex
=
pattern
.
indexOf
(
'*'
,
1
);
if
(
nextIndex
==
-
1
)
{
return
str
.
endsWith
(
pattern
.
substring
(
1
));
}
String
part
=
pattern
.
substring
(
1
,
nextIndex
);
if
(
""
.
equals
(
part
))
{
if
(
part
.
isEmpty
(
))
{
return
simpleMatch
(
pattern
.
substring
(
nextIndex
),
str
);
}
int
partIndex
=
str
.
indexOf
(
part
);
...
...
@@ -62,6 +64,7 @@ public abstract class PatternMatchUtils {
}
return
false
;
}
return
(
str
.
length
()
>=
firstIndex
&&
pattern
.
substring
(
0
,
firstIndex
).
equals
(
str
.
substring
(
0
,
firstIndex
))
&&
simpleMatch
(
pattern
.
substring
(
firstIndex
),
str
.
substring
(
firstIndex
)));
...
...
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
浏览文件 @
770f6786
...
...
@@ -260,7 +260,7 @@ public class Jackson2ObjectMapperBuilder {
* @param mixinSource class (or interface) whose annotations are to be "added"
* to target's annotations as value
* @since 4.1.2
* @see com.fasterxml.jackson.databind.ObjectMapper#addMixIn
Annotations
(Class, Class)
* @see com.fasterxml.jackson.databind.ObjectMapper#addMixIn(Class, Class)
*/
public
Jackson2ObjectMapperBuilder
mixIn
(
Class
<?>
target
,
Class
<?>
mixinSource
)
{
if
(
mixinSource
!=
null
)
{
...
...
@@ -271,11 +271,11 @@ public class Jackson2ObjectMapperBuilder {
/**
* Add mix-in annotations to use for augmenting specified class or interface.
* @param mixIns Map of entries with target classes (or interface) whose annotations
* @param mixIns
a
Map of entries with target classes (or interface) whose annotations
* to effectively override as key and mix-in classes (or interface) whose
* annotations are to be "added" to target's annotations as value.
* @since 4.1.2
* @see com.fasterxml.jackson.databind.ObjectMapper#addMixIn
Annotations
(Class, Class)
* @see com.fasterxml.jackson.databind.ObjectMapper#addMixIn(Class, Class)
*/
public
Jackson2ObjectMapperBuilder
mixIns
(
Map
<
Class
<?>,
Class
<?>>
mixIns
)
{
if
(
mixIns
!=
null
)
{
...
...
@@ -304,8 +304,8 @@ public class Jackson2ObjectMapperBuilder {
/**
* Configure a custom serializer for the given type.
* @see #serializers(JsonSerializer...)
* @since 4.1.2
* @see #serializers(JsonSerializer...)
*/
public
Jackson2ObjectMapperBuilder
serializerByType
(
Class
<?>
type
,
JsonSerializer
<?>
serializer
)
{
if
(
serializer
!=
null
)
{
...
...
@@ -463,6 +463,8 @@ public class Jackson2ObjectMapperBuilder {
/**
* Specify one or more modules to be registered with the {@link ObjectMapper}.
* Multiple invocations are not additive, the last one defines the modules to
* register.
* <p>Note: If this is set, no finding of modules is going to happen - not by
* Jackson, and not by Spring either (see {@link #findModulesViaServiceLoader}).
* As a consequence, specifying an empty list here will suppress any kind of
...
...
@@ -478,6 +480,8 @@ public class Jackson2ObjectMapperBuilder {
/**
* Set a complete list of modules to be registered with the {@link ObjectMapper}.
* Multiple invocations are not additive, the last one defines the modules to
* register.
* <p>Note: If this is set, no finding of modules is going to happen - not by
* Jackson, and not by Spring either (see {@link #findModulesViaServiceLoader}).
* As a consequence, specifying an empty list here will suppress any kind of
...
...
@@ -495,6 +499,8 @@ public class Jackson2ObjectMapperBuilder {
/**
* Specify one or more modules to be registered with the {@link ObjectMapper}.
* Multiple invocations are not additive, the last one defines the modules
* to register.
* <p>Modules specified here will be registered after
* Spring's autodetection of JSR-310 and Joda-Time, or Jackson's
* finding of modules (see {@link #findModulesViaServiceLoader}),
...
...
@@ -511,7 +517,8 @@ public class Jackson2ObjectMapperBuilder {
/**
* Specify one or more modules by class to be registered with
* the {@link ObjectMapper}.
* the {@link ObjectMapper}. Multiple invocations are not additive,
* the last one defines the modules to register.
* <p>Modules specified here will be registered after
* Spring's autodetection of JSR-310 and Joda-Time, or Jackson's
* finding of modules (see {@link #findModulesViaServiceLoader}),
...
...
@@ -529,7 +536,7 @@ public class Jackson2ObjectMapperBuilder {
/**
* Set whether to let Jackson find available modules via the JDK ServiceLoader,
* based on META-INF metadata in the classpath.
Requires Jackson 2.2 or higher.
* based on META-INF metadata in the classpath.
* <p>If this mode is not set, Spring's Jackson2ObjectMapperBuilder itself
* will try to find the JSR-310 and Joda-Time support modules on the classpath -
* provided that Java 8 and Joda-Time themselves are available, respectively.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录