From 5dc8b5de6d6afaa26d6084ab0392778d1ef009be Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 4 Jul 2018 15:07:17 +0200 Subject: [PATCH] Polishing --- .../core/DefaultParameterNameDiscoverer.java | 3 ++- .../jdbc/datasource/ConnectionHolder.java | 4 ++-- .../jms/connection/JmsResourceHolder.java | 6 +++--- .../jms/listener/LocallyExposedJmsResourceHolder.java | 4 ++-- .../orm/hibernate5/HibernateTransactionManager.java | 2 +- .../orm/jpa/JpaTransactionManager.java | 2 +- .../jca/cci/connection/ConnectionHolder.java | 11 ++++++----- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/DefaultParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/DefaultParameterNameDiscoverer.java index 80f9dcfb2f..757c4c2859 100644 --- a/spring-core/src/main/java/org/springframework/core/DefaultParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/DefaultParameterNameDiscoverer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -41,6 +41,7 @@ public class DefaultParameterNameDiscoverer extends PrioritizedParameterNameDisc private static final boolean kotlinPresent = ClassUtils.isPresent("kotlin.Unit", DefaultParameterNameDiscoverer.class.getClassLoader()); + public DefaultParameterNameDiscoverer() { if (kotlinPresent) { addDiscoverer(new KotlinReflectionParameterNameDiscoverer()); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java index abe538f114..618f79b7e7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java @@ -25,9 +25,9 @@ import org.springframework.transaction.support.ResourceHolderSupport; import org.springframework.util.Assert; /** - * Connection holder, wrapping a JDBC Connection. + * Resource holder wrapping a JDBC {@link Connection}. * {@link DataSourceTransactionManager} binds instances of this class - * to the thread, for a specific DataSource. + * to the thread, for a specific {@link javax.sql.DataSource}. * *

Inherits rollback-only support for nested JDBC transactions * and reference count functionality from the base class. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java index 5a09a0db85..5388a6afa0 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java @@ -38,9 +38,9 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ReflectionUtils; /** - * JMS resource holder, wrapping a JMS Connection and a JMS Session. - * JmsTransactionManager binds instances of this class to the thread, - * for a given JMS ConnectionFactory. + * Resource holder wrapping a JMS {@link Connection} and a JMS {@link Session}. + * {@link JmsTransactionManager} binds instances of this class to the thread, + * for a given JMS {@link ConnectionFactory}. * *

Note: This is an SPI class, not intended to be used by applications. * diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java index 118f179a8e..18eb04cf7a 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2018 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. @@ -21,7 +21,7 @@ import javax.jms.Session; import org.springframework.jms.connection.JmsResourceHolder; /** - * JmsResourceHolder marker subclass that indicates local exposure, + * {@link JmsResourceHolder} marker subclass that indicates local exposure, * i.e. that does not indicate an externally managed transaction. * * @author Juergen Hoeller diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java index 1d0b8da8ab..171ba6be01 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java @@ -203,7 +203,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana * @see org.springframework.jdbc.core.JdbcTemplate */ public void setDataSource(@Nullable DataSource dataSource) { - if (dataSource != null && dataSource instanceof TransactionAwareDataSourceProxy) { + if (dataSource instanceof TransactionAwareDataSourceProxy) { // If we got a TransactionAwareDataSourceProxy, we need to perform transactions // for its underlying target DataSource, else data access code won't see // properly exposed transactions (i.e. transactions for the target DataSource). diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java index d4f9c158ec..59ff2462fd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java @@ -255,7 +255,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager * @see org.springframework.jdbc.core.JdbcTemplate */ public void setDataSource(@Nullable DataSource dataSource) { - if (dataSource != null && dataSource instanceof TransactionAwareDataSourceProxy) { + if (dataSource instanceof TransactionAwareDataSourceProxy) { // If we got a TransactionAwareDataSourceProxy, we need to perform transactions // for its underlying target DataSource, else data access code won't see // properly exposed transactions (i.e. transactions for the target DataSource). diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java index d6ad87f02b..8adb8f1cda 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -21,10 +21,9 @@ import javax.resource.cci.Connection; import org.springframework.transaction.support.ResourceHolderSupport; /** - * Connection holder, wrapping a CCI Connection. - * - *

CciLocalTransactionManager binds instances of this class - * to the thread, for a given ConnectionFactory. + * Resource holder wrapping a CCI {@link Connection}. + * {@link CciLocalTransactionManager} binds instances of this class to the thread, + * for a given {@link javax.resource.cci.ConnectionFactory}. * *

Note: This is an SPI class, not intended to be used by applications. * @@ -38,10 +37,12 @@ public class ConnectionHolder extends ResourceHolderSupport { private final Connection connection; + public ConnectionHolder(Connection connection) { this.connection = connection; } + public Connection getConnection() { return this.connection; }