Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve new Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2021-03-10 10:42:43 -05:00
parent b2a4e67db7
commit 61153a96fc
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
View File

@@ -245,7 +245,7 @@ public class ConsumerEndpointFactoryBean
}
catch (Exception ex) {
LOGGER.debug(() -> "Could not set component name for handler "
+ this.handler + " for " + this.beanName + " :" + ex.getMessage());
+ this.handler + " for " + this.beanName + " :" + ex.getMessage());
}
}
@@ -302,14 +302,7 @@ public class ConsumerEndpointFactoryBean
if (this.initialized) {
return;
}
MessageChannel channel = null;
if (StringUtils.hasText(this.inputChannelName)) {
channel = this.channelResolver.resolveDestination(this.inputChannelName);
}
if (this.inputChannel != null) {
channel = this.inputChannel;
}
Assert.state(channel != null, "one of inputChannelName or inputChannel is required");
MessageChannel channel = resolveInputChannel();
Assert.state(this.reactiveCustomizer == null || this.pollerMetadata == null,
"The 'pollerMetadata' and 'reactiveCustomizer' are mutually exclusive.");
@@ -344,6 +337,18 @@ public class ConsumerEndpointFactoryBean
}
}
private MessageChannel resolveInputChannel() {
MessageChannel channel = null;
if (StringUtils.hasText(this.inputChannelName)) {
channel = this.channelResolver.resolveDestination(this.inputChannelName);
}
if (this.inputChannel != null) {
channel = this.inputChannel;
}
Assert.state(channel != null, "one of inputChannelName or inputChannel is required");
return channel;
}
private void reactiveStreamsConsumer(MessageChannel channel) {
ReactiveStreamsConsumer reactiveStreamsConsumer;
if (this.handler instanceof ReactiveMessageHandlerAdapter) {

17
spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
View File

@@ -104,6 +104,8 @@ import reactor.core.publisher.Flux;
public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation>
implements MethodAnnotationPostProcessor<T> {
private static final String UNCHECKED = "unchecked";
private static final String INPUT_CHANNEL_ATTRIBUTE = "inputChannel";
private static final String ADVICE_CHAIN_ATTRIBUTE = "adviceChain";
@@ -124,7 +126,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
protected final Disposables disposables; // NOSONAR
@SuppressWarnings("unchecked")
@SuppressWarnings(UNCHECKED)
public AbstractMethodAnnotationPostProcessor(ConfigurableListableBeanFactory beanFactory) {
Assert.notNull(beanFactory, "'beanFactory' must not be null");
this.messageHandlerAttributes.add(SEND_TIMEOUT_ATTRIBUTE);
@@ -146,7 +148,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
this.disposables = disposablesBean;
}
@Override
public Object postProcess(Object bean, String beanName, Method method, List<Annotation> annotations) {
Object sourceHandler = null;
@@ -203,7 +204,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
return handlerBean;
}
private void orderable(Method method, MessageHandler handler) {
if (handler instanceof Orderable) {
Order orderAnnotation = AnnotationUtils.findAnnotation(method, Order.class);
@@ -213,7 +213,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
}
}
private void producerOrRouter(List<Annotation> annotations, MessageHandler handler) {
if (handler instanceof AbstractMessageProducingHandler || handler instanceof AbstractMessageRouter) {
String sendTimeout = MessagingAnnotationUtils.resolveAttribute(annotations, "sendTimeout", String.class);
@@ -232,7 +231,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
}
}
private MessageHandler annotated(Method method, MessageHandler handlerArg) {
MessageHandler handler = handlerArg;
if (AnnotatedElementUtils.isAnnotated(method, IdempotentReceiver.class.getName())
@@ -261,7 +259,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
return handler;
}
private MessageHandler adviceChain(String beanName, List<Annotation> annotations, MessageHandler handlerArg) {
MessageHandler handler = handlerArg;
List<Advice> adviceChain = extractAdviceChain(beanName, annotations);
@@ -330,7 +327,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
Collections.addAll(adviceChain, (Advice[]) adviceChainBean);
}
else if (adviceChainBean instanceof Collection) {
@SuppressWarnings("unchecked")
@SuppressWarnings(UNCHECKED)
Collection<Advice> adviceChainEntries = (Collection<Advice>) adviceChainBean;
adviceChain.addAll(adviceChainEntries);
}
@@ -418,7 +415,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
if (reactive != null) {
String functionBeanName = reactive.value();
if (StringUtils.hasText(functionBeanName)) {
@SuppressWarnings("unchecked")
@SuppressWarnings(UNCHECKED)
Function<? super Flux<Message<?>>, ? extends Publisher<Message<?>>> reactiveCustomizer =
this.beanFactory.getBean(functionBeanName, Function.class);
reactiveStreamsConsumer.setReactiveCustomizer(reactiveCustomizer);
@@ -516,9 +513,9 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
return pollerMetadata;
}
private void trigger(String triggerRef, String fixedDelayValue, String fixedRateValue, String cron,
PollerMetadata pollerMetadata) {
Trigger trigger = null;
if (StringUtils.hasText(triggerRef)) {
Assert.state(!StringUtils.hasText(cron) && !StringUtils.hasText(fixedDelayValue)
@@ -581,7 +578,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
return id;
}
@SuppressWarnings("unchecked")
@SuppressWarnings(UNCHECKED)
protected <H> H extractTypeIfPossible(@Nullable Object targetObject, Class<H> expectedType) {
if (targetObject == null) {
return null;