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

Polishing.

Browse Source 
Extract method in order to make the code more readable.

Switch to #xxx syntax for issue numbers instead of gh-xxx.

Original pull request #939
This commit is contained in:
Jens Schauder
2021-03-12 12:05:20 +01:00
parent 304345c4c8
commit 53bed2613b
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
View File

@@ -124,32 +124,36 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
String insertSql = sqlGenerator.getInsert(new HashSet<>(parameterSource.getIdentifiers()));
if (idValue == null) {
KeyHolder holder = new GeneratedKeyHolder();
IdGeneration idGeneration = sqlGeneratorSource.getDialect().getIdGeneration();
if (idGeneration.driverRequiresKeyColumnNames()) {
String[] keyColumnNames = getKeyColumnNames(domainType);
if (keyColumnNames.length == 0) {
operations.update(insertSql, parameterSource, holder);
} else {
operations.update(insertSql, parameterSource, holder, keyColumnNames);
}
} else {
operations.update(insertSql, parameterSource, holder);
}
return getIdFromHolder(holder, persistentEntity);
}
else {
return executeInsertAndReturnGeneratedId(domainType, persistentEntity, parameterSource, insertSql);
} else {
operations.update(insertSql, parameterSource);
return null;
}
}
@Nullable
private <T> Object executeInsertAndReturnGeneratedId(Class<T> domainType, RelationalPersistentEntity<T> persistentEntity, SqlIdentifierParameterSource parameterSource, String insertSql) {
KeyHolder holder = new GeneratedKeyHolder();
IdGeneration idGeneration = sqlGeneratorSource.getDialect().getIdGeneration();
if (idGeneration.driverRequiresKeyColumnNames()) {
String[] keyColumnNames = getKeyColumnNames(domainType);
if (keyColumnNames.length == 0) {
operations.update(insertSql, parameterSource, holder);
} else {
operations.update(insertSql, parameterSource, holder, keyColumnNames);
}
} else {
operations.update(insertSql, parameterSource, holder);
}
return getIdFromHolder(holder, persistentEntity);
}
/*
* (non-Javadoc)
* @see org.springframework.data.jdbc.core.DataAccessStrategy#update(java.lang.Object, java.lang.Class)
@@ -462,6 +466,10 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
return parameters;
}
/**
* Returns the id value if its not a primitive zero. Returns {@literal null} if the id value is null or a primitive
* zero.
*/
@Nullable
@SuppressWarnings("unchecked")
private <S, ID> ID getIdValueOrNull(S instance, RelationalPersistentEntity<S> persistentEntity) {

4
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java
View File

@@ -193,7 +193,7 @@ public class DefaultDataAccessStrategyUnitTests {
assertThat(paramSourceCaptor.getValue().getValue("DUMMYENTITYROOT")).isEqualTo(rawId);
}
@Test // gh-933
@Test // #933
public void insertWithDefinedIdDoesNotRetrieveGeneratedKeys() {
Object generatedId = accessStrategy.insert(new DummyEntity(ORIGINAL_ID), DummyEntity.class, Identifier.from(additionalParameters));
@@ -204,7 +204,7 @@ public class DefaultDataAccessStrategyUnitTests {
paramSourceCaptor.capture());
}
@Test // gh-933
@Test // #933
public void insertWithUndefinedIdRetrievesGeneratedKeys() {
when(namedJdbcOperations.update(any(), any(), any()))

2
spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/ConditionsUnitTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
*/
class ConditionsUnitTests {
@Test // gh-916
@Test // #916
void notInOfColumnAndExpression() {
Table table = Table.create("t");