Polishing

jhoeller · jhoeller · commit 62fd09dfa55f · 2026-01-14T22:05:06.000+01:00
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
@@ -192,9 +192,7 @@ public void destroy() {
 
 	/**
 	 * Initialize this container.
-	 * <p>Creates a JMS Connection, starts the {@link jakarta.jms.Connection}
-	 * (if {@link #setAutoStartup(boolean) "autoStartup"} hasn't been turned off),
-	 * and calls {@link #doInitialize()}.
+	 * <p>Marks the container as active and calls {@link #doInitialize()}.
 	 * @throws org.springframework.jms.JmsException if startup failed
 	 */
 	public void initialize() throws JmsException {
@@ -484,7 +482,7 @@ protected void startSharedConnection() throws JMSException {
 	/**
 	 * Stop the shared Connection.
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see jakarta.jms.Connection#start()
+	 * @see jakarta.jms.Connection#stop()
 	 */
 	protected void stopSharedConnection() throws JMSException {
 		this.sharedConnectionLock.lock();
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
@@ -1005,14 +1005,15 @@ protected void invokeErrorHandler(Throwable ex) {
 	private static class MessageRejectedWhileStoppingException extends RuntimeException {
 	}
 
+
 	private abstract static class MicrometerInstrumentation {
 
 		static Session instrumentSession(Session session, ObservationRegistry registry) {
 			return JmsInstrumentation.instrumentSession(session, registry);
 		}
-
 	}
 
+
 	private abstract static class ObservationFactory {
 
 		private static final JmsProcessObservationConvention DEFAULT_CONVENTION = new DefaultJmsProcessObservationConvention();
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -1085,7 +1085,7 @@ protected void handleListenerSetupFailure(Throwable ex, boolean alreadyRecovered
 			}
 		}
 		else {
-			// Recovery during active operation..
+			// Recovery during active operation...
 			if (alreadyRecovered) {
 				logger.debug("Setup of JMS message listener invoker failed - already recovered by other invoker", ex);
 			}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
@@ -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;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
@@ -64,8 +64,6 @@
 @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 void setPersistenceUnitName(@Nullable String persistenceUnitName) {
 	 */
 	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 void setDataSource(@Nullable DataSource dataSource) {
 	 */
 	@Override
 	public @Nullable DataSource getDataSource() {
-		return (DataSource) getJpaPropertyMap().get(DATASOURCE_PROPERTY);
+		return (DataSource) getJpaPropertyMap().get(PersistenceConfiguration.JDBC_DATASOURCE);
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -1005,14 +1005,15 @@ protected void invokeErrorHandler(Throwable ex) {`
`1005`	`1005`	`private static class MessageRejectedWhileStoppingException extends RuntimeException {`
`1006`	`1006`	`}`
`1007`	`1007`
	`1008`	`+`
`1008`	`1009`	`private abstract static class MicrometerInstrumentation {`
`1009`	`1010`
`1010`	`1011`	`static Session instrumentSession(Session session, ObservationRegistry registry) {`
`1011`	`1012`	`return JmsInstrumentation.instrumentSession(session, registry);`
`1012`	`1013`	`}`
`1013`		`-`
`1014`	`1014`	`}`
`1015`	`1015`
	`1016`	`+`
`1016`	`1017`	`private abstract static class ObservationFactory {`
`1017`	`1018`
`1018`	`1019`	`private static final JmsProcessObservationConvention DEFAULT_CONVENTION = new DefaultJmsProcessObservationConvention();`
Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,7 @@ protected void handleListenerSetupFailure(Throwable ex, boolean alreadyRecovered`
`1085`	`1085`	`}`
`1086`	`1086`	`}`
`1087`	`1087`	`else {`
`1088`		`- // Recovery during active operation..`
	`1088`	`+ // Recovery during active operation...`
`1089`	`1089`	`if (alreadyRecovered) {`
`1090`	`1090`	`logger.debug("Setup of JMS message listener invoker failed - already recovered by other invoker", ex);`
`1091`	`1091`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@`
`64`	`64`	`@SuppressWarnings("serial")`
`65`	`65`	`public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {`
`66`	`66`
`67`		`- private static final String DATASOURCE_PROPERTY = "jakarta.persistence.dataSource";`
`68`		`-`
`69`	`67`	`private @Nullable PersistenceConfiguration configuration;`
`70`	`68`
`71`	`69`
`@@ -154,10 +152,10 @@ public void setPersistenceUnitName(@Nullable String persistenceUnitName) {`
`154`	`152`	`*/`
`155`	`153`	`public void setDataSource(@Nullable DataSource dataSource) {`
`156`	`154`	`if (dataSource != null) {`
`157`		`- getJpaPropertyMap().put(DATASOURCE_PROPERTY, dataSource);`
	`155`	`+ getJpaPropertyMap().put(PersistenceConfiguration.JDBC_DATASOURCE, dataSource);`
`158`	`156`	`}`
`159`	`157`	`else {`
`160`		`- getJpaPropertyMap().remove(DATASOURCE_PROPERTY);`
	`158`	`+ getJpaPropertyMap().remove(PersistenceConfiguration.JDBC_DATASOURCE);`
`161`	`159`	`}`
`162`	`160`	`}`
`163`	`161`
`@@ -169,7 +167,7 @@ public void setDataSource(@Nullable DataSource dataSource) {`
`169`	`167`	`*/`
`170`	`168`	`@Override`
`171`	`169`	`public @Nullable DataSource getDataSource() {`
`172`		`- return (DataSource) getJpaPropertyMap().get(DATASOURCE_PROPERTY);`
	`170`	`+ return (DataSource) getJpaPropertyMap().get(PersistenceConfiguration.JDBC_DATASOURCE);`
`173`	`171`	`}`
`174`	`172`
`175`	`173`