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

Fix new and some old Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2020-07-13 14:07:07 -04:00
parent 9223613ee1
commit 6e11d4cdf9
27 changed files with 287 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSource.java
View File

@@ -23,8 +23,6 @@ import org.reactivestreams.Publisher;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.FetchSpec;
import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
import org.springframework.data.relational.core.query.Query;
import org.springframework.expression.Expression;
import org.springframework.expression.TypeLocator;
import org.springframework.expression.common.LiteralExpression;
@@ -39,15 +37,13 @@ import reactor.core.publisher.Mono;
/**
* An instance of {@link org.springframework.integration.core.MessageSource} which returns
* a {@link org.springframework.messaging.Message} with a payload which is the result of
* execution of a {@link Query}. When {@code expectSingleResult} is false (default), the R2dbc
* {@link Query} is executed using {@link R2dbcEntityOperations#select(Query, Class)} method which
* returns a {@link reactor.core.publisher.Flux}.
* execution of query. When {@code expectSingleResult} is false (default), the R2DBC
* query is executed returning a {@link reactor.core.publisher.Flux}.
* The returned {@link reactor.core.publisher.Flux} will be used as the payload of the
* {@link org.springframework.messaging.Message} returned by the {@link #receive()}
* method.
* <p>
* When {@code expectSingleResult} is true, the {@link R2dbcEntityOperations#selectOne(Query, Class)} is
* used instead, and the message payload will be a {@link reactor.core.publisher.Mono}
* When {@code expectSingleResult} is true, the query is executed returning a {@link reactor.core.publisher.Mono}
* for the single object returned from the query.
*
* @author Rohan Mukesh
@@ -108,7 +104,7 @@ public class R2dbcMessageSource extends AbstractMessageSource<Publisher<?>> {
}
/**
* Provide a way to manage which find* method to invoke on {@link R2dbcEntityOperations}.
* Provide a way to return all the records matching criteria or only and only a one otherwise.
* Default is 'false', which means the {@link #receive()} method will use
* the {@link org.springframework.data.r2dbc.core.DatabaseClient#execute(String)} method and will fetch all. If set
* to 'true'{@link #receive()} will use {@link org.springframework.data.r2dbc.core.DatabaseClient#execute(String)}
@@ -140,7 +136,7 @@ public class R2dbcMessageSource extends AbstractMessageSource<Publisher<?>> {
}
/**
* Execute a {@link Query} returning its results as the Message payload.
* Execute a query returning its results as the Message payload.
* The payload can be either {@link reactor.core.publisher.Flux} or
* {@link reactor.core.publisher.Mono} of objects of type identified by {@link #payloadType},
* or a single element of type identified by {@link #payloadType}

7
spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandler.java
View File

@@ -204,13 +204,16 @@ public class R2dbcMessageHandler extends AbstractReactiveMessageHandler {
}
private String evaluateTableNameExpression(Message<?> message) {
String tableName = this.tableNameExpression.getValue(this.evaluationContext, message, String.class);
String tableName =
this.tableNameExpression.getValue(this.evaluationContext, message, String.class); // NOSONAR
Assert.notNull(tableName, "'tableNameExpression' must not evaluate to null");
return tableName;
}
@SuppressWarnings("unchecked")
private Map<String, Object> evaluateValuesExpression(Message<?> message) {
Assert.notNull(this.valuesExpression,
"'this.valuesExpression' must not be null when 'tableNameExpression' mode is used");
Map<String, Object> fieldValues =
(Map<String, Object>) this.valuesExpression.getValue(this.evaluationContext, message, Map.class);
Assert.notNull(fieldValues, "'valuesExpression' must not evaluate to null");
@@ -218,6 +221,8 @@ public class R2dbcMessageHandler extends AbstractReactiveMessageHandler {
}
private Criteria evaluateCriteriaExpression(Message<?> message) {
Assert.notNull(this.criteriaExpression,
"'this.criteriaExpression' must not be null when 'tableNameExpression' mode is used");
Criteria criteria =
this.criteriaExpression.getValue(this.evaluationContext, message, Criteria.class);
Assert.notNull(criteria, "'criteriaExpression' must not evaluate to null");