Add hint to support @entitygraph

- Adjust the sample to use a entity graph

Closes gh-1619

Author: mhalbritter

samples/data-jpa/build-single-profile.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-${PWD%/*samples/*}/scripts/compileWithMaven.sh &&  ${PWD%/*samples/*}/scripts/test.sh $*
+${PWD%/*samples/*}/scripts/compileWithMaven.sh $* &&  ${PWD%/*samples/*}/scripts/test.sh $*

samples/data-jpa/src/main/java/app/main/SampleApplication.java

@@ -15,9 +15,15 @@
  */
 package app.main;
 
+import java.util.Optional;
+
+import app.main.model.Author;
+import app.main.model.Book;
+import app.main.model.BookRepository;
 import app.main.model.Flurb;
 import app.main.model.Foo;
 import app.main.model.FooRepository;
+
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -27,36 +33,56 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.servlet.function.RouterFunction;
 
-import java.util.Optional;
-
-import static org.springframework.web.servlet.function.RequestPredicates.*;
-import static org.springframework.web.servlet.function.RouterFunctions.*;
-import static org.springframework.web.servlet.function.ServerResponse.*;
+import static org.springframework.web.servlet.function.RequestPredicates.GET;
+import static org.springframework.web.servlet.function.RouterFunctions.route;
+import static org.springframework.web.servlet.function.ServerResponse.ok;
 
 @SpringBootApplication
 @EnableJpaAuditing(auditorAwareRef = "fixedAuditor")
 @EnableJpaRepositories(basePackageClasses = FooRepository.class)
 public class SampleApplication {
 
-	private final FooRepository entities;
+	private final FooRepository fooRepository;
+
+	private final BookRepository bookRepository;
 
-	public SampleApplication(FooRepository entities) {
-		this.entities = entities;
+	public SampleApplication(FooRepository fooRepository, BookRepository bookRepository) {
+		this.fooRepository = fooRepository;
+		this.bookRepository = bookRepository;
 	}
 
 	@Bean
 	public CommandLineRunner runner() {
 		return args -> {
 
-			Optional<Foo> maybeFoo = entities.findById(1L);
+			Optional<Foo> maybeFoo = fooRepository.findById(1L);
 			Foo foo;
-			foo = maybeFoo.orElseGet(() -> entities.save(new Foo("Hello")));
+			foo = maybeFoo.orElseGet(() -> fooRepository.save(new Foo("Hello")));
 			Flurb flurb = new Flurb();
 			flurb.setVal("Balla balla");
 			foo.setFlurb(flurb);
-			entities.save(foo);
+			fooRepository.save(foo);
+
+			fooRepository.findWithBetween("a", "X");
+		};
+	}
+
+	@Bean
+	public CommandLineRunner runner2() {
+		return args -> {
+			Book book = new Book();
+			book.setTitle("Spring in Action");
+			Author author = new Author();
+			author.setName("Craig Walls");
+			book.getAuthors().add(author);
+			bookRepository.save(book);
+
+//			Book loaded = bookRepository.findByTitleWithNamedGraph("Spring in Action");
+//			System.out.println("Loaded via named EntityGraph: " + loaded);
+
+			Book loaded = bookRepository.findByTitleWithAdHocGraph("Spring in Action");
+			System.out.println("Loaded via ad-hoc EntityGraph: " + loaded);
 
-			entities.findWithBetween("a", "X");
 		};
 	}
 
@@ -71,7 +97,7 @@ public RouterFunction<?> userEndpoints() {
 	}
 
 	private Foo findOne() {
-		return entities.findById(1L).get();
+		return fooRepository.findById(1L).get();
 	}
 
 	public static void main(String[] args) {

samples/data-jpa/src/main/java/app/main/model/Author.java

@@ -0,0 +1,39 @@
+package app.main.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @author Moritz Halbritter
+ */
+@Entity
+public class Author {
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	@Column
+	private String name;
+
+	public Long getId() {
+		return id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return "Author{" +
+				"id=" + id +
+				", name='" + name + '\'' +
+				'}';
+	}
+}

samples/data-jpa/src/main/java/app/main/model/Book.java

@@ -0,0 +1,55 @@
+package app.main.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * @author Moritz Halbritter
+ */
+@Entity
+//@NamedEntityGraph(name = "Book.authors",
+//		attributeNodes = @NamedAttributeNode("authors")
+//)
+public class Book {
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	@Column
+	private String title;
+
+	@OneToMany(cascade = CascadeType.ALL)
+	private Set<Author> authors = new HashSet<>();
+
+	public Long getId() {
+		return id;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public Set<Author> getAuthors() {
+		return authors;
+	}
+
+	@Override
+	public String toString() {
+		return "Book{" +
+				"id=" + id +
+				", title='" + title + '\'' +
+				", authors=" + authors +
+				'}';
+	}
+}

samples/data-jpa/src/main/java/app/main/model/BookRepository.java

@@ -0,0 +1,18 @@
+package app.main.model;
+
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+/**
+ * @author Moritz Halbritter
+ */
+public interface BookRepository extends JpaRepository<Book, Long> {
+//	@EntityGraph(value = "Book.authors")
+//	@Query("SELECT b FROM Book b WHERE b.title = :title")
+//	Book findByTitleWithNamedGraph(String title);
+
+	@EntityGraph(attributePaths = "authors")
+	@Query("SELECT b FROM Book b WHERE b.title = :title")
+	Book findByTitleWithAdHocGraph(String title);
+}

spring-native-configuration/src/main/java/org/springframework/data/jpa/repository/config/DataJpaHints.java

@@ -15,12 +15,15 @@
  */
 package org.springframework.data.jpa.repository.config;
 
+import javax.persistence.NamedEntityGraph;
+
 import org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.DataAuditingHints;
 import org.springframework.data.DataNonReactiveAuditingHints;
 import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
 import org.springframework.nativex.hint.JdkProxyHint;
 import org.springframework.nativex.hint.NativeHint;
@@ -49,6 +52,11 @@
 		}
 
 )
+@NativeHint(
+		// https://github.com/spring-projects-experimental/spring-native/issues/1619
+		trigger = EntityGraph.class,
+		types = @TypeHint(types = NamedEntityGraph.class, access = {})
+)
 public class DataJpaHints implements NativeConfiguration {
 
 }