Fix for using @Embedded class (by @wimdeblauwe)

(closes darrachequesne#11, darrachequesne#12)

Author: darrachequesne

.gitignore

@@ -2,5 +2,7 @@
 .project
 .springBeans
 .settings/
+.idea
+*.iml
 build/
 target/

src/main/java/org/springframework/data/jpa/datatables/repository/DataTablesUtils.java

@@ -193,6 +193,9 @@ private static Expression<String> getExpression(Root<?> root, String columnData)
  if (columnData.contains(ATTRIBUTE_SEPARATOR)) {
  // columnData is like "joinedEntity.attribute" so add a join clause
  String[] values = columnData.split("\\" + ATTRIBUTE_SEPARATOR);
+ if (!root.getModel().getAttribute(values[0]).isAssociation()) {
+ return root.get(values[0]).get(values[1]).as(String.class);
+ }
  return root.join(values[0], JoinType.LEFT).get(values[1]).as(String.class);
  } else {
  // columnData is like "attribute" so nothing particular to do

src/test/java/org/springframework/data/jpa/datatables/model/Game.java

@@ -0,0 +1,31 @@
+package org.springframework.data.jpa.datatables.model;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Game {
+
+ @Id
+ @GeneratedValue
+ private Integer id;
+
+ @Embedded
+ private Prize prize;
+
+ protected Game() {}
+
+ public Game(Prize prize) {
+ this.prize = prize;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public Prize getPrize() {
+ return prize;
+ }
+}

src/test/java/org/springframework/data/jpa/datatables/model/Prize.java

@@ -0,0 +1,27 @@
+package org.springframework.data.jpa.datatables.model;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.validation.constraints.NotNull;
+
+@Embeddable
+public class Prize {
+
+ @NotNull
+ @Column(name = "prize_name")
+ private String name;
+
+ protected Prize() {}
+
+ public Prize(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}

src/test/java/org/springframework/data/jpa/datatables/repository/GameRepository.java

@@ -0,0 +1,6 @@
+package org.springframework.data.jpa.datatables.repository;
+
+import org.springframework.data.jpa.datatables.model.Game;
+
+public interface GameRepository extends DataTablesRepository<Game, Integer> {
+}

src/test/java/org/springframework/data/jpa/datatables/repository/GameRepositoryTest.java

@@ -0,0 +1,100 @@
+package org.springframework.data.jpa.datatables.repository;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.datatables.Config;
+import org.springframework.data.jpa.datatables.mapping.DataTablesInput;
+import org.springframework.data.jpa.datatables.mapping.DataTablesOutput;
+import org.springframework.data.jpa.datatables.model.Game;
+import org.springframework.data.jpa.datatables.model.Prize;
+import org.springframework.data.jpa.datatables.parameter.ColumnParameter;
+import org.springframework.data.jpa.datatables.parameter.OrderParameter;
+import org.springframework.data.jpa.datatables.parameter.SearchParameter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = Config.class)
+public class GameRepositoryTest {
+
+ @Autowired
+ private GameRepository gameRepository;
+
+ /**
+ * Insert sample data at the beginning of all tests
+ */
+ @Before
+ public void setUp() {
+ if (gameRepository.count() > 0)
+ return;
+ for (int i = 0; i < 12; i++) {
+ Game game = new Game(new Prize("prize" + i));
+ gameRepository.save(game);
+ }
+ }
+
+ @Test
+ public void testWithoutFilter() {
+ DataTablesInput input = getBasicInput();
+
+ DataTablesOutput<Game> output = gameRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(12, (long) output.getRecordsFiltered());
+ assertEquals(12, (long) output.getRecordsTotal());
+ }
+
+ @Test
+ public void testSearchOnEmbeddedProperty() {
+ DataTablesInput input = getBasicInput();
+
+ input.getColumns().get(1).getSearch().setValue("prize1");
+ DataTablesOutput<Game> output = gameRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(3, (long) output.getRecordsFiltered());
+ }
+
+ @Test
+ public void testOrderOnEmbeddedProperty() {
+ DataTablesInput input = getBasicInput();
+ input.setOrder(new ArrayList<OrderParameter>());
+ input.getOrder().add(new OrderParameter(1, "desc"));
+
+ DataTablesOutput<Game> output = gameRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(12, (long) output.getRecordsFiltered());
+ assertEquals("prize9", output.getData().get(0).getPrize().getName());
+ }
+
+ /**
+ *
+ * @return basic input parameters
+ */
+ private static DataTablesInput getBasicInput() {
+ DataTablesInput input = new DataTablesInput();
+ input.setDraw(1);
+ input.setStart(0);
+ input.setLength(10);
+ input.setSearch(new SearchParameter("", false));
+ input.setOrder(new ArrayList<OrderParameter>());
+ input.getOrder().add(new OrderParameter(0, "asc"));
+
+ input.setColumns(new ArrayList<ColumnParameter>());
+ input.getColumns()
+ .add(new ColumnParameter("id", "", true, true, new SearchParameter("", false)));
+ input.getColumns()
+ .add(new ColumnParameter("prize.name", "", true, true, new SearchParameter("", false)));
+
+ return input;
+ }
+}