GH-3230: MMIH: Fix Pausable/Lifecycle Methods
Resolves https://github.com/spring-projects/spring-integration/issues/3230 Previously, methods with the same name as `Lifecycle` methods were unconditionally ignored. - Use logic similar to `ControlBusMethodFilter` to explicitly compare the candidate Method to those on `Paused` and `Lifecycle` and only ignore those. - Explicitly disallow these methods when named - previously the check was only performed if no method name was supplied. * - reinstate `Pausable/Lifecycle` methods if explicitly requested. - log `Pausable` methods that are not candidates. * - Fix typo in test method. **Cherry-pick to 5.2.x**
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,6 +19,7 @@ package org.springframework.integration.handler;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
|
||||
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
import static org.mockito.AdditionalAnswers.returnsFirstArg;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
@@ -51,6 +52,7 @@ import org.springframework.beans.DirectFieldAccessor;
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.Lifecycle;
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -1165,6 +1167,31 @@ public class MethodInvokingMessageProcessorTests {
|
||||
assertThat(result).isEqualTo("Foo,Bar");
|
||||
}
|
||||
|
||||
@Test
|
||||
void lifecycleOnly() {
|
||||
assertThatIllegalStateException().isThrownBy(() ->
|
||||
new MethodInvokingMessageProcessor(new LifecycleBean(), (String) null))
|
||||
.withMessageContaining("no eligible methods");
|
||||
}
|
||||
|
||||
@Test
|
||||
void lifecycleOnlyExplicitMethod() {
|
||||
LifecycleBean targetObject = new LifecycleBean();
|
||||
MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(targetObject, "start");
|
||||
processor.setBeanFactory(mock(BeanFactory.class));
|
||||
Object result = processor.processMessage(new GenericMessage<>("testing"));
|
||||
assertThat(targetObject.startCalled).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void lifecycleWithValidStartMethod() {
|
||||
MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(new LifeCycleWithCustomStart(),
|
||||
(String) null);
|
||||
processor.setBeanFactory(mock(BeanFactory.class));
|
||||
Object result = processor.processMessage(new GenericMessage<>("testing"));
|
||||
assertThat(result).isEqualTo("TESTING");
|
||||
}
|
||||
|
||||
public static class Employee<T> {
|
||||
|
||||
private T entity;
|
||||
@@ -1586,4 +1613,32 @@ public class MethodInvokingMessageProcessorTests {
|
||||
|
||||
}
|
||||
|
||||
public static class LifecycleBean implements Lifecycle {
|
||||
|
||||
boolean startCalled;
|
||||
|
||||
@Override
|
||||
public void start() {
|
||||
this.startCalled = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRunning() {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static class LifeCycleWithCustomStart extends LifecycleBean {
|
||||
|
||||
public String start(String in) {
|
||||
return in.toUpperCase();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user