Skip to content

Remove duplicate declaration of document() accessor in RowDocument #1781

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

Closed
wants to merge 1 commit into from
Closed

Remove duplicate declaration of document() accessor in RowDocument #1781

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
9 changes: 5 additions & 4 deletions .../java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
* @author Jens Schauder
* @author Chirag Tailor
* @author Vincent Galloy
* @author Chanhyeong Cho
* @see org.springframework.data.mapping.context.MappingContext
* @see SimpleTypeHolder
* @see CustomConversions
Expand Down Expand Up @@ -346,7 +347,7 @@ protected <S> S readAggregate(ConversionContext context, RowDocumentAccessor doc
}

if (RowDocument.class.isAssignableFrom(rawType)) {
return (S) documentAccessor.document();
return (S) documentAccessor.getDocument();
}

if (typeHint.isMap()) {
Expand Down Expand Up @@ -1151,7 +1152,7 @@ public boolean hasValue(RelationalPersistentProperty property) {
@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;
Expand All @@ -1162,12 +1163,12 @@ public Object getValue(AggregatePath path) {

@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
Expand Down
5 changes: 1 addition & 4 deletions ...rc/main/java/org/springframework/data/relational/core/conversion/RowDocumentAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* 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 {
Expand Down Expand Up @@ -110,10 +111,6 @@ String getColumnName(RelationalPersistentProperty prop) {
return prop.getColumnName().getReference();
}

public RowDocument document() {
return document;
}

@Override
public boolean equals(Object obj) {
if (obj == this)
Expand Down