Skip to content

Commit c155d5d

Browse files
committed
Add EmptyLineSeparator Checkstyle rule
* Support "blank lines around" via `spring-framework.xml` IDEA config * Fix all the Checkstyle violations
1 parent f71a223 commit c155d5d

File tree

932 files changed

+1341
-2485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

932 files changed

+1341
-2485
lines changed

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractSubscribableAmqpChannel.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -181,12 +181,12 @@ public void onInit() {
181181
this.container.setQueueNames(queue);
182182
MessageConverter converter =
183183
(getAmqpTemplate() instanceof RabbitTemplate rabbitTemplate)
184-
? rabbitTemplate.getMessageConverter()
185-
: new SimpleMessageConverter();
184+
? rabbitTemplate.getMessageConverter()
185+
: new SimpleMessageConverter();
186186

187187
MessageListener listener =
188188
new DispatchingMessageListener(converter, this.dispatcher, this, this.isPubSub,
189-
getMessageBuilderFactory(), getInboundHeaderMapper());
189+
getMessageBuilderFactory(), getInboundHeaderMapper());
190190
this.container.setMessageListener(listener);
191191
if (!this.container.isActive()) {
192192
this.container.afterPropertiesSet();
@@ -261,7 +261,6 @@ public void destroy() {
261261

262262
protected abstract String obtainQueueName(String channelName);
263263

264-
265264
private static final class DispatchingMessageListener implements MessageListener {
266265

267266
private final Log logger = LogFactory.getLog(DispatchingMessageListener.class);
@@ -292,7 +291,6 @@ private DispatchingMessageListener(MessageConverter converter,
292291
this.inboundHeaderMapper = inboundHeaderMapper;
293292
}
294293

295-
296294
@Override
297295
public void onMessage(org.springframework.amqp.core.Message message) {
298296
Message<?> messageToSend = null;

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PointToPointSubscribableAmqpChannel.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -55,7 +55,6 @@ public PointToPointSubscribableAmqpChannel(String channelName, AbstractMessageLi
5555
super(channelName, container, amqpTemplate);
5656
}
5757

58-
5958
/**
6059
* Construct an instance with the supplied name, container and template; default header
6160
* mappers will be used if the message is mapped.
@@ -73,7 +72,6 @@ public PointToPointSubscribableAmqpChannel(String channelName, AbstractMessageLi
7372
super(channelName, container, amqpTemplate, outboundMapper, inboundMapper);
7473
}
7574

76-
7775
/**
7876
* Provide a Queue name to be used. If this is not provided,
7977
* the Queue's name will be the same as the channel name.

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -93,7 +93,6 @@ public PollableAmqpChannel(String channelName, AmqpTemplate amqpTemplate, AmqpHe
9393
this.channelName = channelName;
9494
}
9595

96-
9796
/**
9897
* Provide an explicitly configured queue name. If this is not provided, then a Queue will be created
9998
* implicitly with the channelName as its name. The implicit creation will require that either an AmqpAdmin
@@ -286,7 +285,6 @@ private CounterFacade buildReceiveCounter(MetricsCaptor metricsCaptor, @Nullable
286285
return counterFacade;
287286
}
288287

289-
290288
@Override
291289
public void setInterceptors(List<ChannelInterceptor> interceptors) {
292290
super.setInterceptors(interceptors);

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PublishSubscribeAmqpChannel.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -77,7 +77,6 @@ public PublishSubscribeAmqpChannel(String channelName, AbstractMessageListenerCo
7777
super(channelName, container, amqpTemplate, true, outboundMapper, inboundMapper);
7878
}
7979

80-
8180
/**
8281
* Configure the FanoutExchange instance. If this is not provided, then a
8382
* FanoutExchange will be declared implicitly, and its name will be the same

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -72,16 +72,13 @@ abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefini
7272
"transaction-manager"
7373
};
7474

75-
7675
private final String adapterClassName;
7776

78-
7977
AbstractAmqpInboundAdapterParser(String adapterClassName) {
8078
Assert.hasText(adapterClassName, "adapterClassName is required");
8179
this.adapterClassName = adapterClassName;
8280
}
8381

84-
8582
@Override
8683
protected final String getBeanClassName(Element element) {
8784
return this.adapterClassName;

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpChannelFactoryBean.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -148,7 +148,6 @@ public AmqpChannelFactoryBean(boolean messageDriven) {
148148
this.messageDriven = messageDriven;
149149
}
150150

151-
152151
@Override
153152
public void setBeanName(@Nullable String name) {
154153
this.beanName = name;

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@ public class AmqpInboundGatewayParser extends AbstractAmqpInboundAdapterParser {
3939
super(AmqpInboundGateway.class.getName());
4040
}
4141

42-
4342
@Override
4443
protected void configureChannels(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
4544
String amqpTemplateRef = element.getAttribute("amqp-template");

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/Amqp.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2022 the original author or authors.
2+
* Copyright 2014-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -64,7 +64,6 @@ public static AmqpInboundGatewaySMLCSpec inboundGateway(ConnectionFactory connec
6464
return inboundGateway(listenerContainer, amqpTemplate);
6565
}
6666

67-
6867
/**
6968
* Create an initial {@link AmqpInboundGatewaySpec}.
7069
* @param connectionFactory the connectionFactory.

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2022 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -271,7 +271,6 @@ public S delayFunction(Function<Message<?>, Integer> delayFunction) {
271271
return delayExpression(new FunctionExpression<>(delayFunction));
272272
}
273273

274-
275274
/**
276275
* Set the SpEL expression to calculate the {@code x-delay} header when using the
277276
* RabbitMQ delayed message exchange plugin.

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSMLCSpec.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2023 the original author or authors.
2+
* Copyright 2017-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -55,4 +55,5 @@ public AmqpInboundChannelAdapterSMLCSpec batchMode(BatchMode batchMode) {
5555
this.target.setBatchMode(batchMode);
5656
return this;
5757
}
58+
5859
}

0 commit comments

Comments
 (0)