Polishing

This commit is contained in:
Juergen Hoeller
2026-01-14 22:05:06 +01:00
parent 9df19dedaf
commit 62fd09dfa5
5 changed files with 10 additions and 12 deletions
@@ -16,6 +16,7 @@
package org.springframework.orm.jpa;
import java.sql.Connection;
import java.sql.SQLException;
import jakarta.persistence.EntityManager;
@@ -78,7 +79,7 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
* @throws org.springframework.transaction.TransactionException in case of invalid arguments
* @see #cleanupTransaction
* @see jakarta.persistence.EntityTransaction#begin
* @see org.springframework.jdbc.datasource.DataSourceUtils#prepareConnectionForTransaction
* @see org.springframework.jdbc.datasource.DataSourceUtils#prepareConnectionForTransaction(Connection, TransactionDefinition)
*/
@Nullable Object beginTransaction(EntityManager entityManager, TransactionDefinition definition)
throws PersistenceException, SQLException, TransactionException;
@@ -64,8 +64,6 @@ import org.springframework.util.Assert;
@SuppressWarnings("serial")
public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
private static final String DATASOURCE_PROPERTY = "jakarta.persistence.dataSource";
private @Nullable PersistenceConfiguration configuration;
@@ -154,10 +152,10 @@ public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryB
*/
public void setDataSource(@Nullable DataSource dataSource) {
if (dataSource != null) {
getJpaPropertyMap().put(DATASOURCE_PROPERTY, dataSource);
getJpaPropertyMap().put(PersistenceConfiguration.JDBC_DATASOURCE, dataSource);
}
else {
getJpaPropertyMap().remove(DATASOURCE_PROPERTY);
getJpaPropertyMap().remove(PersistenceConfiguration.JDBC_DATASOURCE);
}
}
@@ -169,7 +167,7 @@ public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryB
*/
@Override
public @Nullable DataSource getDataSource() {
return (DataSource) getJpaPropertyMap().get(DATASOURCE_PROPERTY);
return (DataSource) getJpaPropertyMap().get(PersistenceConfiguration.JDBC_DATASOURCE);
}