Browse Source

Remove duplicate declaration of `document()` accessor in `RowDocument`.

Closes #1781
pull/1783/head
chanhyeong-cho 2 years ago committed by Mark Paluch
parent
commit
ea865cafc5
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
  1. 9
      spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
  2. 5
      spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java

9
spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java

@ -85,6 +85,7 @@ import org.springframework.util.ClassUtils; @@ -85,6 +85,7 @@ import org.springframework.util.ClassUtils;
* @author Jens Schauder
* @author Chirag Tailor
* @author Vincent Galloy
* @author Chanhyeong Cho
* @see org.springframework.data.mapping.context.MappingContext
* @see SimpleTypeHolder
* @see CustomConversions
@ -346,7 +347,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter @@ -346,7 +347,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter
}
if (RowDocument.class.isAssignableFrom(rawType)) {
return (S) documentAccessor.document();
return (S) documentAccessor.getDocument();
}
if (typeHint.isMap()) {
@ -1151,7 +1152,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter @@ -1151,7 +1152,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter
@Override
public Object getValue(AggregatePath path) {
Object value = accessor.document().get(path.getColumnInfo().alias().getReference());
Object value = accessor.getDocument().get(path.getColumnInfo().alias().getReference());
if (value == null) {
return null;
@ -1162,12 +1163,12 @@ public class MappingRelationalConverter extends AbstractRelationalConverter @@ -1162,12 +1163,12 @@ public class MappingRelationalConverter extends AbstractRelationalConverter
@Override
public boolean hasValue(AggregatePath path) {
return accessor.document().get(path.getColumnInfo().alias().getReference()) != null;
return accessor.getDocument().get(path.getColumnInfo().alias().getReference()) != null;
}
@Override
public boolean hasValue(SqlIdentifier identifier) {
return accessor().document().get(identifier.getReference()) != null;
return accessor().getDocument().get(identifier.getReference()) != null;
}
@Override

5
spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java

@ -28,6 +28,7 @@ import org.springframework.util.Assert; @@ -28,6 +28,7 @@ import org.springframework.util.Assert;
* a {@link RelationalPersistentProperty} might refer to through a path expression in field names.
*
* @author Mark Paluch
* @author Chanhyeong Cho
* @since 3.2
*/
public class RowDocumentAccessor {
@ -110,10 +111,6 @@ public class RowDocumentAccessor { @@ -110,10 +111,6 @@ public class RowDocumentAccessor {
return prop.getColumnName().getReference();
}
public RowDocument document() {
return document;
}
@Override
public boolean equals(Object obj) {
if (obj == this)

Loading…
Cancel
Save