Commit 15fbb8dd authored by Phillip Webb's avatar Phillip Webb

Polish

parent c2a46b8e
...@@ -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));
} }
} }
......
...@@ -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;
......
...@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment