1.10.x

.travis.yml

@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - oraclejdk8
+before_install:
+  - curl -o $HOME/.m2/settings.xml https://raw.githubusercontent.com/Cosium/spring-data-jpa-entity-graph/$TRAVIS_BRANCH/src/site/resources/settings.xml
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,19 +1,37 @@
-### Why?
+[![Travis branch](https://img.shields.io/travis/Cosium/spring-data-jpa-entity-graph/1.10.x.svg)](https://travis-ci.org/Cosium/spring-data-jpa-entity-graph)
+[![Codecov branch](https://img.shields.io/codecov/c/github/Cosium/spring-data-jpa-entity-graph/1.10.x.svg)](https://codecov.io/gh/Cosium/spring-data-jpa-entity-graph)
+[![Maven Central](https://img.shields.io/maven-central/v/com.cosium.spring.data/spring-data-jpa-entity-graph.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.cosium.spring.data%22%20AND%20a%3A%22spring-data-jpa-entity-graph%22)
 
-Today, Spring Data JPA supports EntityGraph exlusively through annotations.  
+# Spring Data JPA EntityGraph
+
+Today, [Spring Data JPA](https://github.com/spring-projects/spring-data-jpa) supports EntityGraph exlusively through annotations.  
 Thus, for a method, the choice of EntityGraph must be made before compilation.  
 
-This library gives the ability to pass EntityGraph on any Spring Data JPA repository method as an argument, making the EntityGraph choice fully dynamic.
+This extension gives the ability to pass EntityGraph on any Spring Data JPA repository method as an argument, making the EntityGraph choice fully dynamic.
+
+Example:
+```java
+productRepository.findByName("foo", EntityGraphUtils.fromName("Product.brand"));
+```
+
+## Compatibility
+
+This library follows the Spring Data JPA versionning semantic.
+
+spring-data-jpa-entity-graph | spring-data-jpa
+---------------------------- | ---------------
+1.11.x | 1.11.y
+1.10.x | 1.10.y
 
-### Quick start in 3 steps
+## Quick start
 
-1. Add the dependency :
+1. In addition to spring-data-jpa, add the library dependency :
 
     ```xml
     <dependency>
         <groupId>com.cosium.spring.data</groupId>
         <artifactId>spring-data-jpa-entity-graph</artifactId>
-        <version>1.11.00-SNAPSHOT</version>
+        <version>1.10.13</version>
     </dependency>
     ```
 2. In your Spring configuration, set the repository factory bean class to `JpaEntityGraphRepositoryFactoryBean` :
@@ -27,7 +45,7 @@ This library gives the ability to pass EntityGraph on any Spring Data JPA reposi
     ```
 3. Make sure your repositories extend `JpaEntityGraphRepository`, `JpaEntityGraphSpecificationExecutor` and/or `JpaEntityGraphQueryDslPredicateExecutor`
 
-### Usage
+## Basic Usage
 
 Let's consider the following entities and repository :
 ```java
@@ -63,14 +81,44 @@ public interface ProductRepository extends JpaEntityGraphRepository<Product, Lon
 
 You can pass the entity graph to the `findByName` method :
 ```java
-productRepository.findByName("MyProduct", EntityGraphUtils.fromName("Product.brand");
+// This will apply 'Product.brand' named EntityGraph to findByName
+productRepository.findByName("MyProduct", EntityGraphUtils.fromName("Product.brand"));
 ```
 
 Or to the `findOne` method :
 ```java
-productRepository.findOne(1L, EntityGraphUtils.fromName("Product.brand");
+// This will apply 'Product.brand' named EntityGraph to findOne
+productRepository.findOne(1L, EntityGraphUtils.fromName("Product.brand"));
 ```
 
 Or any method you like.
 
-You can also pass a dynamically built EntityGraph by using DynamicEntityGraph implementation.
+You can also pass a dynamically built EntityGraph by using `DynamicEntityGraph` implementation.
+
+## Default EntityGraph
+
+For an Entity, you can define its default EntityGraph.  
+An Entity default EntityGraph will be used each time the Entity repository method is called without EntityGraph.  
+
+A default EntityGraph name must end with `.default`. 
+
+```java
+@NamedEntityGraphs(value = {
+    @NamedEntityGraph(name = "Product.default", attributeNodes = {
+        @NamedAttributeNode("brand")
+    })
+})
+@Entity
+public class Product {
+    @Id
+    private long id = 0;
+    private String name;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Brand brand;
+    //...
+}	
+```
+```java
+// This call will make use of "Product.default" EntityGraph.
+productRepository.findOne(1L);
+```

pom.xml

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <name>Spring Data JPA EntityGraph</name>
+    <description>A Spring Data JPA extension allowing full usage of JPA EntityGraph on repositories</description>
+    <url>https://github.com/Cosium/spring-data-jpa-entity-graph</url>
+
     <groupId>com.cosium.spring.data</groupId>
     <artifactId>spring-data-jpa-entity-graph</artifactId>
-    <version>1.11.00-SNAPSHOT</version>
+    <version>1.10.14-SNAPSHOT</version>
 
     <properties>
         <source.level>1.6</source.level>
-        <spring.data.jpa>1.11.0.BUILD-SNAPSHOT</spring.data.jpa>
+        <spring.data.jpa>1.10.5.RELEASE</spring.data.jpa>
         <eclipselink>2.6.2</eclipselink>
         <querydsl>4.1.3</querydsl>
 
         <!--Test-->
         <dbunit>2.5.3</dbunit>
         <spring-test-dbunit>1.3.0</spring-test-dbunit>
-        <spring.boot>1.4.1.RELEASE</spring.boot>
+        <spring.boot>1.3.8.RELEASE</spring.boot>
         <h2>1.4.193</h2>
     </properties>
 
@@ -86,6 +88,12 @@
             <version>${dbunit}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -146,7 +154,7 @@
                     <pushChanges>false</pushChanges>
                     <localCheckout>true</localCheckout>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <useReleaseProfile>false</useReleaseProfile>
+                    <useReleaseProfile>true</useReleaseProfile>
                     <releaseProfiles>release</releaseProfiles>
                     <goals>deploy</goals>
                 </configuration>
@@ -168,22 +176,75 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.7.201606060606</version>
                 <executions>
                     <execution>
-                        <id>sign-artifacts</id>
-                        <phase>deploy</phase>
                         <goals>
-                            <goal>sign</goal>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <scm>
+        <connection>scm:git:https://github.com/Cosium/spring-data-jpa-entity-graph</connection>
+        <developerConnection>scm:git:https://github.com/Cosium/spring-data-jpa-entity-graph</developerConnection>
+        <url>https://github.com/Cosium/spring-data-jpa-entity-graph</url>
+      <tag>HEAD</tag>
+  </scm>
+
     <organization>
         <name>Cosium</name>
         <url>http://www.cosium.com</url>
@@ -198,15 +259,12 @@
         </developer>
     </developers>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>http://www.opensource.org/licenses/mit-license.php</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
 </project>

release.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+mvn --batch-mode clean release:prepare release:perform && git push && git push --tags

src/main/java/com/cosium/spring/data/jpa/entity/graph/domain/AbstractEntityGraph.java

@@ -1,5 +1,6 @@
 package com.cosium.spring.data.jpa.entity.graph.domain;
 
+import com.google.common.base.MoreObjects;
 import org.springframework.util.Assert;
 
 /**
@@ -9,22 +10,52 @@
  */
 public abstract class AbstractEntityGraph implements EntityGraph{
 
-	private EntityGraphType type = EntityGraphType.FETCH;
+	protected static final EntityGraphType DEFAULT_ENTITY_GRAPH_TYPE = EntityGraphType.FETCH;
+	private EntityGraphType entityGraphType = DEFAULT_ENTITY_GRAPH_TYPE;
+	private boolean optional;
 
 	public AbstractEntityGraph(){}
 
-	public AbstractEntityGraph(EntityGraphType type){
-		Assert.notNull(type);
-		this.type = type;
+	public AbstractEntityGraph(EntityGraphType entityGraphType){
+		this(entityGraphType, false);
+	}
+
+	public AbstractEntityGraph(EntityGraphType entityGraphType, boolean optional){
+		Assert.notNull(entityGraphType);
+		this.entityGraphType = entityGraphType;
+		this.optional = optional;
 	}
 
 	@Override
-	public EntityGraphType getType() {
-		return type;
+	public EntityGraphType getEntityGraphType() {
+		return entityGraphType;
+	}
+
+	public void setEntityGraphType(EntityGraphType entityGraphType) {
+		Assert.notNull(entityGraphType);
+		this.entityGraphType = entityGraphType;
 	}
 
-	public void setType(EntityGraphType type) {
-		Assert.notNull(type);
-		this.type = type;
+	/**
+	 * False by default
+	 * @return True if the EntityGraph is optional.<br>
+	 * Passing an optional EntityGraph to an unsupported method will not trigger {@link com.cosium.spring.data.jpa.entity.graph.repository.exception.InapplicableEntityGraphException}.
+	 */
+	@Override
+	public boolean isOptional() {
+		return optional;
 	}
+
+	public void setOptional(boolean optional) {
+		this.optional = optional;
+	}
+
+	@Override
+	public String toString() {
+		return MoreObjects.toStringHelper(this)
+				.add("entityGraphType", entityGraphType)
+				.add("optional", optional)
+				.toString();
+	}
+
 }

src/main/java/com/cosium/spring/data/jpa/entity/graph/domain/DynamicEntityGraph.java

@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.google.common.base.MoreObjects;
+
 /**
  * Created on 22/11/16.
  *
@@ -22,12 +24,20 @@ public DynamicEntityGraph(EntityGraphType type, List<String> attributePaths){
 	}
 
 	@Override
-	public List<String> getAttributePaths() {
+	public List<String> getEntityGraphAttributePaths() {
 		return attributePaths;
 	}
 
 	@Override
-	public final String getName() {
+	public final String getEntityGraphName() {
 		return null;
 	}
+
+
+	@Override
+	public String toString() {
+		return MoreObjects.toStringHelper(this)
+				.add("attributePaths", attributePaths)
+				.toString();
+	}
 }