Creates a JMS Connection, starts the {@link jakarta.jms.Connection} - * (if {@link #setAutoStartup(boolean) "autoStartup"} hasn't been turned off), - * and calls {@link #doInitialize()}. + *
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 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess /** * 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 index 921cf12cc87..c2ad4cc8cc2 100644 --- 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 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen 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 index b83cc935a10..d61292428cf 100644 --- 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 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe } } 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 index 258905b1ded..038b93d7273 100644 --- 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 index 0eeb261730e..615e8a0cc82 100644 --- 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 @@ 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); }