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

Fix some issue from Sonar report

Browse Source
This commit is contained in:
Artem Bilan
2022-11-02 17:49:02 -04:00
parent eec5f4dc72
commit 978724e212
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandler.java
View File

@@ -190,7 +190,7 @@ public class CassandraMessageHandler extends AbstractReplyProducingMessageHandle
protected Object handleRequestMessage(Message<?> requestMessage) {
Object payload = requestMessage.getPayload();
Type modeToUse = payload instanceof Statement ? modeToUse = Type.STATEMENT : this.mode;
Type modeToUse = payload instanceof Statement ? Type.STATEMENT : this.mode;
Mono<? extends WriteResult> result =
switch (modeToUse) {

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

@@ -115,7 +115,7 @@ class CoreRuntimeHints implements RuntimeHintsRegistrar {
ArrayList.class,
HashMap.class,
Properties.class,
Hashtable.class,
Hashtable.class, // NOSONAR
Exception.class,
UUID.class,
GenericMessage.class,

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

@@ -16,6 +16,7 @@
package org.springframework.integration.config;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -148,7 +149,7 @@ public class IntegrationManagementConfigurer
*/
public void setObservationPatterns(String... observationPatterns) {
Assert.notEmpty(observationPatterns, "'observationPatterns' must not be empty");
this.observationPatterns = observationPatterns;
this.observationPatterns = Arrays.copyOf(observationPatterns, observationPatterns.length);
}
@Override

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

@@ -542,7 +542,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
requestMessage = convertToRequestMessage(object, shouldConvert);
Message<?> replyMessage;
if (this.observationRegistry != ObservationRegistry.NOOP) {
if (!ObservationRegistry.NOOP.equals(this.observationRegistry)) {
replyMessage = sendAndReceiveWithObservation(channel, object, requestMessage);
}
else if (this.metricsCaptor != null) {
@@ -553,7 +553,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
}
reply = replyMessage;
if (shouldConvert) {
if (replyMessage != null && shouldConvert) {
reply = this.messagingTemplate.getMessageConverter().fromMessage(replyMessage, Object.class);
}
}
@@ -595,11 +595,14 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
() -> context, this.observationRegistry)
.observe(() -> {
Message<?> replyMessage = doSendAndReceive(requestChannel, object, requestMessage);
context.setResponse(replyMessage);
if (replyMessage != null) {
context.setResponse(replyMessage);
}
return replyMessage;
});
}
@Nullable
private Message<?> sendAndReceiveWithMetrics(MessageChannel requestChannel, Object object,
Message<?> requestMessage) {
@@ -609,12 +612,13 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
sample.stop(sendTimer());
return replyMessage;
}
catch (Throwable ex) {
catch (Exception ex) {
sample.stop(buildSendTimer(false, ex.getClass().getSimpleName()));
throw ex;
}
}
@Nullable
private Message<?> doSendAndReceive(MessageChannel requestChannel, Object object, Message<?> requestMessage) {
Message<?> replyMessage = this.messagingTemplate.sendAndReceive(requestChannel, requestMessage);
if (replyMessage == null && this.errorOnTimeout) {