From 2d5496df2b94ac7fec603e0252b1a573c5b78c66 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 29 Jun 2016 15:53:46 +0200 Subject: [PATCH] Polishing --- .../orm/hibernate5/HibernateTransactionManager.java | 4 ++-- .../web/servlet/AsyncHandlerInterceptor.java | 7 ++----- .../annotation/ExceptionHandlerExceptionResolver.java | 8 ++++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java index 7fdf0e2352..cafee10465 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java @@ -69,9 +69,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * and services which use plain JDBC (without being aware of Hibernate)! * Application code needs to stick to the same simple Connection lookup pattern as * with {@link org.springframework.jdbc.datasource.DataSourceTransactionManager} - * (i.e. {@link DataSourceUtils#getConnection} + * (i.e. {@link org.springframework.jdbc.datasource.DataSourceUtils#getConnection} * or going through a - * {@link TransactionAwareDataSourceProxy}). + * {@link org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy}). * *

Note: To be able to register a DataSource's Connection for plain JDBC code, * this instance needs to be aware of the DataSource ({@link #setDataSource}). diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java index 5284a2d172..22abd51f96 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -53,7 +53,6 @@ import org.springframework.web.method.HandlerMethod; * * @author Rossen Stoyanchev * @since 3.2 - * * @see org.springframework.web.context.request.async.WebAsyncManager * @see org.springframework.web.context.request.async.CallableProcessingInterceptor * @see org.springframework.web.context.request.async.DeferredResultProcessingInterceptor @@ -67,15 +66,13 @@ public interface AsyncHandlerInterceptor extends HandlerInterceptor { * avoid modifying them in ways that would conflict with the concurrent * execution of the handler. A typical use of this method would be to * clean up thread-local variables. - * * @param request the current request * @param response the current response * @param handler the handler (or {@link HandlerMethod}) that started async * execution, for type and/or instance examination * @throws Exception in case of errors */ - void afterConcurrentHandlingStarted( - HttpServletRequest request, HttpServletResponse response, Object handler) + void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java index 84c851af13..8e5547730d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java @@ -265,11 +265,15 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(adviceBean.getBeanType()); if (resolver.hasExceptionMappings()) { this.exceptionHandlerAdviceCache.put(adviceBean, resolver); - logger.info("Detected @ExceptionHandler methods in " + adviceBean); + if (logger.isInfoEnabled()) { + logger.info("Detected @ExceptionHandler methods in " + adviceBean); + } } if (ResponseBodyAdvice.class.isAssignableFrom(adviceBean.getBeanType())) { this.responseBodyAdvice.add(adviceBean); - logger.info("Detected ResponseBodyAdvice implementation in " + adviceBean); + if (logger.isInfoEnabled()) { + logger.info("Detected ResponseBodyAdvice implementation in " + adviceBean); + } } } }