Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
15fbb8dd
Commit
15fbb8dd
authored
Oct 20, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
c2a46b8e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
JerseyAutoConfiguration.java
...rk/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+2
-2
JerseyProperties.java
...framework/boot/autoconfigure/jersey/JerseyProperties.java
+2
-2
RelaxedDataBinder.java
...java/org/springframework/boot/bind/RelaxedDataBinder.java
+2
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View file @
15fbb8dd
...
@@ -83,8 +83,8 @@ public class JerseyAutoConfiguration implements WebApplicationInitializer {
...
@@ -83,8 +83,8 @@ public class JerseyAutoConfiguration implements WebApplicationInitializer {
this
.
path
=
parseApplicationPath
(
this
.
jersey
.
getApplicationPath
());
this
.
path
=
parseApplicationPath
(
this
.
jersey
.
getApplicationPath
());
}
}
else
{
else
{
this
.
path
=
findApplicationPath
(
AnnotationUtils
.
findAnnotation
(
this
.
config
.
getClass
(),
this
.
path
=
findApplicationPath
(
AnnotationUtils
ApplicationPath
.
class
));
.
findAnnotation
(
this
.
config
.
getClass
(),
ApplicationPath
.
class
));
}
}
}
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
View file @
15fbb8dd
...
@@ -44,8 +44,8 @@ public class JerseyProperties {
...
@@ -44,8 +44,8 @@ public class JerseyProperties {
private
Filter
filter
=
new
Filter
();
private
Filter
filter
=
new
Filter
();
/**
/**
* Path that serves as the base URI for the application. Overrides
* Path that serves as the base URI for the application. Overrides
the value of
*
the value of
"@ApplicationPath" if specified.
* "@ApplicationPath" if specified.
*/
*/
private
String
applicationPath
;
private
String
applicationPath
;
...
...
spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
View file @
15fbb8dd
...
@@ -313,7 +313,8 @@ public class RelaxedDataBinder extends DataBinder {
...
@@ -313,7 +313,8 @@ public class RelaxedDataBinder extends DataBinder {
return
false
;
return
false
;
}
}
if
(
Properties
.
class
.
isAssignableFrom
(
descriptor
.
getObjectType
()))
{
if
(
Properties
.
class
.
isAssignableFrom
(
descriptor
.
getObjectType
()))
{
// Properties is declared as Map<Object,Object> but we know it's really Map<String,String>
// Properties is declared as Map<Object,Object> but we know it's really
// Map<String,String>
return
true
;
return
true
;
}
}
Class
<?>
valueType
=
descriptor
.
getMapValueTypeDescriptor
().
getObjectType
();
Class
<?>
valueType
=
descriptor
.
getMapValueTypeDescriptor
().
getObjectType
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment