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
2019-04-26 09:22:28 -04:00
parent ff958ae488
commit e977234844
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java
View File

@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import org.apache.commons.logging.Log;
@@ -53,11 +54,11 @@ import org.springframework.util.Assert;
public abstract class AbstractAggregatingMessageGroupProcessor implements MessageGroupProcessor,
BeanFactoryAware {
private final Log logger = LogFactory.getLog(this.getClass());
protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR - final
private volatile MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory();
private MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory();
private volatile boolean messageBuilderFactorySet;
private boolean messageBuilderFactorySet;
private BeanFactory beanFactory;
@@ -79,8 +80,7 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag
@Override
public final Object processMessageGroup(MessageGroup group) {
Assert.notNull(group, "MessageGroup must not be null");
Map<String, Object> headers = this.aggregateHeaders(group);
Map<String, Object> headers = aggregateHeaders(group);
Object payload = this.aggregatePayloads(group, headers);
AbstractIntegrationMessageBuilder<?> builder;
if (payload instanceof Message<?>) {
@@ -131,8 +131,7 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag
aggregatedHeaders.put(key, value);
}
else {
Object existingValue = aggregatedHeaders.get(key);
if (value != existingValue && (value == null || !value.equals(existingValue))) {
if (!Objects.equals(value, aggregatedHeaders.get(key))) {
conflictKeys.add(key);
}
}

14
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java
View File

@@ -34,9 +34,9 @@ import org.springframework.util.ClassUtils;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import io.rsocket.RSocket;
import io.rsocket.RSocketFactory;
import io.rsocket.transport.ClientTransport;
import reactor.core.Disposable;
import reactor.core.publisher.Mono;
/**
@@ -167,7 +167,9 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
@Override
public void destroy() {
super.destroy();
this.rSocketRequesterMono.block().rsocket().dispose();
this.rSocketRequesterMono.map(RSocketRequester::rsocket)
.doOnNext(Disposable::dispose)
.subscribe();
}
@Override
@@ -275,20 +277,20 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
public enum Command {
/**
* Perform {@link RSocket#fireAndForget fireAndForget}.
* Perform {@link io.rsocket.RSocket#fireAndForget fireAndForget}.
* @see RSocketRequester.ResponseSpec#send()
*/
fireAndForget,
/**
* Perform {@link RSocket#requestResponse requestResponse}.
* Perform {@link io.rsocket.RSocket#requestResponse requestResponse}.
* @see RSocketRequester.ResponseSpec#retrieveMono
*/
requestResponse,
/**
* Perform {@link RSocket#requestStream requestStream} or
* {@link RSocket#requestChannel requestChannel} depending on whether
* Perform {@link io.rsocket.RSocket#requestStream requestStream} or
* {@link io.rsocket.RSocket#requestChannel requestChannel} depending on whether
* the request input consists of a single or multiple payloads.
* @see RSocketRequester.ResponseSpec#retrieveFlux
*/