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

Add EmptyLineSeparator Checkstyle rule

Browse Source 
* Support "blank lines around" via `spring-framework.xml` IDEA config
* Fix all the Checkstyle violations
This commit is contained in:
Artem Bilan
2024-03-27 16:54:25 -04:00
parent f71a2234d8
commit c155d5d418
932 changed files with 1341 additions and 2485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-core/src/main/java/org/springframework/integration/IntegrationMessageHeaderAccessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2023 the original author or authors.
* Copyright 2013-2024 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.
@@ -84,7 +84,6 @@ public class IntegrationMessageHeaderAccessor extends MessageHeaderAccessor {
*/
public static final String REACTOR_CONTEXT = "reactorContext";
private static final BiFunction<String, String, String> TYPE_VERIFY_MESSAGE_FUNCTION =
(name, trailer) -> "The '" + name + trailer;

3
spring-integration-core/src/main/java/org/springframework/integration/IntegrationPatternType.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019 the original author or authors.
* Copyright 2019-2024 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.
@@ -88,7 +88,6 @@ public enum IntegrationPatternType { // NOSONAR Initialization circularity is us
recipient_list_router(IntegrationPatternCategory.message_routing);
private final IntegrationPatternCategory patternCategory;
IntegrationPatternType(IntegrationPatternCategory patternCategory) {

3
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -257,7 +257,6 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageP
this.discardChannelName = discardChannelName;
}
public void setSendPartialResultOnExpiry(boolean sendPartialResultOnExpiry) {
this.sendPartialResultOnExpiry = sendPartialResultOnExpiry;
}

5
spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -62,7 +62,6 @@ public class CorrelatingMessageBarrier extends AbstractMessageHandler implements
private ReleaseStrategy releaseStrategy;
public CorrelatingMessageBarrier() {
this(new SimpleMessageStore(0));
}
@@ -71,7 +70,6 @@ public class CorrelatingMessageBarrier extends AbstractMessageHandler implements
this.store = store;
}
/**
* Set the CorrelationStrategy to be used to determine the correlation key for incoming messages.
* @param correlationStrategy The correlation strategy.
@@ -103,7 +101,6 @@ public class CorrelatingMessageBarrier extends AbstractMessageHandler implements
return existingLock == null ? correlationKey : existingLock;
}
@SuppressWarnings("unchecked")
@Override
public Message<Object> receive() {

3
spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -41,7 +41,6 @@ public class ExpressionEvaluatingCorrelationStrategy implements CorrelationStrat
private final ExpressionEvaluatingMessageProcessor<Object> processor;
public ExpressionEvaluatingCorrelationStrategy(String expressionString) {
Assert.hasText(expressionString, "expressionString must not be empty");
Expression expression = EXPRESSION_PARSER.parseExpression(expressionString);

3
spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -35,7 +35,6 @@ public class ExpressionEvaluatingMessageGroupProcessor extends AbstractAggregati
private final ExpressionEvaluatingMessageListProcessor processor;
public ExpressionEvaluatingMessageGroupProcessor(String expression) {
this.processor = new ExpressionEvaluatingMessageListProcessor(expression);
}

3
spring-integration-core/src/main/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -30,7 +30,6 @@ public class HeaderAttributeCorrelationStrategy implements CorrelationStrategy {
private final String attributeName;
public HeaderAttributeCorrelationStrategy(String attributeName) {
Assert.hasText(attributeName, "the 'attributeName' must not be empty");
this.attributeName = attributeName;

4
spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -35,7 +35,6 @@ public class MethodInvokingReleaseStrategy implements ReleaseStrategy, BeanFacto
private final MethodInvokingMessageListProcessor<Boolean> adapter;
public MethodInvokingReleaseStrategy(Object object, Method method) {
this.adapter = new MethodInvokingMessageListProcessor<Boolean>(object, method, Boolean.class);
}
@@ -44,7 +43,6 @@ public class MethodInvokingReleaseStrategy implements ReleaseStrategy, BeanFacto
this.adapter = new MethodInvokingMessageListProcessor<Boolean>(object, methodName, Boolean.class);
}
public void setConversionService(ConversionService conversionService) {
this.adapter.setConversionService(conversionService);
}

3
spring-integration-core/src/main/java/org/springframework/integration/aggregator/ReleaseStrategy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -18,7 +18,6 @@ package org.springframework.integration.aggregator;
import org.springframework.integration.store.MessageGroup;
/**
* Strategy for determining when a group of messages reaches a state of
* completion (i.e. can trip a barrier).

4
spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -43,13 +43,11 @@ public class ResequencingMessageHandler extends AbstractCorrelatingMessageHandle
this.setExpireGroupsUponTimeout(false);
}
public ResequencingMessageHandler(MessageGroupProcessor processor, MessageGroupStore store) {
super(processor, store);
this.setExpireGroupsUponTimeout(false);
}
public ResequencingMessageHandler(MessageGroupProcessor processor) {
super(processor);
this.setExpireGroupsUponTimeout(false);

3
spring-integration-core/src/main/java/org/springframework/integration/annotation/CorrelationStrategy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -32,4 +32,5 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Documented
public @interface CorrelationStrategy {
}

4
spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2024 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.
@@ -74,7 +74,6 @@ public @interface IntegrationComponentScan {
*/
Class<?>[] basePackageClasses() default {};
/**
* Indicates whether automatic detection of classes annotated with
* {@code @MessagingGateway} should be enabled.
@@ -106,7 +105,6 @@ public @interface IntegrationComponentScan {
*/
Filter[] excludeFilters() default {};
/**
* The {@link BeanNameGenerator} class to be used for naming detected Spring Integration components.
* <p>The default value of the {@link BeanNameGenerator} interface itself indicates

4
spring-integration-core/src/main/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -64,7 +64,6 @@ public class MethodAnnotationPublisherMetadataSource implements PublisherMetadat
private volatile String channelAttributeName = "channel";
public MethodAnnotationPublisherMetadataSource() {
this(Collections.singleton(Publisher.class));
}
@@ -74,7 +73,6 @@ public class MethodAnnotationPublisherMetadataSource implements PublisherMetadat
this.annotationTypes = annotationTypes;
}
public void setChannelAttributeName(String channelAttributeName) {
Assert.hasText(channelAttributeName, "channelAttributeName must not be empty");
this.channelAttributeName = channelAttributeName;

4
spring-integration-core/src/main/java/org/springframework/integration/aop/MethodNameMappingPublisherMetadataSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -39,7 +39,6 @@ public class MethodNameMappingPublisherMetadataSource implements PublisherMetada
private volatile Map<String, String> channelMap = Collections.emptyMap();
public MethodNameMappingPublisherMetadataSource(Map<String, String> payloadExpressionMap) {
Assert.notEmpty(payloadExpressionMap, "payloadExpressionMap must not be empty");
this.payloadExpressionMap =
@@ -49,7 +48,6 @@ public class MethodNameMappingPublisherMetadataSource implements PublisherMetada
e -> EXPRESSION_PARSER.parseExpression(e.getValue())));
}
public void setHeaderExpressionMap(Map<String, Map<String, String>> headerExpressionMap) {
this.headerExpressionMap =
headerExpressionMap

6
spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -67,7 +67,6 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
this.pointcut = buildPointcut(publisherAnnotationTypes);
}
/**
* A channel bean name to be used as default for publishing.
* @param defaultChannelName the default channel name.
@@ -107,14 +106,12 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
return result;
}
private static final class MetaAnnotationMatchingPointcut implements Pointcut {
private final ClassFilter classFilter;
private final MethodMatcher methodMatcher;
/**
* Create a new MetaAnnotationMatchingPointcut for the given annotation type.
* @param classAnnotationType the annotation type to look for at the class level
@@ -155,7 +152,6 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
}
}
@Override
public ClassFilter getClassFilter() {
return this.classFilter;

3
spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherMetadataSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -48,7 +48,6 @@ interface PublisherMetadataSource {
Expression RETURN_VALUE_EXPRESSION =
EXPRESSION_PARSER.parseExpression("#" + PublisherMetadataSource.RETURN_VALUE_VARIABLE_NAME);
/**
* Returns the channel name to which Messages should be published
* for this particular method invocation.

3
spring-integration-core/src/main/java/org/springframework/integration/aop/SimplePublisherMetadataSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -40,7 +40,6 @@ public class SimplePublisherMetadataSource implements PublisherMetadataSource {
private volatile Map<String, Expression> headerExpressions;
public void setChannelName(String channelName) {
this.channelName = channelName;
}

3
spring-integration-core/src/main/java/org/springframework/integration/aot/CoreRuntimeHints.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022-2023 the original author or authors.
* Copyright 2022-2024 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.
@@ -97,7 +97,6 @@ class CoreRuntimeHints implements RuntimeHintsRegistrar {
Pausable.class)
.forEach(type -> reflectionHints.registerType(type, MemberCategory.INVOKE_PUBLIC_METHODS));
if (ClassUtils.isPresent("com.jayway.jsonpath.JsonPath", classLoader)) {
reflectionHints.registerType(JsonPathUtils.class, MemberCategory.INVOKE_PUBLIC_METHODS);
}

3
spring-integration-core/src/main/java/org/springframework/integration/aot/GatewayProxyInitializationAotProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022 the original author or authors.
* Copyright 2022-2024 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.
@@ -28,7 +28,6 @@ import org.springframework.beans.factory.support.RegisteredBean;
import org.springframework.integration.annotation.MessagingGateway;
import org.springframework.integration.gateway.GatewayProxyFactoryBean;
/**
* A {@link BeanFactoryInitializationAotProcessor} for registering proxy interfaces
* of the {@link GatewayProxyFactoryBean} beans or {@link MessagingGateway} interfaces.

4
spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -49,7 +49,6 @@ public class ChannelPurger {
private final MessageSelector selector;
public ChannelPurger(QueueChannel... channels) {
this(null, channels);
}
@@ -63,7 +62,6 @@ public class ChannelPurger {
this.channels = Arrays.copyOf(channels, channels.length);
}
public final List<Message<?>> purge() {
List<Message<?>> purgedMessages = new ArrayList<>();
for (QueueChannel channel : this.channels) {

1
spring-integration-core/src/main/java/org/springframework/integration/channel/DirectChannel.java
View File

@@ -58,7 +58,6 @@ public class DirectChannel extends AbstractSubscribableChannel {
this.dispatcher.setLoadBalancingStrategy(loadBalancingStrategy);
}
/**
* Specify whether the channel's dispatcher should have failover enabled.
* By default, it will. Set this value to 'false' to disable it.

1
spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java
View File

@@ -82,7 +82,6 @@ public class ExecutorChannel extends AbstractExecutorChannel {
this.dispatcher = unicastingDispatcher;
}
/**
* Specify whether the channel's dispatcher should have failover enabled.
* By default, it will. Set this value to 'false' to disable it.

3
spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -63,7 +63,6 @@ public class MessagePublishingErrorHandler extends ErrorMessagePublisher impleme
setChannelResolver(channelResolver);
}
public void setDefaultErrorChannel(@Nullable MessageChannel defaultErrorChannel) {
setChannel(defaultErrorChannel);
}

3
spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -91,7 +91,6 @@ public class PublishSubscribeChannel extends AbstractExecutorChannel implements
this.dispatcher = new BroadcastingDispatcher(executor, requireSubscribers);
}
@Override
public String getComponentType() {
return "publish-subscribe-channel";

4
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -36,7 +36,6 @@ public class GlobalChannelInterceptorWrapper implements Ordered {
private volatile int order = 0;
public GlobalChannelInterceptorWrapper(ChannelInterceptor channelInterceptor) {
Assert.notNull(channelInterceptor, "channelInterceptor must not be null");
this.channelInterceptor = channelInterceptor;
@@ -47,7 +46,6 @@ public class GlobalChannelInterceptorWrapper implements Ordered {
}
}
public ChannelInterceptor getChannelInterceptor() {
return this.channelInterceptor;
}

4
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -37,12 +37,10 @@ public class MessageSelectingInterceptor implements ChannelInterceptor {
private final List<MessageSelector> selectors;
public MessageSelectingInterceptor(MessageSelector... selectors) {
this.selectors = Arrays.asList(selectors);
}
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
for (MessageSelector selector : this.selectors) {

3
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ThreadStatePropagationChannelInterceptor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2022 the original author or authors.
* Copyright 2015-2024 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.
@@ -97,7 +97,6 @@ public abstract class ThreadStatePropagationChannelInterceptor<S> implements Exe
protected abstract void populatePropagatedContext(@Nullable S state, Message<?> message, MessageChannel channel);
private static final class MessageWithThreadState implements Message<Object>, MessageDecorator {
private final Message<Object> message;

1
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java
View File

@@ -64,7 +64,6 @@ public class WireTap implements ChannelInterceptor, ManageableLifecycle, VetoCap
private volatile boolean running = true;
/**
* Create a new wire tap with <em>no</em> {@link MessageSelector}.
* @param channel the MessageChannel to which intercepted messages will be sent

3
spring-integration-core/src/main/java/org/springframework/integration/codec/Codec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2021 the original author or authors.
* Copyright 2015-2024 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.
@@ -27,6 +27,7 @@ import java.io.OutputStream;
* @since 4.2
*/
public interface Codec {
/**
* Encode (encode) an object to an OutputStream.
* @param object the object to encode

3
spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2022 the original author or authors.
* Copyright 2015-2024 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.
@@ -68,7 +68,6 @@ public class KryoClassListRegistrar extends AbstractKryoRegistrar {
this.initialValue = initialValue;
}
@Override
public List<Registration> getRegistrations() {
List<Registration> registrations = new ArrayList<>();

3
spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoRegistrar.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2019 the original author or authors.
* Copyright 2015-2024 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.
@@ -50,4 +50,5 @@ public interface KryoRegistrar {
* @return the list of {@link Registration} provided
*/
List<Registration> getRegistrations();
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -702,7 +702,6 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
pollingEndpoint.setTransactionSynchronizationFactory(pollerMetadata.getTransactionSynchronizationFactory());
}
private PollerMetadata configurePoller(AbstractPollingEndpoint pollingEndpoint, String triggerRef,
String executorRef, String fixedDelayValue, String fixedRateValue, String maxMessagesPerPollValue,
String cron, String errorChannel, String receiveTimeout) {

3
spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2021 the original author or authors.
* Copyright 2015-2024 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.
@@ -43,7 +43,6 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.StringUtils;
/**
* {@link org.springframework.beans.factory.FactoryBean} to create an
* {@link AggregatingMessageHandler}.

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -65,7 +65,6 @@ import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
* The {@link FactoryBean} implementation for {@link AbstractEndpoint} population.
* Controls all the necessary properties and lifecycle.

1
spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java
View File

@@ -97,7 +97,6 @@ public class DefaultConfiguringBeanFactoryPostProcessor implements BeanDefinitio
}
}
private ConfigurableListableBeanFactory beanFactory;
private BeanDefinitionRegistry registry;

3
spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2024 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.
@@ -42,7 +42,6 @@ import org.springframework.integration.support.management.micrometer.MicrometerM
@Import({MicrometerMetricsCaptorImportSelector.class, IntegrationManagementConfiguration.class})
public @interface EnableIntegrationManagement {
/**
* Use for disabling all logging in the main message flow in framework components. When 'false',
* such logging will be skipped, regardless of logging level. When 'true',

5
spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -39,19 +39,16 @@ public class ExpressionFactoryBean extends AbstractFactoryBean<Expression> {
private ExpressionParser parser = DEFAULT_PARSER;
public ExpressionFactoryBean(String expressionString) {
Assert.hasText(expressionString, "'expressionString' must not be empty or null");
this.expressionString = expressionString;
}
public void setParserConfiguration(SpelParserConfiguration parserConfiguration) {
Assert.notNull(parserConfiguration, "'parserConfiguration' must not be null");
this.parser = new SpelExpressionParser(parserConfiguration);
}
@Override
public Class<?> getObjectType() {
return Expression.class;

3
spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -106,7 +106,6 @@ public class FilterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
}
}
@Override
protected void postProcessReplyProducer(AbstractMessageProducingHandler handler) {
super.postProcessReplyProducer(handler);

3
spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2019 the original author or authors.
* Copyright 2014-2024 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.
@@ -43,7 +43,6 @@ public final class FixedSubscriberChannelBeanFactoryPostProcessor implements Bea
this.candidateFixedChannelHandlerMap = candidateHandlers;
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (beanFactory instanceof BeanDefinitionRegistry) {

3
spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigurationReport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023 the original author or authors.
* Copyright 2023-2024 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.
@@ -16,7 +16,6 @@
package org.springframework.integration.config;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;

3
spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2022 the original author or authors.
* Copyright 2015-2024 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.
@@ -43,7 +43,6 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.util.Assert;
/**
* Configures beans that implement {@link IntegrationManagement}.
* Configures logging, {@link MetricsCaptor} and {@link ObservationRegistry} for all (or selected) components.

3
spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 the original author or authors.
* Copyright 2014-2024 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.
@@ -114,7 +114,6 @@ public class IntegrationRegistrar implements ImportBeanDefinitionRegistrar {
.getBeanDefinition());
}
String beanName = Introspector.decapitalize(MessagingAnnotationBeanPostProcessor.class.getName());
if (!registry.containsBeanDefinition(beanName)) {
registry.registerBeanDefinition(beanName,

3
spring-integration-core/src/main/java/org/springframework/integration/config/ServiceActivatorFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -108,7 +108,6 @@ public class ServiceActivatorFactoryBean extends AbstractStandardMessageHandlerF
return handler;
}
/**
* Always returns true - any {@link AbstractMessageProducingHandler} can
* be used directly.

3
spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -79,7 +79,6 @@ public class SourcePollingChannelAdapterFactoryBean implements FactoryBean<Sourc
private volatile boolean initialized;
public void setSource(MessageSource<?> source) {
this.source = source;
}

3
spring-integration-core/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -94,4 +94,5 @@ public class AggregatorParser extends AbstractCorrelatingMessageHandlerParser {
return builder;
}
}

3
spring-integration-core/src/main/java/org/springframework/integration/config/xml/AnnotationConfigParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -86,7 +86,6 @@ public class AnnotationConfigParser implements BeanDefinitionParser {
}
}
@Override
public Set<MethodMetadata> getDeclaredMethods() {
throw new UnsupportedOperationException("The class doesn't support this operation");

3
spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -131,7 +131,6 @@ public class ChainParser extends AbstractConsumerEndpointParser {
boolean hasId = StringUtils.hasText(id);
String handlerComponentName = chainHandlerId + "$child" + (hasId ? "." + id : "#" + order);
if ("bean".equals(element.getLocalName())) {
holder = parserContext.getDelegate().parseBeanDefinitionElement(element, parentDefinition);
}

4
spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -42,13 +42,11 @@ public class ChannelInterceptorParser {
private final Map<String, BeanDefinitionRegisteringParser> parsers;
public ChannelInterceptorParser() {
this.parsers = new HashMap<String, BeanDefinitionRegisteringParser>();
this.parsers.put("wire-tap", new WireTapParser());
}
@SuppressWarnings({"unchecked", "rawtypes"})
public ManagedList parseInterceptors(Element element, ParserContext parserContext) {
ManagedList interceptors = new ManagedList();

4
spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -97,7 +97,6 @@ public class GatewayParser implements BeanDefinitionParser {
gatewayAttributes.put("defaultRequestTimeout",
element.getAttribute(isNested ? "request-timeout" : "default-request-timeout"));
headers(element, gatewayAttributes);
methods(element, parserContext, gatewayAttributes);
@@ -185,7 +184,6 @@ public class GatewayParser implements BeanDefinitionParser {
}
}
private static BeanDefinitionHolder buildBeanDefinition(Map<String, Object> gatewayAttributes, // NOSONAR complexity
ParserContext parserContext) {

3
spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationManagementParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2020 the original author or authors.
* Copyright 2015-2024 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.
@@ -33,7 +33,6 @@ import org.springframework.integration.config.IntegrationManagementConfigurer;
*/
public class IntegrationManagementParser extends AbstractBeanDefinitionParser {
@Override
protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
throws BeanDefinitionStoreException {

3
spring-integration-core/src/main/java/org/springframework/integration/config/xml/RecipientListRouterParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -31,7 +31,6 @@ import org.springframework.integration.router.RecipientListRouter.Recipient;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
/**
* Parser for the &lt;recipient-list-router/&gt; element.
*

3
spring-integration-core/src/main/java/org/springframework/integration/config/xml/SpelFunctionParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2019 the original author or authors.
* Copyright 2013-2024 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.
@@ -41,4 +41,5 @@ public class SpelFunctionParser extends AbstractSingleBeanDefinitionParser {
.addConstructorArgValue(element.getAttribute("method"));
}
}

3
spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -91,7 +91,6 @@ public abstract class IntegrationContextUtils {
public static final String INTEGRATION_GRAPH_SERVER_BEAN_NAME = "integrationGraphServer";
public static final String SPEL_PROPERTY_ACCESSOR_REGISTRAR_BEAN_NAME = "spelPropertyAccessorRegistrar";
public static final String ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME =

4
spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 the original author or authors.
* Copyright 2014-2024 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.
@@ -75,7 +75,6 @@ public final class IntegrationProperties {
public static final String CHANNELS_MAX_BROADCAST_SUBSCRIBERS =
INTEGRATION_PROPERTIES_PREFIX + "channels.maxBroadcastSubscribers";
/**
* Specifies the value for {@link org.springframework.integration.channel.PublishSubscribeChannel#requireSubscribers}
* on a global default {@link IntegrationContextUtils#ERROR_CHANNEL_BEAN_NAME}.
@@ -90,7 +89,6 @@ public final class IntegrationProperties {
public static final String ERROR_CHANNEL_IGNORE_FAILURES =
INTEGRATION_PROPERTIES_PREFIX + "channels.error.ignoreFailures";
/**
* Specifies the value of {@link org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler#poolSize}
* for the {@code taskScheduler} bean initialized by the Integration infrastructure.

3
spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingTemplate.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -39,7 +39,6 @@ public class AsyncMessagingTemplate extends MessagingTemplate implements AsyncMe
private volatile AsyncTaskExecutor executor = new SimpleAsyncTaskExecutor();
public void setExecutor(Executor executor) {
Assert.notNull(executor, "executor must not be null");
this.executor = (executor instanceof AsyncTaskExecutor) ?

3
spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -38,7 +38,6 @@ public class AggregateMessageDeliveryException extends MessageDeliveryException
private final List<? extends Exception> aggregatedExceptions;
public AggregateMessageDeliveryException(Message<?> undeliveredMessage,
String description, List<? extends Exception> aggregatedExceptions) {

2
spring-integration-core/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java
View File

@@ -77,7 +77,6 @@ public class BroadcastingDispatcher extends AbstractDispatcher implements BeanFa
private volatile boolean messageBuilderFactorySet;
public BroadcastingDispatcher() {
this(null, false);
}
@@ -206,7 +205,6 @@ public class BroadcastingDispatcher extends AbstractDispatcher implements BeanFa
return dispatched >= this.minSubscribers;
}
private Runnable createMessageHandlingTask(final MessageHandler handler, final Message<?> message) {
MessageHandlingRunnable task = new MessageHandlingRunnable() {

1
spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java
View File

@@ -73,7 +73,6 @@ public class UnicastingDispatcher extends AbstractDispatcher {
this.executor = executor;
}
/**
* Specify whether this dispatcher should failover when a single
* {@link MessageHandler} throws an Exception. The default value is

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/AggregatorSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -120,7 +120,6 @@ public class AggregatorSpec extends CorrelationHandlerSpec<AggregatorSpec, Aggre
return _this();
}
@Override
public Map<Object, String> getComponentsToRegister() {
if (this.headersFunction != null) {

5
spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
View File

@@ -697,7 +697,7 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
* @see LambdaMessageProcessor
* @see GenericEndpointSpec
*/
private <P, T> B transform(@Nullable Class<P> expectedType, GenericTransformer<P, T> genericTransformer,
private <P, T> B transform(@Nullable Class<P> expectedType, GenericTransformer<P, T> genericTransformer,
@Nullable Consumer<GenericEndpointSpec<MessageTransformingHandler>> endpointConfigurer) {
Assert.notNull(genericTransformer, "'genericTransformer' must not be null");
@@ -1320,7 +1320,8 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
* @return the current {@link BaseIntegrationFlowDefinition}.
*/
public B split() {
return splitWith((splitterSpec) -> { });
return splitWith((splitterSpec) -> {
});
}
/**

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/Channels.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -138,7 +138,6 @@ public final class Channels {
return MessageChannels.executor(id, executor);
}
public FluxMessageChannelSpec flux() {
return MessageChannels.flux();
}

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -313,7 +313,6 @@ public class EnricherSpec extends ConsumerEndpointSpec<EnricherSpec, ContentEnri
return _this();
}
@Override
protected Tuple2<ConsumerEndpointFactoryBean, ContentEnricher> doGet() {
if (!this.propertyExpressions.isEmpty()) {

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -749,7 +749,6 @@ public class HeaderEnricherSpec extends ConsumerEndpointSpec<HeaderEnricherSpec,
return header(name, value, null);
}
/**
* Add a single header specification.
* @param name the header name.

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageHandlerSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 the original author or authors.
* Copyright 2016-2024 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.
@@ -30,4 +30,5 @@ import org.springframework.messaging.MessageHandler;
*/
public abstract class MessageHandlerSpec<S extends MessageHandlerSpec<S, H>, H extends MessageHandler>
extends IntegrationComponentSpec<S, H> {
}

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/QueueChannelSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-2024 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.
@@ -81,7 +81,6 @@ public class QueueChannelSpec extends MessageChannelSpec<QueueChannelSpec, Queue
return (MessageStoreSpec) super.id(id);
}
public MessageStoreSpec capacity(Integer capacityToSet) {
this.capacity = capacityToSet;
return this;

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/RecipientListRouterSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -205,7 +205,6 @@ public class RecipientListRouterSpec extends AbstractRouterSpec<RecipientListRou
return recipientFlow((String) null, subFlow);
}
/**
* Adds a subflow that will be invoked if the expression evaluates to 'true'.
* @param expression the expression.

4
spring-integration-core/src/main/java/org/springframework/integration/dsl/Transformers.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -311,7 +311,6 @@ public abstract class Transformers {
return new StreamTransformer(charset);
}
@SuppressWarnings("unchecked")
static <I, O> Flux<Message<O>> transformWithFunction(Publisher<Message<I>> publisher,
Function<? super Flux<Message<I>>, ? extends Publisher<O>> fluxFunction) {
@@ -334,7 +333,6 @@ public abstract class Transformers {
.contextWrite(ctx -> ctx.put(RequestMessageHolder.class, new RequestMessageHolder()));
}
@SuppressWarnings("serial")
private static final class RequestMessageHolder extends AtomicReference<Message<?>> {

1
spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java
View File

@@ -454,7 +454,6 @@ public class IntegrationFlowBeanPostProcessor
((BeanDefinitionRegistry) this.beanFactory).registerBeanDefinition(beanName, beanDefinition);
this.beanFactory.getBean(beanName);
}

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/support/FixedSubscriberChannelPrototype.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -47,7 +47,6 @@ public class FixedSubscriberChannelPrototype implements MessageChannel {
return this.name;
}
@Override
public boolean send(Message<?> message) {
throw new UnsupportedOperationException();

3
spring-integration-core/src/main/java/org/springframework/integration/dsl/support/MessageChannelReference.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2023 the original author or authors.
* Copyright 2016-2024 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.
@@ -39,7 +39,6 @@ public record MessageChannelReference(String name) implements MessageChannel {
Assert.notNull(name, "'name' must not be null");
}
@Override
public boolean send(Message<?> message) {
throw new UnsupportedOperationException();

3
spring-integration-core/src/main/java/org/springframework/integration/endpoint/EventDrivenConsumer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -40,7 +40,6 @@ public class EventDrivenConsumer extends AbstractEndpoint implements Integration
private final MessageHandler handler;
public EventDrivenConsumer(SubscribableChannel inputChannel, MessageHandler handler) {
Assert.notNull(inputChannel, "inputChannel must not be null");
Assert.notNull(handler, "handler must not be null");

3
spring-integration-core/src/main/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -34,7 +34,6 @@ public class ExpressionEvaluatingMessageSource<T> extends AbstractMessageSource<
private final Class<T> expectedType;
public ExpressionEvaluatingMessageSource(Expression expression, Class<T> expectedType) {
Assert.notNull(expression, "expression must not be null");
this.expression = expression;

3
spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -47,7 +47,6 @@ public class MethodInvokingMessageSource extends AbstractMessageSource<Object> i
private final Lock initializationMonitor = new ReentrantLock();
public void setObject(Object object) {
Assert.notNull(object, "'object' must not be null");
this.object = object;

3
spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -82,7 +82,6 @@ public class PollingConsumer extends AbstractPollingEndpoint implements Integrat
}
}
public void setReceiveTimeout(long receiveTimeout) {
this.receiveTimeout = receiveTimeout;
}

2
spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveStreamsConsumer.java
View File

@@ -47,7 +47,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ErrorHandler;
/**
* An {@link AbstractEndpoint} implementation for Reactive Streams subscription into an
* input channel and reactive consumption of messages from that channel.
@@ -259,7 +258,6 @@ public class ReactiveStreamsConsumer extends AbstractEndpoint implements Integra
return this.subscription == null;
}
@Override
public void start() {
if (this.messageHandler instanceof Lifecycle) {

4
spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -157,7 +157,6 @@ public class SourcePollingChannelAdapter extends AbstractPollingEndpoint
}
}
@Override
protected void doStop() {
super.doStop();
@@ -166,7 +165,6 @@ public class SourcePollingChannelAdapter extends AbstractPollingEndpoint
}
}
@Override
protected void onInit() {
Assert.notNull(this.source, "source must not be null");

3
spring-integration-core/src/main/java/org/springframework/integration/events/IntegrationEvent.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2024 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,7 +19,6 @@ package org.springframework.integration.events;
import org.springframework.context.ApplicationEvent;
import org.springframework.lang.Nullable;
/**
* Base class for all {@link ApplicationEvent}s generated by the framework.
* Contains an optional cause field; a separate Exception event hierarchy

4
spring-integration-core/src/main/java/org/springframework/integration/expression/DynamicExpression.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -38,7 +38,6 @@ public class DynamicExpression implements Expression {
private final ExpressionSource expressionSource;
public DynamicExpression(String key, ExpressionSource expressionSource) {
Assert.notNull(key, "key must not be null");
Assert.notNull(expressionSource, "expressionSource must not be null");
@@ -46,7 +45,6 @@ public class DynamicExpression implements Expression {
this.expressionSource = expressionSource;
}
public Object getValue() throws EvaluationException {
return this.resolveExpression().getValue();
}

9
spring-integration-core/src/main/java/org/springframework/integration/expression/ExpressionEvalMap.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2019 the original author or authors.
* Copyright 2013-2024 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.
@@ -181,13 +181,11 @@ public final class ExpressionEvalMap extends AbstractMap<String, Object> {
throw new UnsupportedOperationException();
}
public static ExpressionEvalMapBuilder from(Map<String, ?> expressions) {
Assert.notNull(expressions, "'expressions' must not be null.");
return new ExpressionEvalMapBuilder(expressions);
}
/**
* Implementations of this interface can be provided to build 'on demand {@link #get(Object)} logic'
* for {@link ExpressionEvalMap}.
@@ -200,7 +198,6 @@ public final class ExpressionEvalMap extends AbstractMap<String, Object> {
}
/**
* The {@link EvaluationCallback} implementation which evaluates an expression using
* the provided {@code context}, {@code root} and {@code returnType} variables.
@@ -242,7 +239,6 @@ public final class ExpressionEvalMap extends AbstractMap<String, Object> {
}
/**
* The builder class to instantiate {@link ExpressionEvalMap}.
*/
@@ -299,7 +295,6 @@ public final class ExpressionEvalMap extends AbstractMap<String, Object> {
}
private class ExpressionEvalMapFinalBuilderImpl implements ExpressionEvalMapFinalBuilder {
ExpressionEvalMapFinalBuilderImpl() {
@@ -321,7 +316,6 @@ public final class ExpressionEvalMap extends AbstractMap<String, Object> {
}
private class ExpressionEvalMapComponentsBuilderImpl extends ExpressionEvalMapFinalBuilderImpl
implements ExpressionEvalMapComponentsBuilder {
@@ -354,7 +348,6 @@ public final class ExpressionEvalMap extends AbstractMap<String, Object> {
}
public interface ExpressionEvalMapComponentsBuilder extends ExpressionEvalMapFinalBuilder {
ExpressionEvalMapComponentsBuilder usingEvaluationContext(EvaluationContext context);

8
spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -77,7 +77,6 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
private static final String XML_SUFFIX = ".xml";
/**
* Cache to hold filename lists per Locale.
*/
@@ -115,7 +114,6 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
private ResourceLoader resourceLoader = new DefaultResourceLoader();
/**
* Set a single basename, following the basic ResourceBundle convention of
* not specifying file extension or language codes, but referring to a Spring
@@ -248,7 +246,6 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
this.resourceLoader = (resourceLoader != null ? resourceLoader : new DefaultResourceLoader());
}
/**
* Resolves the given key in the retrieved bundle files to an Expression.
*/
@@ -401,7 +398,6 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
return result;
}
/**
* Get a PropertiesHolder for the given filename, either from the
* cache or freshly loaded.
@@ -553,7 +549,6 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
}
}
/**
* Clear the resource bundle cache.
* Subsequent resolve calls will lead to reloading of the properties files.
@@ -582,7 +577,6 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
return getClass().getName() + ": basenames=[" + StringUtils.arrayToCommaDelimitedString(this.basenames) + "]";
}
/**
* PropertiesHolder for caching.
* Stores the last-modified timestamp of the source file for efficient

4
spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -40,13 +40,11 @@ public abstract class AbstractMessageProcessingSelector
private final MessageProcessor<Boolean> messageProcessor;
public AbstractMessageProcessingSelector(MessageProcessor<Boolean> messageProcessor) {
Assert.notNull(messageProcessor, "messageProcessor must not be null");
this.messageProcessor = messageProcessor;
}
public void setConversionService(ConversionService conversionService) {
if (this.messageProcessor instanceof AbstractMessageProcessor) {
((AbstractMessageProcessor<Boolean>) this.messageProcessor).setConversionService(conversionService);

4
spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -66,7 +66,6 @@ public class MessageFilter extends AbstractReplyProducingPostProcessingMessageHa
this.selector = selector;
}
/**
* Specify whether this filter should throw a
* {@link MessageRejectedException} when its selector does not accept a
@@ -121,7 +120,6 @@ public class MessageFilter extends AbstractReplyProducingPostProcessingMessageHa
return this.discardChannel;
}
@Override
public String getComponentType() {
return "filter";

3
spring-integration-core/src/main/java/org/springframework/integration/gateway/AnnotationGatewayProxyFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2023 the original author or authors.
* Copyright 2017-2024 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.
@@ -108,7 +108,6 @@ public class AnnotationGatewayProxyFactoryBean<T> extends GatewayProxyFactoryBea
String defaultRequestTimeout = resolveAttribute("defaultRequestTimeout");
String defaultReplyTimeout = resolveAttribute("defaultReplyTimeout");
JavaUtils.INSTANCE
.acceptIfCondition(getDefaultRequestChannel() == null && getDefaultRequestChannelName() == null,
resolveAttribute("defaultRequestChannel"),

4
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -158,7 +158,6 @@ class GatewayMethodInboundMessageMapper implements InboundMessageMapper<Object[]
: mapper;
}
public void setPayloadExpression(Expression expressionString) {
this.payloadExpression = expressionString;
}
@@ -219,7 +218,6 @@ class GatewayMethodInboundMessageMapper implements InboundMessageMapper<Object[]
return expression.getValue(this.evaluationContext, argumentValue);
}
private void copyHeaders(Map<?, ?> argumentValue, Map<String, Object> headers) {
for (Entry<?, ?> entry : argumentValue.entrySet()) {
Object key = entry.getKey();

3
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -88,7 +88,6 @@ import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
/**
* Generates a proxy for the provided service interface to enable interaction
* with messaging components without application code being aware of them allowing

3
spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -155,7 +155,6 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
private volatile boolean initialized;
/**
* Construct an instance that will return null if no reply is received.
*/

3
spring-integration-core/src/main/java/org/springframework/integration/graph/IntegrationNode.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-2024 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.
@@ -159,4 +159,5 @@ public abstract class IntegrationNode {
public boolean isObserved() {
return this.observed;
}
}

3
spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -175,7 +175,6 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
@Nullable
protected abstract Object handleRequestMessage(Message<?> requestMessage);
/**
* An implementation of this interface is used to wrap the
* {@link AbstractReplyProducingMessageHandler#handleRequestMessage(Message)}

3
spring-integration-core/src/main/java/org/springframework/integration/handler/BridgeHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -55,4 +55,5 @@ public class BridgeHandler extends AbstractReplyProducingMessageHandler {
protected boolean shouldCopyRequestHeaders() {
return false;
}
}

3
spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandlerManagement.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -31,4 +31,5 @@ public interface DelayHandlerManagement {
@ManagedOperation
void reschedulePersistedMessages();
}

5
spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -100,17 +100,14 @@ public class ExpressionCommandMessageProcessor extends AbstractMessageProcessor<
throw new IllegalArgumentException("Message payload must be an Expression instance or an expression String.");
}
private static final class ExpressionCommandMethodResolver extends ReflectiveMethodResolver {
private final MethodFilter methodFilter;
ExpressionCommandMethodResolver(MethodFilter methodFilter) {
this.methodFilter = methodFilter;
}
@Override
public MethodExecutor resolve(EvaluationContext context,
Object targetObject, String name, List<TypeDescriptor> argumentTypes)

3
spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -37,7 +37,6 @@ public class ExpressionEvaluatingMessageHandler extends AbstractMessageHandler {
private String componentType;
public ExpressionEvaluatingMessageHandler(Expression expression) {
Assert.notNull(expression, "'expression' must not be null");
this.processor = new ExpressionEvaluatingMessageProcessor<>(expression, Void.class);

3
spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 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.
@@ -40,7 +40,6 @@ public class ExpressionEvaluatingMessageProcessor<T> extends AbstractMessageProc
private final Class<T> expectedType;
/**
* Create an {@link ExpressionEvaluatingMessageProcessor} for the given expression.
* @param expression The expression.

3
spring-integration-core/src/main/java/org/springframework/integration/handler/PostProcessingMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -18,7 +18,6 @@ package org.springframework.integration.handler;
import org.springframework.messaging.Message;
/**
* Implementations of this interface are subclasses of
* {@link AbstractMessageHandler} that perform post processing after the

4
spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -35,7 +35,6 @@ public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandl
private final MessageProcessor<?> processor;
public ServiceActivatingHandler(final Object object) {
this(new MethodInvokingMessageProcessor<>(object, ServiceActivator.class));
}
@@ -52,7 +51,6 @@ public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandl
this.processor = processor;
}
@Override
public String getComponentType() {
return "service-activator";

3
spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2022 the original author or authors.
* Copyright 2019-2024 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.
@@ -184,7 +184,6 @@ public class CacheRequestHandlerAdvice extends AbstractRequestHandlerAdvice
this.keyExpression = keyExpression;
}
@Override
public void afterSingletonsInstantiated() {
this.delegate.afterSingletonsInstantiated();

3
spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@@ -100,7 +100,6 @@ public class ErrorMessageSendingRecoverer extends ErrorMessagePublisher implemen
private static final long serialVersionUID = 1L;
RetryExceptionNotAvailableException(String description) {
super(description);
}

3
spring-integration-core/src/main/java/org/springframework/integration/handler/advice/HandleMessageAdviceAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2020 the original author or authors.
* Copyright 2020-2024 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.
@@ -42,7 +42,6 @@ public class HandleMessageAdviceAdapter implements HandleMessageAdvice {
this.delegate = delegate;
}
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
return this.delegate.invoke(invocation);

3
spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdvice.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 the original author or authors.
* Copyright 2019-2024 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.
@@ -135,7 +135,6 @@ public class RateLimiterRequestHandlerAdvice extends AbstractRequestHandlerAdvic
}
}
/**
* A {@link MessagingException} wrapper for the {@link RequestNotPermitted}
* with the {@code requestMessage} and {@code target} context.

3
spring-integration-core/src/main/java/org/springframework/integration/handler/support/MessagingMethodInvokerHelper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -638,7 +638,6 @@ public class MessagingMethodInvokerHelper extends AbstractExpressionEvaluator im
return new IllegalStateException("Cannot process message", evaluationException);
}
/*
* If there's a single method, it is SpEL only, the content is JSON,
* the payload is a String or byte[], the parameter doesn't match the payload,

Some files were not shown because too many files have changed in this diff Show More