From c685fd7c2341fde4fce5e4a43f2fa4d5ed6d59d2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 21 Aug 2015 17:03:53 +0200 Subject: [PATCH] Polishing --- .../org/springframework/validation/DataBinder.java | 12 +++++++----- .../web/bind/support/DefaultDataBinderFactory.java | 11 ++++++++--- .../web/servlet/view/AbstractView.java | 4 ++-- .../socket/sockjs/client/UndertowXhrTransport.java | 10 ++-------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java index 779f042cb4..abbbe02a29 100644 --- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java +++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java @@ -260,8 +260,9 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter { } /** - * Create the {@link AbstractPropertyBindingResult} instance using standard JavaBean - * property access. + * Create the {@link AbstractPropertyBindingResult} instance using standard + * JavaBean property access. + * @since 4.2.1 */ protected AbstractPropertyBindingResult createBeanPropertyBindingResult() { BeanPropertyBindingResult result = new BeanPropertyBindingResult(getTarget(), @@ -285,8 +286,9 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter { } /** - * Create the {@link AbstractPropertyBindingResult} instance using direct field - * access. + * Create the {@link AbstractPropertyBindingResult} instance using direct + * field access. + * @since 4.2.1 */ protected AbstractPropertyBindingResult createDirectFieldBindingResult() { DirectFieldBindingResult result = new DirectFieldBindingResult(getTarget(), @@ -299,7 +301,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter { /** * Return the internal BindingResult held by this DataBinder, - * as AbstractPropertyBindingResult. + * as an AbstractPropertyBindingResult. */ protected AbstractPropertyBindingResult getInternalBindingResult() { if (this.bindingResult == null) { diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java index d673f17b2c..de00470231 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2015 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. @@ -30,14 +30,17 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory { private final WebBindingInitializer initializer; + /** - * Create new instance. - * @param initializer for global data binder intialization, or {@code null} + * Create a new {@code DefaultDataBinderFactory} instance. + * @param initializer for global data binder initialization + * (or {@code null} if none) */ public DefaultDataBinderFactory(WebBindingInitializer initializer) { this.initializer = initializer; } + /** * Create a new {@link WebDataBinder} for the given target object and * initialize it through a {@link WebBindingInitializer}. @@ -46,6 +49,7 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory { @Override public final WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { + WebDataBinder dataBinder = createBinderInstance(target, objectName, webRequest); if (this.initializer != null) { this.initializer.initBinder(dataBinder, webRequest); @@ -64,6 +68,7 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory { */ protected WebDataBinder createBinderInstance(Object target, String objectName, NativeWebRequest webRequest) throws Exception { + return new WebRequestDataBinder(target, objectName); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java index 715a994965..83eb924123 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -338,7 +338,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement /** * Create a RequestContext to expose under the specified attribute name. - *

Default implementation creates a standard RequestContext instance for the + *

The default implementation creates a standard RequestContext instance for the * given request and model. Can be overridden in subclasses for custom instances. * @param request current HTTP request * @param model combined output Map (never {@code null}), diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java index 8f3757833c..885843f84c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java @@ -104,7 +104,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra } public UndertowXhrTransport(OptionMap optionMap) throws IOException { - Assert.notNull(optionMap, "'optionMap' is required"); + Assert.notNull(optionMap, "OptionMap is required"); this.httpClient = UndertowClient.getInstance(); this.optionMap = optionMap; this.worker = Xnio.getInstance().createWorker(optionMap); @@ -142,12 +142,11 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra final SettableListenableFuture connectFuture) { if (logger.isTraceEnabled()) { - logger.trace("Starting XHR receive request, url=" + url); + logger.trace("Starting XHR receive request for " + url); } this.httpClient.connect( new ClientCallback() { - @Override public void completed(ClientConnection connection) { ClientRequest request = new ClientRequest().setMethod(Methods.POST).setPath(url.getPath()); @@ -158,7 +157,6 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra connection.sendRequest(request, createReceiveCallback(transportRequest, url, httpHeaders, session, connectFuture)); } - @Override public void failed(IOException ex) { throw new SockJsTransportFailureException("Failed to execute request to " + url, ex); @@ -181,11 +179,9 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra final SettableListenableFuture connectFuture) { return new ClientCallback() { - @Override public void completed(final ClientExchange exchange) { exchange.setResponseListener(new ClientCallback() { - @Override public void completed(ClientExchange result) { ClientResponse response = result.getResponse(); @@ -216,7 +212,6 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra onFailure(exc); } } - @Override public void failed(IOException exc) { IoUtils.safeClose(exchange.getConnection()); @@ -307,7 +302,6 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra final List responses, final CountDownLatch latch) { return new ClientCallback() { - @Override public void completed(ClientExchange result) { result.setResponseListener(new ClientCallback() {