Skip to content

Commit 869c5c7

Browse files
artembilanartembilan
committed
Fix new Sonar smells
1 parent d5181bf commit 869c5c7

File tree

7 files changed

+69
-70
lines changed

7 files changed

+69
-70
lines changed

‎spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ protected MessageChannel obtainInputChannelFromFlow(IntegrationFlow flow) {
450450
* @param wireTapConfigurer the {@link Consumer} to accept options for the {@link WireTap}.
451451
* @return the current {@link BaseIntegrationFlowDefinition}.
452452
*/
453-
public B wireTap(String wireTapChannel, Consumer<WireTapSpec> wireTapConfigurer) {
453+
public B wireTap(String wireTapChannel, @Nullable Consumer<WireTapSpec> wireTapConfigurer) {
454454
DirectChannel internalWireTapChannel = new DirectChannel();
455455
addComponent(IntegrationFlow.from(internalWireTapChannel).channel(wireTapChannel).get());
456456
return wireTap(internalWireTapChannel, wireTapConfigurer);
@@ -639,7 +639,7 @@ public B transform(MessageProcessorSpec<?> messageProcessorSpec) {
639639
* @see MethodInvokingTransformer
640640
*/
641641
public B transform(MessageProcessorSpec<?> messageProcessorSpec,
642-
Consumer<GenericEndpointSpec<MessageTransformingHandler>> endpointConfigurer) {
642+
@Nullable Consumer<GenericEndpointSpec<MessageTransformingHandler>> endpointConfigurer) {
643643

644644
Assert.notNull(messageProcessorSpec, MESSAGE_PROCESSOR_SPEC_MUST_NOT_BE_NULL);
645645
MessageProcessor<?> processor = messageProcessorSpec.getObject();
@@ -1087,7 +1087,7 @@ public B handle(MessageProcessorSpec<?> messageProcessorSpec) {
10871087
* @return the current {@link BaseIntegrationFlowDefinition}.
10881088
*/
10891089
public B handle(MessageProcessorSpec<?> messageProcessorSpec,
1090-
Consumer<GenericEndpointSpec<ServiceActivatingHandler>> endpointConfigurer) {
1090+
@Nullable Consumer<GenericEndpointSpec<ServiceActivatingHandler>> endpointConfigurer) {
10911091

10921092
Assert.notNull(messageProcessorSpec, MESSAGE_PROCESSOR_SPEC_MUST_NOT_BE_NULL);
10931093
MessageProcessor<?> processor = messageProcessorSpec.getObject();
@@ -2362,7 +2362,7 @@ public <P> B log(String category, Function<Message<P>, Object> function) {
23622362
* @return the current {@link BaseIntegrationFlowDefinition}.
23632363
* @see #wireTap(WireTapSpec)
23642364
*/
2365-
public <P> B log(LoggingHandler.Level level, String category, Function<Message<P>, Object> function) {
2365+
public <P> B log(LoggingHandler.Level level, @Nullable String category, Function<Message<P>, Object> function) {
23662366
Assert.notNull(function, FUNCTION_MUST_NOT_BE_NULL);
23672367
return log(level, category, new FunctionExpression<>(function));
23682368
}
@@ -2650,7 +2650,7 @@ public <P> IntegrationFlow logAndReply(String category, Function<Message<P>, Obj
26502650
* @see #bridge()
26512651
*/
26522652
@Deprecated
2653-
public <P> IntegrationFlow logAndReply(LoggingHandler.Level level, String category,
2653+
public <P> IntegrationFlow logAndReply(LoggingHandler.Level level, @Nullable String category,
26542654
Function<Message<P>, Object> function) {
26552655

26562656
Assert.notNull(function, FUNCTION_MUST_NOT_BE_NULL);

‎spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ protected EndpointSpec(@Nullable H handler, F endpointFactoryBean) {
6161
}
6262

6363
@Override
64-
public S id(String id) {
65-
this.endpointFactoryBean.setBeanName(id);
64+
public S id(@Nullable String id) {
65+
if (id != null) {
66+
this.endpointFactoryBean.setBeanName(id);
67+
}
6668
return super.id(id);
6769
}
6870

‎spring-integration-core/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public HeaderEnricherSpec headerExpressions(MapBuilder<?, String, String> header
216216
* @param overwrite true to overwrite existing headers.
217217
* @return the header enricher spec.
218218
*/
219-
public HeaderEnricherSpec headerExpressions(MapBuilder<?, String, String> headers, Boolean overwrite) {
219+
public HeaderEnricherSpec headerExpressions(MapBuilder<?, String, String> headers, @Nullable Boolean overwrite) {
220220
Assert.notNull(headers, HEADERS_MUST_NOT_BE_NULL);
221221
return headerExpressions(headers.get(), overwrite);
222222
}
@@ -285,7 +285,7 @@ public HeaderEnricherSpec headerExpressions(Map<String, String> headers) {
285285
* @param overwrite true to overwrite existing headers.
286286
* @return the header enricher spec.
287287
*/
288-
public HeaderEnricherSpec headerExpressions(Map<String, String> headers, Boolean overwrite) {
288+
public HeaderEnricherSpec headerExpressions(Map<String, String> headers, @Nullable Boolean overwrite) {
289289
Assert.notNull(headers, HEADERS_MUST_NOT_BE_NULL);
290290
for (Entry<String, String> entry : headers.entrySet()) {
291291
AbstractHeaderValueMessageProcessor<Object> processor =
@@ -314,7 +314,7 @@ public HeaderEnricherSpec correlationId(Object correlationId) {
314314
* @return the header enricher spec.
315315
* @since 5.2
316316
*/
317-
public HeaderEnricherSpec correlationId(Object correlationId, Boolean overwrite) {
317+
public HeaderEnricherSpec correlationId(Object correlationId, @Nullable Boolean overwrite) {
318318
return header(IntegrationMessageHeaderAccessor.CORRELATION_ID, correlationId, overwrite);
319319
}
320320

@@ -341,7 +341,7 @@ public HeaderEnricherSpec correlationIdExpression(String correlationIdExpression
341341
* @return the header enricher spec.
342342
* @since 5.2
343343
*/
344-
public HeaderEnricherSpec correlationIdExpression(String correlationIdExpression, Boolean overwrite) {
344+
public HeaderEnricherSpec correlationIdExpression(String correlationIdExpression, @Nullable Boolean overwrite) {
345345
return headerExpression(IntegrationMessageHeaderAccessor.CORRELATION_ID, correlationIdExpression, overwrite);
346346
}
347347

@@ -371,7 +371,7 @@ public <P> HeaderEnricherSpec correlationIdFunction(Function<Message<P>, Object>
371371
* @see FunctionExpression
372372
*/
373373
public <P> HeaderEnricherSpec correlationIdFunction(Function<Message<P>, ?> correlationIdFunction,
374-
Boolean overwrite) {
374+
@Nullable Boolean overwrite) {
375375

376376
return headerFunction(IntegrationMessageHeaderAccessor.CORRELATION_ID, correlationIdFunction, overwrite);
377377
}
@@ -394,7 +394,7 @@ public HeaderEnricherSpec replyChannel(Object replyChannel) {
394394
* @return the header enricher spec.
395395
* @since 5.2
396396
*/
397-
public HeaderEnricherSpec replyChannel(Object replyChannel, Boolean overwrite) {
397+
public HeaderEnricherSpec replyChannel(Object replyChannel, @Nullable Boolean overwrite) {
398398
return header(MessageHeaders.REPLY_CHANNEL, replyChannel, overwrite);
399399
}
400400

@@ -419,7 +419,7 @@ public HeaderEnricherSpec replyChannelExpression(String replyChannelExpression)
419419
* @return the header enricher spec.
420420
* @since 5.2
421421
*/
422-
public HeaderEnricherSpec replyChannelExpression(String replyChannelExpression, Boolean overwrite) {
422+
public HeaderEnricherSpec replyChannelExpression(String replyChannelExpression, @Nullable Boolean overwrite) {
423423
return headerExpression(MessageHeaders.REPLY_CHANNEL, replyChannelExpression, overwrite);
424424
}
425425

@@ -449,7 +449,7 @@ public <P> HeaderEnricherSpec replyChannelFunction(Function<Message<P>, Object>
449449
* @see FunctionExpression
450450
*/
451451
public <P> HeaderEnricherSpec replyChannelFunction(Function<Message<P>, ?> replyChannelFunction,
452-
Boolean overwrite) {
452+
@Nullable Boolean overwrite) {
453453

454454
return headerFunction(MessageHeaders.REPLY_CHANNEL, replyChannelFunction, overwrite);
455455
}
@@ -472,7 +472,7 @@ public HeaderEnricherSpec errorChannel(Object errorChannel) {
472472
* @return the header enricher spec.
473473
* @since 5.2
474474
*/
475-
public HeaderEnricherSpec errorChannel(Object errorChannel, Boolean overwrite) {
475+
public HeaderEnricherSpec errorChannel(Object errorChannel, @Nullable Boolean overwrite) {
476476
return header(MessageHeaders.ERROR_CHANNEL, errorChannel, overwrite);
477477
}
478478

@@ -497,7 +497,7 @@ public HeaderEnricherSpec errorChannelExpression(String errorChannelExpression)
497497
* @return the header enricher spec.
498498
* @since 5.2
499499
*/
500-
public HeaderEnricherSpec errorChannelExpression(String errorChannelExpression, Boolean overwrite) {
500+
public HeaderEnricherSpec errorChannelExpression(String errorChannelExpression, @Nullable Boolean overwrite) {
501501
return headerExpression(MessageHeaders.ERROR_CHANNEL, errorChannelExpression, overwrite);
502502
}
503503

@@ -527,7 +527,7 @@ public <P> HeaderEnricherSpec errorChannelFunction(Function<Message<P>, Object>
527527
* @see FunctionExpression
528528
*/
529529
public <P> HeaderEnricherSpec errorChannelFunction(Function<Message<P>, ?> errorChannelFunction,
530-
Boolean overwrite) {
530+
@Nullable Boolean overwrite) {
531531

532532
return headerFunction(MessageHeaders.ERROR_CHANNEL, errorChannelFunction, overwrite);
533533
}
@@ -550,7 +550,7 @@ public HeaderEnricherSpec priority(Number priority) {
550550
* @return the header enricher spec.
551551
* @since 5.2
552552
*/
553-
public HeaderEnricherSpec priority(Number priority, Boolean overwrite) {
553+
public HeaderEnricherSpec priority(Number priority, @Nullable Boolean overwrite) {
554554
return header(IntegrationMessageHeaderAccessor.PRIORITY, priority, overwrite);
555555
}
556556

@@ -575,7 +575,7 @@ public HeaderEnricherSpec priorityExpression(String priorityExpression) {
575575
* @return the header enricher spec.
576576
* @since 5.2
577577
*/
578-
public HeaderEnricherSpec priorityExpression(String priorityExpression, Boolean overwrite) {
578+
public HeaderEnricherSpec priorityExpression(String priorityExpression, @Nullable Boolean overwrite) {
579579
return headerExpression(IntegrationMessageHeaderAccessor.PRIORITY, priorityExpression, overwrite);
580580
}
581581

@@ -604,7 +604,9 @@ public <P> HeaderEnricherSpec priorityFunction(Function<Message<P>, Object> prio
604604
* @since 5.2
605605
* @see FunctionExpression
606606
*/
607-
public <P> HeaderEnricherSpec priorityFunction(Function<Message<P>, ?> priorityFunction, Boolean overwrite) {
607+
public <P> HeaderEnricherSpec priorityFunction(Function<Message<P>, ?> priorityFunction,
608+
@Nullable Boolean overwrite) {
609+
608610
return headerFunction(IntegrationMessageHeaderAccessor.PRIORITY, priorityFunction, overwrite);
609611
}
610612

@@ -626,7 +628,7 @@ public HeaderEnricherSpec expirationDate(Object expirationDate) {
626628
* @return the header enricher spec.
627629
* @since 5.2
628630
*/
629-
public HeaderEnricherSpec expirationDate(Object expirationDate, Boolean overwrite) {
631+
public HeaderEnricherSpec expirationDate(Object expirationDate, @Nullable Boolean overwrite) {
630632
return header(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, expirationDate, overwrite);
631633
}
632634

@@ -653,7 +655,7 @@ public HeaderEnricherSpec expirationDateExpression(String expirationDateExpressi
653655
* @return the header enricher spec.
654656
* @since 5.2
655657
*/
656-
public HeaderEnricherSpec expirationDateExpression(String expirationDateExpression, Boolean overwrite) {
658+
public HeaderEnricherSpec expirationDateExpression(String expirationDateExpression, @Nullable Boolean overwrite) {
657659
return headerExpression(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, expirationDateExpression, overwrite);
658660
}
659661

@@ -683,7 +685,7 @@ public <P> HeaderEnricherSpec expirationDateFunction(Function<Message<P>, Object
683685
* @see FunctionExpression
684686
*/
685687
public <P> HeaderEnricherSpec expirationDateFunction(Function<Message<P>, ?> expirationDateFunction,
686-
Boolean overwrite) {
688+
@Nullable Boolean overwrite) {
687689

688690
return headerFunction(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, expirationDateFunction, overwrite);
689691
}
@@ -726,7 +728,7 @@ public HeaderEnricherSpec routingSlip(Object... routingSlipPath) {
726728
* @return the header enricher spec.
727729
* @since 5.2
728730
*/
729-
public HeaderEnricherSpec routingSlip(Boolean overwrite, Object... routingSlipPath) {
731+
public HeaderEnricherSpec routingSlip(@Nullable Boolean overwrite, Object... routingSlipPath) {
730732
RoutingSlipHeaderValueMessageProcessor routingSlipHeaderValueMessageProcessor =
731733
new RoutingSlipHeaderValueMessageProcessor(routingSlipPath);
732734
routingSlipHeaderValueMessageProcessor.setOverwrite(overwrite);

‎spring-integration-core/src/main/java/org/springframework/integration/dsl/RecipientListRouterSpec.java

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected RecipientListRouterSpec() {
4242
}
4343

4444
/**
45-
* Adds a recipient channel that always will be selected.
45+
* Adds a recipient channel that is always selected.
4646
* @param channelName the channel name.
4747
* @return the router spec.
4848
*/
@@ -51,12 +51,12 @@ public RecipientListRouterSpec recipient(String channelName) {
5151
}
5252

5353
/**
54-
* Adds a recipient channel that will be selected if the the expression evaluates to 'true'.
54+
* Adds a recipient channel that will be selected if the expression evaluates to 'true'.
5555
* @param channelName the channel name.
5656
* @param expression the expression.
5757
* @return the router spec.
5858
*/
59-
public RecipientListRouterSpec recipient(String channelName, String expression) {
59+
public RecipientListRouterSpec recipient(String channelName, @Nullable String expression) {
6060
if (StringUtils.hasText(expression)) {
6161
return recipient(channelName, PARSER.parseExpression(expression));
6262
}
@@ -67,7 +67,7 @@ public RecipientListRouterSpec recipient(String channelName, String expression)
6767
}
6868

6969
/**
70-
* Adds a recipient channel that will be selected if the the expression evaluates to 'true'.
70+
* Adds a recipient channel that will be selected if the expression evaluates to 'true'.
7171
* @param channelName the channel name.
7272
* @param expression the expression.
7373
* @return the router spec.
@@ -80,7 +80,7 @@ public RecipientListRouterSpec recipient(String channelName, Expression expressi
8080
}
8181

8282
/**
83-
* Adds a recipient channel that will be selected if the the selector's accept method returns 'true'.
83+
* Adds a recipient channel that will be selected if the selector's accept method returns 'true'.
8484
* @param channelName the channel name.
8585
* @param selector the selector.
8686
* @return the router spec.
@@ -129,7 +129,13 @@ public RecipientListRouterSpec recipient(MessageChannel channel) {
129129
* @return the router spec.
130130
*/
131131
public RecipientListRouterSpec recipient(MessageChannel channel, @Nullable String expression) {
132-
return recipient(channel, StringUtils.hasText(expression) ? PARSER.parseExpression(expression) : null);
132+
if (StringUtils.hasText(expression)) {
133+
return recipient(channel, PARSER.parseExpression(expression));
134+
}
135+
else {
136+
this.handler.addRecipient(channel);
137+
return this;
138+
}
133139
}
134140

135141
/**
@@ -138,16 +144,11 @@ public RecipientListRouterSpec recipient(MessageChannel channel, @Nullable Strin
138144
* @param expression the expression.
139145
* @return the router spec.
140146
*/
141-
public RecipientListRouterSpec recipient(MessageChannel channel, @Nullable Expression expression) {
142-
if (expression != null) {
143-
ExpressionEvaluatingSelector selector = new ExpressionEvaluatingSelector(expression);
144-
this.handler.addRecipient(channel, selector);
145-
this.componentsToRegister.put(selector, null);
146-
}
147-
else {
148-
this.handler.addRecipient(channel);
149-
}
150-
return _this();
147+
public RecipientListRouterSpec recipient(MessageChannel channel, Expression expression) {
148+
ExpressionEvaluatingSelector selector = new ExpressionEvaluatingSelector(expression);
149+
this.handler.addRecipient(channel, selector);
150+
this.componentsToRegister.put(selector, null);
151+
return this;
151152
}
152153

153154
/**
@@ -170,7 +171,7 @@ public RecipientListRouterSpec recipientMessageSelector(MessageChannel channel,
170171
public <P> RecipientListRouterSpec recipient(MessageChannel channel, GenericSelector<P> selector) {
171172
MessageSelector messageSelector = wrapToMessageSelectorIfNecessary(selector);
172173
this.handler.addRecipient(channel, messageSelector);
173-
return _this();
174+
return this;
174175
}
175176

176177
/**
@@ -212,7 +213,13 @@ public RecipientListRouterSpec recipientFlow(IntegrationFlow subFlow) {
212213
* @return the router spec.
213214
*/
214215
public RecipientListRouterSpec recipientFlow(@Nullable String expression, IntegrationFlow subFlow) {
215-
return recipientFlow(StringUtils.hasText(expression) ? PARSER.parseExpression(expression) : null, subFlow);
216+
if (StringUtils.hasText(expression)) {
217+
return recipientFlow(PARSER.parseExpression(expression), subFlow);
218+
}
219+
else {
220+
MessageChannel channel = obtainInputChannelFromFlow(subFlow);
221+
return recipient(channel);
222+
}
216223
}
217224

218225
/**
@@ -221,7 +228,7 @@ public RecipientListRouterSpec recipientFlow(@Nullable String expression, Integr
221228
* @param subFlow the subflow.
222229
* @return the router spec.
223230
*/
224-
public RecipientListRouterSpec recipientFlow(@Nullable Expression expression, IntegrationFlow subFlow) {
231+
public RecipientListRouterSpec recipientFlow(Expression expression, IntegrationFlow subFlow) {
225232
MessageChannel channel = obtainInputChannelFromFlow(subFlow);
226233
return recipient(channel, expression);
227234
}

‎spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ public void start() {
136136
ListIterator<Object> iterator = components.listIterator(this.integrationComponents.size());
137137
while (iterator.hasPrevious()) {
138138
Object component = iterator.previous();
139-
if (component instanceof SmartLifecycle) {
140-
((SmartLifecycle) component).start();
139+
if (component instanceof SmartLifecycle lifecycle) {
140+
lifecycle.start();
141141
}
142142
}
143143
this.running = true;
@@ -148,11 +148,9 @@ public void start() {
148148
public void stop(Runnable callback) {
149149
AggregatingCallback aggregatingCallback = new AggregatingCallback(this.integrationComponents.size(), callback);
150150
for (Object component : this.integrationComponents.keySet()) {
151-
if (component instanceof SmartLifecycle lifecycle) {
152-
if (lifecycle.isRunning()) {
153-
lifecycle.stop(aggregatingCallback);
154-
continue;
155-
}
151+
if (component instanceof SmartLifecycle lifecycle && lifecycle.isRunning()) {
152+
lifecycle.stop(aggregatingCallback);
153+
continue;
156154
}
157155
aggregatingCallback.run();
158156
}
@@ -162,10 +160,8 @@ public void stop(Runnable callback) {
162160
@Override
163161
public void stop() {
164162
for (Object component : this.integrationComponents.keySet()) {
165-
if (component instanceof SmartLifecycle lifecycle) {
166-
if (lifecycle.isRunning()) {
167-
lifecycle.stop();
168-
}
163+
if (component instanceof SmartLifecycle lifecycle && lifecycle.isRunning()) {
164+
lifecycle.stop();
169165
}
170166
}
171167
this.running = false;

0 commit comments

Comments
 (0)