Browse Source

Polish

pull/4259/head
Phillip Webb 10 years ago
parent
commit
15fbb8ddf9
  1. 4
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
  2. 4
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
  3. 3
      spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java

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

@ -83,8 +83,8 @@ public class JerseyAutoConfiguration implements WebApplicationInitializer { @@ -83,8 +83,8 @@ public class JerseyAutoConfiguration implements WebApplicationInitializer {
this.path = parseApplicationPath(this.jersey.getApplicationPath());
}
else {
this.path = findApplicationPath(AnnotationUtils.findAnnotation(this.config.getClass(),
ApplicationPath.class));
this.path = findApplicationPath(AnnotationUtils
.findAnnotation(this.config.getClass(), ApplicationPath.class));
}
}

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

@ -44,8 +44,8 @@ public class JerseyProperties { @@ -44,8 +44,8 @@ public class JerseyProperties {
private Filter filter = new Filter();
/**
* Path that serves as the base URI for the application. Overrides
* the value of "@ApplicationPath" if specified.
* Path that serves as the base URI for the application. Overrides the value of
* "@ApplicationPath" if specified.
*/
private String applicationPath;

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

@ -313,7 +313,8 @@ public class RelaxedDataBinder extends DataBinder { @@ -313,7 +313,8 @@ public class RelaxedDataBinder extends DataBinder {
return false;
}
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;
}
Class<?> valueType = descriptor.getMapValueTypeDescriptor().getObjectType();

Loading…
Cancel
Save