-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
INT-3458: Compatibility with Spring Framework 4.1 #1187
Conversation
JIRA: https://jira.spring.io/browse/INT-3458 * Change Spring AMQP to `1.3.5.RELEASE` * `HttpRequestHandlingEndpointSupport`: remove `MappingJacksonHttpMessageConverter` registration * `IntegrationRequestMappingHandlerMapping`: add 'fake' `name()` attribute to the inline `RequestMapping` annotation * `StoredProcJmxManagedBeanTests`: remove `context.stop();` code, Since `MBeanExporter` deregister MBeans on `stop()` now * `StoredProcPollingChannelAdapterParserTests`: change deprecated `ParameterizedSingleColumnRowMapper` to the `SingleColumnRowMapper` * `Jms`: comment out the reflection code to check the value for the `recoveryInterval`, because it is removed already in favor of `backOff` * `NotificationListeningMessageProducer`: move the start-up listener registration to the `onApplicationEvent`, because `MBeanExporter` moved `registerBeans()` to the `start()` now. The same `phase` might cause the issue, that MBeans aren't registered yet for `NotificationListeningMessageProducer` * `JpaOutboundGatewayTests`: change `@TransactionConfiguration` to the `@Transactional`. Don't know why the first doesn't work now. **Cherry-pick to 4.0.x**
* @since 3.0 | ||
* @see RequestMappingHandlerMapping |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Presumably you moved this for https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style - why not RequestMapping
too? (Although there's no indication of tag order for method level javadoc 😄 )
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doh. Yes, RequestMapping
should be moved, too.
I think it might look better to have a convention flow for those tags
Pushed |
@@ -144,6 +165,7 @@ protected void doStart() { | |||
} | |||
for (ObjectName objectName : objectNames) { | |||
this.server.addNotificationListener(objectName, this, this.filter, this.handback); | |||
this.listenerRegistered = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand how it should fail in the onApplicationEvent
, as long as we change listenerRegistered
only within this cycle. So, objectNames
must not be empty here. I means that MBeans have been registered already.
BTW, to test it with SF 4.1
Tested on |
…ntil `onApplicationEvent()`
Pushed |
LGTM; merging |
Merged |
JIRA: https://jira.spring.io/browse/INT-3458
1.3.5.RELEASE
HttpRequestHandlingEndpointSupport
: removeMappingJacksonHttpMessageConverter
registrationIntegrationRequestMappingHandlerMapping
: add 'fake'name()
attribute to the inlineRequestMapping
annotationStoredProcJmxManagedBeanTests
: removecontext.stop();
code, SinceMBeanExporter
deregister MBeans onstop()
nowStoredProcPollingChannelAdapterParserTests
: change deprecatedParameterizedSingleColumnRowMapper
to theSingleColumnRowMapper
Jms
: comment out the reflection code to check the value for therecoveryInterval
, because it is removed already in favor ofbackOff
NotificationListeningMessageProducer
: move the start-up listener registration to theonApplicationEvent
,because
MBeanExporter
movedregisterBeans()
to thestart()
now.The same
phase
might cause the issue, that MBeans aren't registered yet forNotificationListeningMessageProducer
JpaOutboundGatewayTests
: change@TransactionConfiguration
to the@Transactional
. Don't know why the first doesn't work now.Cherry-pick to 4.0.x