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-09-04 11:40:23 -04:00
parent a95c76e4d7
commit e2d891a32d
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java
View File

@@ -445,18 +445,19 @@ public class JpaExecutor implements InitializingBean, BeanFactoryAware {
}
private Object executeOutboundJpaOperationOnPersistentMode(Message<?> message) {
Object payload = message.getPayload();
switch (this.persistMode) {
case PERSIST:
this.jpaOperations.persist(message.getPayload(), this.flushSize, this.clearOnFlush);
return message.getPayload();
this.jpaOperations.persist(payload, this.flushSize, this.clearOnFlush);
return payload;
case MERGE:
return this.jpaOperations.merge(message.getPayload(), this.flushSize, this.clearOnFlush);
return this.jpaOperations.merge(payload, this.flushSize, this.clearOnFlush);
case DELETE:
this.jpaOperations.delete(message.getPayload());
this.jpaOperations.delete(payload);
if (this.flush) {
this.jpaOperations.flush();
}
return message.getPayload();
return payload;
default:
throw new IllegalStateException("Unsupported PersistMode: " + this.persistMode.name());
}

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

@@ -16,6 +16,7 @@
package org.springframework.integration.rsocket.outbound;
import java.util.Arrays;
import java.util.Map;
import org.reactivestreams.Publisher;
@@ -95,9 +96,11 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
* @param route the RSocket endpoint route to use.
* @param routeVariables the variables to expand route template.
*/
public RSocketOutboundGateway(String route, Object... routeVariables) {
public RSocketOutboundGateway(String route, @Nullable Object... routeVariables) {
this(new ValueExpression<>(route));
this.routeVars = routeVariables;
if (routeVariables != null) {
this.routeVars = Arrays.copyOf(routeVariables, routeVariables.length);
}
}
/**