Skip to content

Commit b05cf4a

Browse files
fix: fix the getColumn helper method
The setColumns method was never called during deserialization (?), so the columnMap was always empty.
1 parent 8012b40 commit b05cf4a

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

src/main/java/org/springframework/data/mongodb/datatables/DataTablesInput.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
package org.springframework.data.mongodb.datatables;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
43
import lombok.Data;
54

65
import javax.validation.constraints.Min;
76
import javax.validation.constraints.NotBlank;
87
import javax.validation.constraints.NotEmpty;
98
import javax.validation.constraints.NotNull;
109
import java.util.List;
11-
import java.util.Map;
1210
import java.util.Optional;
1311

14-
import static java.util.Optional.ofNullable;
15-
import static java.util.stream.Collectors.toMap;
16-
1712
@Data
1813
public class DataTablesInput {
1914

@@ -63,16 +58,10 @@ public class DataTablesInput {
6358
@NotEmpty
6459
private List<Column> columns;
6560

66-
@JsonIgnore
67-
private Map<String, Column> columnMap;
68-
69-
public void setColumns(List<Column> columns) {
70-
this.columns = columns;
71-
this.columnMap = columns.stream().collect(toMap(Column::getData, x -> x));
72-
}
73-
7461
public Optional<Column> getColumn(String columnName) {
75-
return ofNullable(columnMap.get(columnName));
62+
return this.columns.stream()
63+
.filter(column -> columnName.equals(column.getData()))
64+
.findFirst();
7665
}
7766

7867
@Data

0 commit comments

Comments
 (0)