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

Fix new Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2021-10-07 10:59:43 -04:00
parent e2557a42c2
commit 34d2b0904f
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaProducerMessageHandlerSpec.java
View File

@@ -21,8 +21,6 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.springframework.expression.Expression;
import org.springframework.expression.common.LiteralExpression;
import org.springframework.integration.dsl.ComponentsRegistration;
@@ -239,8 +237,8 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
}
/**
* Configure a SpEL expression to determine whether or not to flush the producer after
* a send. By default the producer is flushed if a header {@code kafka_flush} has a
* Configure a SpEL expression to determine whether to flush the producer after
* a send. By default, the producer is flushed if a header {@code kafka_flush} has a
* value {@link Boolean#TRUE}.
* @param flushExpression the timestamp expression to use.
* @return the spec.
@@ -251,8 +249,8 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
/**
* Configure a {@link Function} that will be invoked at runtime to determine whether
* or not to flush the producer after a send. By default the producer is flushed if a
* header {@code kafka_flush} has a value {@link Boolean#TRUE}. Typically used with a
* to flush the producer after send. By default, the producer is flushed if a
* header {@code kafka_flush} has a value {@link Boolean#TRUE}. Typically, used with a
* Java 8 Lambda expression:
* <pre class="code">
* {@code
@@ -268,8 +266,8 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
}
/**
* Configure an {@link Expression} to determine whether or not to flush the producer
* after a send. By default the producer is flushed if a header {@code kafka_flush}
* Configure an {@link Expression} to determine whether to flush the producer
* after a send. By default, the producer is flushed if a header {@code kafka_flush}
* has a value {@link Boolean#TRUE}.
* @param flushExpression the timestamp expression to use.
* @return the spec.
@@ -293,7 +291,7 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
/**
* Specify a timeout in milliseconds how long {@link KafkaProducerMessageHandler}
* should wait wait for send operation results. Defaults to 10 seconds.
* should wait for send operation results. Defaults to 10 seconds.
* @param sendTimeout the timeout to wait for result fo send operation.
* @return the spec.
*/
@@ -379,8 +377,8 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
}
/**
* Set a {@link ProducerRecordCreator} to create the {@link ProducerRecord}. Ignored
* if {@link #useTemplateConverter(boolean) useTemplateConverter} is true.
* Set a {@link ProducerRecordCreator} to create the {@link org.apache.kafka.clients.producer.ProducerRecord}.
* Ignored if {@link #useTemplateConverter(boolean) useTemplateConverter} is true.
* @param creator the creator.
* @return the spec.
* @since 5.5.5
@@ -392,7 +390,7 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
/**
* Set to true to use the template's message converter to create the
* {@link ProducerRecord} instead of the
* {@link org.apache.kafka.clients.producer.ProducerRecord} instead of the
* {@link #producerRecordCreator(ProducerRecordCreator) producerRecordCreator}.
* @param use true to use the converter.
* @return the spec.
@@ -409,7 +407,8 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
* @param <K> the key type.
* @param <V> the value type.
*/
public static class KafkaProducerMessageHandlerTemplateSpec<K, V> extends KafkaProducerMessageHandlerSpec<K, V, KafkaProducerMessageHandlerTemplateSpec<K, V>>
public static class KafkaProducerMessageHandlerTemplateSpec<K, V>
extends KafkaProducerMessageHandlerSpec<K, V, KafkaProducerMessageHandlerTemplateSpec<K, V>>
implements ComponentsRegistration {
private final KafkaTemplateSpec<K, V> kafkaTemplateSpec;
@@ -428,6 +427,7 @@ public class KafkaProducerMessageHandlerSpec<K, V, S extends KafkaProducerMessag
*/
public KafkaProducerMessageHandlerTemplateSpec<K, V> configureKafkaTemplate(
Consumer<KafkaTemplateSpec<K, V>> configurer) {
Assert.notNull(configurer, "The 'configurer' cannot be null");
configurer.accept(this.kafkaTemplateSpec);
return _this();

6
spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageSource.java
View File

@@ -138,8 +138,6 @@ public class KafkaMessageSource<K, V> extends AbstractMessageSource<Object> impl
private Duration closeTimeout = Duration.ofSeconds(DEFAULT_CLOSE_TIMEOUT);
public boolean newAssignment;
private volatile Consumer<K, V> consumer;
private volatile boolean pausing;
@@ -150,6 +148,8 @@ public class KafkaMessageSource<K, V> extends AbstractMessageSource<Object> impl
private volatile boolean stopped;
public volatile boolean newAssignment; // NOSONAR - direct access from inner
/**
* Construct an instance with the supplied parameters. Fetching multiple
* records per poll will be disabled.
@@ -415,7 +415,7 @@ public class KafkaMessageSource<K, V> extends AbstractMessageSource<Object> impl
return this.paused;
}
@Override
@Override // NOSONAR - not so complex
protected synchronized Object doReceive() {
if (this.stopped) {
this.logger.debug("Message source is stopped; no records will be returned");

2
spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
View File

@@ -254,7 +254,7 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
}
}
private synchronized void connectAndSubscribe() throws MqttException {
private synchronized void connectAndSubscribe() throws MqttException { // NOSONAR
MqttConnectOptions connectionOptions = this.clientFactory.getConnectionOptions();
this.cleanSession = connectionOptions.isCleanSession();
this.consumerStopAction = this.clientFactory.getConsumerStopAction();

9
spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
View File

@@ -17,6 +17,7 @@
package org.springframework.integration.mqtt.support;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -61,7 +62,9 @@ public class MqttHeaderMapper implements HeaderMapper<MqttProperties> {
*/
public void setInboundHeaderNames(String... inboundHeaderNames) {
Assert.notNull(inboundHeaderNames, "'inboundHeaderNames' must not be null");
this.inboundHeaderNames = inboundHeaderNames;
String[] copy = Arrays.copyOf(inboundHeaderNames, inboundHeaderNames.length);
Arrays.sort(copy);
this.inboundHeaderNames = copy;
}
/**
@@ -73,7 +76,9 @@ public class MqttHeaderMapper implements HeaderMapper<MqttProperties> {
*/
public void setOutboundHeaderNames(String... outboundHeaderNames) {
Assert.notNull(outboundHeaderNames, "'outboundHeaderNames' must not be null");
this.outboundHeaderNames = outboundHeaderNames;
String[] copy = Arrays.copyOf(outboundHeaderNames, outboundHeaderNames.length);
Arrays.sort(copy);
this.outboundHeaderNames = copy;
}
@Override