root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2015-10-20 13:57:21 -07:00
parent c2a46b8e3b
commit 15fbb8ddf9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View File

@ -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));
} }
} }

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
View File

@ -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;

3
spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
View File

@ -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();