Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,943 Commits 18 Branches 0 Tags
6ca01e15cf9bbbb059c585b60f36c193551255bd
Commit Graph

503 Commits

Author SHA1 Message Date
Sam Brannen
0a7166234d Polishing 2023-09-06 11:37:50 +02:00
Johnny Lim
884975e094 Polish JMS observation instrumentation 
See gh-30335
Closes gh-31172
 2023-09-05 17:18:02 +02:00
Juergen Hoeller
9b50e7ded6 Merge branch '6.0.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2023-09-03 01:27:18 +02:00
Juergen Hoeller
61f89a1f04 Refine note on listener container setup with CachingConnectionFactory 
Closes gh-25503
 2023-09-03 01:13:51 +02:00
Sébastien Deleuze
81607238ce Use consistently @since 6.1 2023-09-01 12:33:21 +02:00
Sam Brannen
3dcac0cf80 Clean up / Suppress warnings 2023-08-18 12:46:17 +02:00
Sam Brannen
3228502108 Polish MessageListenerContainerObservationTests 2023-08-14 17:08:56 +02:00
Brian Clozel
94fe1f4c63 Guard for Micrometer Core usage in JMS instrumentation 
This commit ensures that the Observability instrumentation for
`@JmsListener` does not assume that micrometer-core is on the classpath
and guards against direct usage.

Closes gh-30335
 2023-08-14 16:27:45 +02:00
Brian Clozel
2c895974b2 Add observability support for JMS 
This commit adds observability support for Jakarta JMS support in
spring-jms support. This feature leverages the `JmsInstrumentation`
infrastructure in `io.micrometer:micrometer-core` library.

This instruments the `JmsTemplate` and the `@JmsListener` support to
record observations:

* "jms.message.publish" when the `JmsTemplate` sends a message
* "jms.message.process" when a message is processed by a `@JmsListener`
  annotated method

The observation `Convention` and `Context` implementations are shipped
with "micrometer-core".

Closes gh-30335
 2023-08-13 18:24:51 +02:00
Juergen Hoeller
3253d2de89 Introduce TransactionExecutionListener with begin/commit/rollback notifications 
Includes ConfigurableTransactionManager interface for listener registration.
Includes additional introspection methods on TransactionExecution interface.
Includes default method declarations on TransactionStatus/SmartTransactionObject.

Closes gh-27479
 2023-08-06 14:03:44 +02:00
Juergen Hoeller
d250a5155a Consistent dependency declarations 2023-08-02 00:56:50 +02:00
Juergen Hoeller
3b1af692cc Merge branch '6.0.x' 
# Conflicts:
#	spring-beans/spring-beans.gradle
#	spring-context/spring-context.gradle
#	spring-orm/spring-orm.gradle
#	spring-test/spring-test.gradle
#	spring-web/spring-web.gradle
#	spring-webflux/spring-webflux.gradle
 2023-08-02 01:04:31 +02:00
Sam Brannen
3b8dd0a5ac Assert JmsAccessor.setSessionAcknowledgeMode() values 
See gh-30851
 2023-07-31 16:08:47 +03:00
Sam Brannen
9da318af96 Assert JmsActivationSpecConfig.setAcknowledgeMode() values 
See gh-30851
 2023-07-31 16:08:47 +03:00
Sam Brannen
b45bfcafc2 Assert DefaultMessageListenerContainer.setCacheLevel() values 
See gh-30851
 2023-07-31 16:08:47 +03:00
Sam Brannen
0eda44186a Polish tests for configuration constants 
See gh-30851
 2023-07-31 16:08:47 +03:00
Juergen Hoeller
bbde68c49e Polishing 2023-07-25 19:12:07 +02:00
Juergen Hoeller
5ebbb3ff3e Merge branch '6.0.x' 
# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
 2023-07-25 19:13:33 +02:00
Sam Brannen
b2ca36f098 Stop using Constants utility in JmsAccessor 
See gh-30851
 2023-07-19 12:16:26 +03:00
Sam Brannen
15253f3448 Polish JmsAccessor[Tests] 2023-07-19 12:16:14 +03:00
Sam Brannen
4e00c988c1 Stop using Constants utility in JmsActivationSpecConfig 
See gh-30851
 2023-07-19 11:48:28 +03:00
Juergen Hoeller
2ac55659c8 Merge branch '6.0.x' 2023-07-19 01:26:05 +02:00
Juergen Hoeller
c64a322e19 Polishing 2023-07-19 01:25:20 +02:00
Juergen Hoeller
25ea1f4c0f Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
 2023-07-19 00:37:06 +02:00
Juergen Hoeller
2f33e77ab4 Consistent equals/hashCode style (and related polishing) 2023-07-19 00:35:19 +02:00
Sam Brannen
a34f9fa66c Update copyright headers 2023-07-15 13:10:46 +02:00
Sam Brannen
3a8b5111d9 Stop using Constants utility in DefaultMessageListenerContainer 
See gh-30851
 2023-07-16 19:14:09 +02:00
Sam Brannen
b375a061df Polish DefaultMessageListenerContainer[Tests] 2023-07-16 19:13:27 +02:00
Sam Brannen
5ce8ffd197 Merge branch '6.0.x' 2023-07-15 13:11:03 +02:00
Juergen Hoeller
6957ac5324 Trigger late commit in JmsResourceSynchronization.afterCompletion if necessary 
Closes gh-20817
 2023-07-14 11:50:31 +02:00
Sam Brannen
16b9640af2 Merge branch '6.0.x' 2023-07-12 11:50:11 +02:00
Sam Brannen
68f2b0ca59 Rely on auto-boxing in tests 2023-07-12 11:49:02 +02:00
Sam Brannen
75b540f25c Update copyright headers 2023-07-07 15:03:09 +02:00
Juergen Hoeller
8e8c3f5a7c Polishing 2023-07-07 13:14:40 +02:00
Sam Brannen
39bc7566df Stop printing to System.out in tests 2023-06-24 14:10:12 +02:00
Juergen Hoeller
ddc3cf301a Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
 2023-07-07 13:51:08 +02:00
Sam Brannen
3bf78d6f8c Fix AbstractMessageListenerContainer Javadoc regarding error log level 
This commit updates AbstractMessageListenerContainer's Javadoc
regarding the log level used in invokeErrorHandler() so that the
documentation aligns with the implementation, namely that errors will
logged at WARN level if no ErrorHandler has been registered.

Closes gh-30730
 2023-06-23 12:45:52 +02:00
Sam Brannen
563b2a8505 Polish AbstractMessageListenerContainer Javadoc 2023-06-23 12:44:57 +02:00
Sam Brannen
19686adc01 Merge branch '6.0.x' 2023-06-24 14:15:05 +02:00
Sam Brannen
da00bbebbf Merge branch '6.0.x' 2023-06-23 12:46:30 +02:00
Sam Brannen
b8a713fde3 Merge branch '6.0.x' 2023-06-22 15:12:25 +02:00
Johnny Lim
271f2dc665 Polish 
This commit polishes a bit.

Closes gh-30691
 2023-06-22 15:06:05 +02:00
Juergen Hoeller
155a37d3a6 Merge branch '6.0.x' 2023-06-12 10:50:40 +02:00
Vedran Pavic
3d61d9e0d8 Handle custom JMS acknowledgment modes as client acknowledge (#30619) 
This commit updates JmsAccessor to handle custom JMS acknowledgment
modes as client acknowledge, which is useful when working with JMS
providers that provide non-standard variations of CLIENT_ACKNOWLEDGE,
such as AWS SQS and its UNORDERED_ACKNOWLEDGE mode.
 2023-06-12 10:46:22 +02:00
Sébastien Deleuze
01414d0b3d Merge branch '6.0.x' 2023-06-08 17:33:50 +02:00
Vedran Pavic
2317bef021 Add missing @Nullable in DefaultJmsListenerContainerFactory 
Closes gh-30620
 2023-06-08 17:32:59 +02:00
Juergen Hoeller
759ab23c45 Release shared JMS Connection on Single/CachingConnectionFactory.stop() 
See gh-30612
 2023-06-07 18:40:56 +02:00
Juergen Hoeller
1b62b6dd89 Merge branch '6.0.x' 2023-06-07 17:23:09 +02:00
Juergen Hoeller
bd63c35b0b DefaultMessageListenerContainer tests for stop-and-restart 
See gh-30612
 2023-06-07 17:21:53 +02:00
Juergen Hoeller
06bb6dbcff Release shared JMS Connection before stop completion callback 
Closes gh-30612
 2023-06-07 17:11:35 +02:00