Skip to content

Simplify data access and parameter binding code #2394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ngocnhan-tran1996 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Simplify data access and parameter binding code #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions ...c/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import java.util.Optional;
import java.util.stream.Stream;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jspecify.annotations.Nullable;

import org.springframework.dao.EmptyResultDataAccessException;
Expand Down Expand Up @@ -72,8 +70,6 @@
*/
public class DefaultDataAccessStrategy implements DataAccessStrategy {

private final Log logger = LogFactory.getLog(getClass());

private final SqlGeneratorSource sqlGeneratorSource;
private final RelationalMappingContext context;
private final JdbcConverter converter;
Expand Down Expand Up @@ -155,11 +151,8 @@ public NamedParameterJdbcOperations getJdbcOperations() {
public <S> boolean update(S objectToSave, Class<S> domainType) {

SqlIdentifierParameterSource parameterSource = parametersFactory.forUpdate(objectToSave, domainType);
if (parameterSource.size() <= 1) {
return true; // returning true, because conceptually the one row was correctly updated
}

return operations.update(sql(domainType).getUpdate(), parameterSource) != 0;
return parameterSource.size() <= 1 // returning true, because conceptually the one row was correctly updated
|| operations.update(sql(domainType).getUpdate(), parameterSource) != 0;
}

@Override
Expand Down
19 changes: 0 additions & 19 deletions ...src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentExtractorSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,25 +266,6 @@ private void readEntity(RS row, RowDocument document, AggregatePath basePath,
}
}

/**
* Read properties of embedded from the result set and store them under their column names
*/
private void collectEmbeddedValues(RS row, RowDocument document, RelationalPersistentProperty property,
AggregatePath path) {

RelationalPersistentEntity<?> embeddedHolder = aggregateContext.getRequiredPersistentEntity(property);
for (RelationalPersistentProperty embeddedProperty : embeddedHolder) {

if (embeddedProperty.isQualified() || embeddedProperty.isCollectionLike() || embeddedProperty.isEntity()) {
// hell, no!
throw new UnsupportedOperationException("Reading maps and collections into embeddable isn't supported yet");
}

AggregatePath nested = path.append(embeddedProperty);
aggregateContext.collectValue(row, nested, document, nested.getColumnInfo().name());
}
}

@Override
boolean hasResult() {

Expand Down
5 changes: 2 additions & 3 deletions .../org/springframework/data/r2dbc/repository/query/ExpressionEvaluatingParameterBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class ExpressionEvaluatingParameterBinder {
*
* @param bindTarget must not be {@literal null}.
* @param parameterAccessor must not be {@literal null}.
* @param evaluator must not be {@literal null}.
*/
void bind(BindTarget bindTarget,
RelationalParameterAccessor parameterAccessor, ValueEvaluationContext evaluationContext) {
Expand Down Expand Up @@ -110,7 +109,7 @@ private void bindParameters(BindTarget bindSpec,

Optional<String> name = bindableParameter.getName();

if (name.isPresent() && (isNamedParameterReferencedFromQuery(name)) || !expressionQuery.getBindings().isEmpty()) {
if (name.isPresent() && isNamedParameterReferencedFromQuery(name) || !expressionQuery.getBindings().isEmpty()) {

if (!isNamedParameterReferencedFromQuery(name)) {
continue;
Expand Down Expand Up @@ -148,7 +147,7 @@ private org.springframework.r2dbc.core.Parameter getBindValue(org.springframewor

private boolean isNamedParameterReferencedFromQuery(Optional<String> name) {

if (!name.isPresent()) {
if (name.isEmpty()) {
return false;
}

Expand Down
Loading