From 110e3ee02eee5559633698b5954a766729bc477f Mon Sep 17 00:00:00 2001 From: chanhyeong-cho Date: Sun, 28 Apr 2024 19:31:19 +0900 Subject: [PATCH] Remove duplicate declaration of `document()` accessor in `RowDocument`. Closes #1781 --- .../core/conversion/MappingRelationalConverter.java | 9 +++++---- .../relational/core/conversion/RowDocumentAccessor.java | 5 +---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java index 9b8ae2cb..141de911 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java @@ -80,6 +80,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 @@ -322,7 +323,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter impl } if (RowDocument.class.isAssignableFrom(rawType)) { - return (S) documentAccessor.document(); + return (S) documentAccessor.getDocument(); } if (typeHint.isMap()) { @@ -1127,7 +1128,7 @@ public class MappingRelationalConverter extends AbstractRelationalConverter impl @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; @@ -1138,12 +1139,12 @@ public class MappingRelationalConverter extends AbstractRelationalConverter impl @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 diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java index db24258d..38e6107b 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java @@ -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 { return prop.getColumnName().getReference(); } - public RowDocument document() { - return document; - } - @Override public boolean equals(Object obj) { if (obj == this)