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

Fix some Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2020-11-30 12:00:59 -05:00
parent c12acb9ff8
commit 97e1692a36
4 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java
View File

@@ -105,7 +105,7 @@ public class FluxMessageChannel extends AbstractMessageChannel
.filter(Boolean::booleanValue)
.doOnNext(this.subscribedSignal::tryEmitNext)
.repeatWhenEmpty((repeat) ->
this.active ? repeat.delayElements(Duration.ofMillis(100)) : repeat)
this.active ? repeat.delayElements(Duration.ofMillis(100)) : repeat) // NOSONAR
.subscribe());
}

32
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java
View File

@@ -105,24 +105,12 @@ public class TcpNetServerConnectionFactory extends AbstractServerConnectionFacto
*/
@Override
public void run() {
ServerSocket theServerSocket = null;
if (getListener() == null) {
logger.info(() -> this + " No listener bound to server connection factory; will not read; exiting...");
return;
}
try {
if (getLocalAddress() == null) {
theServerSocket = createServerSocket(super.getPort(), getBacklog(), null);
}
else {
InetAddress whichNic = InetAddress.getByName(getLocalAddress());
theServerSocket = createServerSocket(super.getPort(), getBacklog(), whichNic);
}
getTcpSocketSupport().postProcessServerSocket(theServerSocket);
this.serverSocket = theServerSocket;
setListening(true);
logger.info(() -> this + " Listening");
publishServerListeningEvent(getPort());
setupServerSocket();
while (true) {
final Socket socket;
/*
@@ -177,7 +165,7 @@ public class TcpNetServerConnectionFactory extends AbstractServerConnectionFacto
}
catch (IOException ex) { // NOSONAR flow control via exceptions
// don't log an error if we had a good socket once and now it's closed
if (ex instanceof SocketException && theServerSocket != null) { // NOSONAR flow control via exceptions
if (ex instanceof SocketException && this.serverSocket != null) { // NOSONAR flow control via exceptions
logger.info("Server Socket closed");
}
else if (isActive()) {
@@ -192,6 +180,22 @@ public class TcpNetServerConnectionFactory extends AbstractServerConnectionFacto
}
}
private void setupServerSocket() throws IOException {
ServerSocket theServerSocket;
if (getLocalAddress() == null) {
theServerSocket = createServerSocket(super.getPort(), getBacklog(), null);
}
else {
InetAddress whichNic = InetAddress.getByName(getLocalAddress());
theServerSocket = createServerSocket(super.getPort(), getBacklog(), whichNic);
}
getTcpSocketSupport().postProcessServerSocket(theServerSocket);
this.serverSocket = theServerSocket;
setListening(true);
logger.info(() -> this + " Listening");
publishServerListeningEvent(getPort());
}
/**
* Create a new {@link ServerSocket}. This default implementation uses the default
* {@link ServerSocketFactory}. Override to use some other mechanism

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

@@ -302,14 +302,7 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
int[] requestedQos = getQos();
int[] grantedQos = Arrays.copyOf(requestedQos, requestedQos.length);
this.client.subscribe(topics, grantedQos);
for (int i = 0; i < requestedQos.length; i++) {
if (grantedQos[i] != requestedQos[i]) {
logger.warn(() -> "Granted QOS different to Requested QOS; topics: " + Arrays.toString(topics)
+ " requested: " + Arrays.toString(requestedQos)
+ " granted: " + Arrays.toString(grantedQos));
break;
}
}
warnInvalidQosForSubscription(topics, requestedQos, grantedQos);
}
catch (MqttException ex) {
if (this.applicationEventPublisher != null) {
@@ -340,6 +333,17 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
}
}
private void warnInvalidQosForSubscription(String[] topics, int[] requestedQos, int[] grantedQos) {
for (int i = 0; i < requestedQos.length; i++) {
if (grantedQos[i] != requestedQos[i]) {
logger.warn(() -> "Granted QOS different to Requested QOS; topics: " + Arrays.toString(topics)
+ " requested: " + Arrays.toString(requestedQos)
+ " granted: " + Arrays.toString(grantedQos));
break;
}
}
}
private synchronized void cancelReconnect() {
if (this.reconnectFuture != null) {
this.reconnectFuture.cancel(false);

2
spring-integration-test-support/src/main/java/org/springframework/integration/test/mail/TestMailServer.java
View File

@@ -391,7 +391,7 @@ public final class TestMailServer {
LOGGER.error(IO_EXCEPTION, e);
}
}
}
} // NOSONAR
void searchReply(String tag) throws IOException {
if (seen) {