Skip to content

Commit 58a67ce

Browse files
committed
Polishing.
Added `@author` tags. Undo the change in behaviour of getReference(IdentifierProcessing). See #1110 Original pull request #1458
1 parent 18eda61 commit 58a67ce

File tree

15 files changed

+33
-18
lines changed

15 files changed

+33
-18
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IdGeneratingBatchInsertStrategy.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* not support id generation for batch operations, this implementation falls back to performing the inserts serially.
3333
*
3434
* @author Chirag Tailor
35+
* @author Kurt Niemi
3536
* @since 2.4
3637
*/
3738
class IdGeneratingBatchInsertStrategy implements BatchInsertStrategy {

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IdGeneratingInsertStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* An {@link InsertStrategy} that expects an id to be generated from the insert.
3434
*
3535
* @author Chirag Tailor
36+
* @author Kurt Niemi
3637
* @since 2.4
3738
*/
3839
class IdGeneratingInsertStrategy implements InsertStrategy {
@@ -84,8 +85,7 @@ public Object execute(String sql, SqlParameterSource sqlParameterSource) {
8485
}
8586

8687
private String[] getKeyColumnNames() {
87-
return Optional.ofNullable(idColumn)
88-
.map(idColumn -> new String[] { idColumn.getReference() })
88+
return Optional.ofNullable(idColumn).map(idColumn -> new String[] { idColumn.getReference() })
8989
.orElse(new String[0]);
9090
}
9191
}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcBackReferencePropertyValueProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* the value in the resultset under which other entities refer back to it.
2626
*
2727
* @author Jens Schauder
28+
* @author Kurt Niemi
2829
* @since 2.0
2930
*/
3031
class JdbcBackReferencePropertyValueProvider implements PropertyValueProvider<RelationalPersistentProperty> {
@@ -49,8 +50,7 @@ class JdbcBackReferencePropertyValueProvider implements PropertyValueProvider<Re
4950

5051
@Override
5152
public <T> T getPropertyValue(RelationalPersistentProperty property) {
52-
return (T) resultSet
53-
.getObject(basePath.extendBy(property).getReverseColumnNameAlias().getReference());
53+
return (T) resultSet.getObject(basePath.extendBy(property).getReverseColumnNameAlias().getReference());
5454
}
5555

5656
public JdbcBackReferencePropertyValueProvider extendBy(RelationalPersistentProperty property) {

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcPropertyValueProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* {@link PropertyValueProvider} obtaining values from a {@link ResultSetAccessor}.
2525
*
2626
* @author Jens Schauder
27+
* @author Kurt Niemi
2728
* @since 2.0
2829
*/
2930
class JdbcPropertyValueProvider implements PropertyValueProvider<RelationalPersistentProperty> {

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
* @author Diego Krupitza
5858
* @author Hari Ohm Prasath
5959
* @author Viktor Ardelean
60+
* @author Kurt Niemi
6061
*/
6162
class SqlGenerator {
6263

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* {@link SqlIdentifier} instead of {@link String} for names.
3131
*
3232
* @author Jens Schauder
33+
* @author Kurt Niemi
3334
* @since 2.0
3435
*/
3536
class SqlIdentifierParameterSource extends AbstractSqlParameterSource {

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/dialect/H2Dialect.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* @author Mark Paluch
2828
* @author Jens Schauder
2929
* @author Diego Krupitza
30+
* @author Kurt Niemi
3031
*/
3132
public class H2Dialect extends org.springframework.data.relational.core.dialect.H2Dialect implements R2dbcDialect {
3233

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/dialect/MySqlDialect.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
*
3737
* @author Mark Paluch
3838
* @author Jens Schauder
39+
* @author Kurt Niemi
3940
*/
4041
public class MySqlDialect extends org.springframework.data.relational.core.dialect.MySqlDialect
4142
implements R2dbcDialect {

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* {@link NamingStrategy}.
3030
*
3131
* @author Mark Paluch
32+
* @author Kurt Niemi
3233
* @since 2.0
3334
*/
3435
class DerivedSqlIdentifier implements SqlIdentifier {
@@ -67,7 +68,7 @@ public String toSql(IdentifierProcessing processing) {
6768
@Override
6869
@Deprecated(since="3.1", forRemoval = true)
6970
public String getReference(IdentifierProcessing processing) {
70-
return toSql(processing);
71+
return this.name;
7172
}
7273

7374
@Override

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* @author Kazuki Shimizu
3232
* @author Jens Schauder
3333
* @author Oliver Gierke
34+
* @author Kurt Niemi
3435
*/
3536
public interface NamingStrategy {
3637

0 commit comments

Comments
 (0)