update master

.gitignore

@@ -21,3 +21,6 @@ target/
 .project
 .springBeans
 .classpath
+
+.externalToolBuilders
+

CHANGELOG.md

@@ -1,6 +1,36 @@
 # Change Log
 
-## 0.3.20-SNAPSHOT
+## 0.3.28-SNAPSHOT
+* feat: add EXISTS/NOT_EXISTS subquery logical where criteria expressions (#151) [85d2f3a](https://github.com/introproventures/graphql-jpa-query/commit/85d2f3a7b64db6d54300f6979f872b38d1738364)
+* fix: correct element collection fetch sort order (#149) [5327a22](https://github.com/introproventures/graphql-jpa-query/commit/5327a226b6e86418612fbaeaf6fedc7cd3c51576)
+* fix: add support for nested where criteria expressions (#148) [2065101](https://github.com/introproventures/graphql-jpa-query/commit/206510146783dde2446e21f9a2c06cf61dcedf69)
+* fix: separate reuse fetch and join methods with better apis [fcf9f12](https://github.com/introproventures/graphql-jpa-query/commit/fcf9f126a3b8c2515eff3fa0b2108dcc669a6ab8)
+* fix: TODO plural predicate fetch join detection [3aa3347](https://github.com/introproventures/graphql-jpa-query/commit/3aa3347ead70767624e8f3aece1a933faf46069b)
+* feat: add NE predicate for custom attributes criteria expressions (#140) [4862ad0](https://github.com/introproventures/graphql-jpa-query/commit/4862ad06e942029e1581241e658f9482f6107fc7)
+* feat: add optional argument for plural attributes  (#138) [e2ddd4d](https://github.com/introproventures/graphql-jpa-query/commit/e2ddd4d92cbf95a76ba13e3d051c53c02421730e)
+* fix: build fetch joins from selection graph (#137) [d452620](https://github.com/introproventures/graphql-jpa-query/commit/d452620269ce227bf1d6b33d74cf7df807384d49)
+* feat: add AND/OR logical criteria list in schema and query  (#134) [764c439](https://github.com/introproventures/graphql-jpa-query/commit/764c43938842fef5a2e4a7ac9519375afc2ef2a0)
+* feat: add IN | NIN predicate for custom attribute types (#136) [ac7bda6](https://github.com/introproventures/graphql-jpa-query/commit/ac7bda6000b5a1c851d7b4981dae54baf3292bcc)
+* fix: enable default distinct  configuration property (#135) [6359449](https://github.com/introproventures/graphql-jpa-query/commit/63594496e32bef9d7d6d839d55b649343b2536c8)
+* feat: add equals criteria support for custom attributes types (#133) [a18a6ce](https://github.com/introproventures/graphql-jpa-query/commit/a18a6ceb194d544f1edc7aedec018ab5f8aba8e2)
+* feat: Provide default GraphQLObjectCoercing fallback for non-existing Java classes (#130) [1a27eee](https://github.com/introproventures/graphql-jpa-query/commit/1a27eeed49c8248def731e7aeb1b6287a4b1aedc)
+* fix: use GrpaphQL execution context to resolve variable references (#129) [5f9da5f](https://github.com/introproventures/graphql-jpa-query/commit/5f9da5f1c91fc8d9c42928519942815d7790f1ff)
+* fix: use stream().distinct() to remove duplicates from root entities (#128) [d0758e7](https://github.com/introproventures/graphql-jpa-query/commit/d0758e78f0419db17757af97805b3223e601b967)
+* fix: resolve variable references in GraphQLObjectCoercing (#127) [fc2ab23](https://github.com/introproventures/graphql-jpa-query/commit/fc2ab230c80bf907fb43a0887b8bd11ff64ad883)
+* fix: Let's not pass DISTINCT in JPQL for better performance [4a75979](https://github.com/introproventures/graphql-jpa-query/commit/4a759791b5334a03ede3232d02018b3ed8f74c0a)
+* fix: Let's pass and apply distinct in query results if enabled (#124) [dcb037b](https://github.com/introproventures/graphql-jpa-query/commit/dcb037b02f6f7eef302fd43d435252c1ed1430f3)
+* fix: lets fetch element collection attributes (#123) [ca7f78e](https://github.com/introproventures/graphql-jpa-query/commit/ca7f78e650860ad3aac0e1639dc68f13fab76f74)
+* fix: Apply left outer join to retrieve optional associations [WIP] (#105) [7ff25ae](https://github.com/introproventures/graphql-jpa-query/commit/7ff25ae2a22ab9267a41c424ef683e309b55bd56)
+* fix: update example docker-compose Docker image [74afefc](https://github.com/introproventures/graphql-jpa-query/commit/74afefc3cdb75efd214431f42cd0257a12f2a49c)
+* fix: compound nested relationship criteria expressions (#121) [af279d9](https://github.com/introproventures/graphql-jpa-query/commit/af279d913765df7220720e851b6e3fa9441069dc)
+* Fix  MappedSuperclass for JPA entity attributes (#120) [c67073a](https://github.com/introproventures/graphql-jpa-query/commit/c67073aed1f847b99ad4c99ccd457e323788f23e)
+* Update README.md [fc3c919](https://github.com/introproventures/graphql-jpa-query/commit/fc3c9199b0a6727203e165351893e25913e3afe5)
+* fix: update Play With Docker link [69ee033](https://github.com/introproventures/graphql-jpa-query/commit/69ee03319c23807a4d14ab0c84fb3bb3e8637908)
+* fix: change droid_function entity name to DroidFunction (#117) [ee39a1d](https://github.com/introproventures/graphql-jpa-query/commit/ee39a1d3cf42440ac2c054944c98bbac1ed3c4c4)
+* feat: extract GraphiQL into separate reusable module (#116) [123b471](https://github.com/introproventures/graphql-jpa-query/commit/123b4719593f21ef5af93e49a77292596ab5d129)
+* feat: extract example JPA models into separate resusable modules (#104) [9698743](https://github.com/introproventures/graphql-jpa-query/commit/9698743f3e9059ae1d2846e5e77ffae0a0a8b1f7)
+* feat: support nested relationships in where criteria expressions  (#108) [b05c246](https://github.com/introproventures/graphql-jpa-query/commit/b05c246d06fc5aca05a096ce8214975de986546b)
+* feat: add LOCATE predicate for JPA entity attributes annotated with @Convert (#115) [3f9704b](https://github.com/introproventures/graphql-jpa-query/commit/3f9704b48c768d1d64ba82e41bbd1efebab864d6)
 * feat: support enum variable bindings in queries (#109) [5dd999a](https://github.com/introproventures/graphql-jpa-query/commit/5dd999a1107899ce6bfe08aceb37ed2fb057aac6)
 * Update README to add PWD shortcut in the title [8e9d409](https://github.com/introproventures/graphql-jpa-query/commit/8e9d409b4a193dde823991a9945d29f0163234a8)
 * #102 fix NullPointerException when searching for Transient annotation (#106) [fb45d23](https://github.com/introproventures/graphql-jpa-query/commit/fb45d2329d8d02abc687e3db3cb2faafa4d91659)

README.md

@@ -1,4 +1,4 @@
-GraphQL Query Api for JPA Entity Models [![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com/?stack=https://raw.githubusercontent.com/introproventures/graphql-jpa-query/master/graphql-jpa-query-example/docker-compose.yml&stack_name=graphhql)
+GraphQL Query Api for JPA Entity Models [![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com/?stack=https://raw.githubusercontent.com/introproventures/graphql-jpa-query/master/graphql-jpa-query-example-simple/docker-compose.yml&stack_name=graphhql)
 ===============
 
 [![Build Status](https://travis-ci.org/introproventures/graphql-jpa-query.svg?branch=master)](https://travis-ci.org/introproventures/graphql-jpa-query)

graphql-jpa-query-annotations/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.introproventures</groupId>
     <artifactId>graphql-jpa-query-dependencies</artifactId>
-    <version>0.3.20-SNAPSHOT</version>
+    <version>0.3.28-SNAPSHOT</version>
     <relativePath>../graphql-jpa-query-dependencies</relativePath>
   </parent>
 

graphql-jpa-query-autoconfigure/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.introproventures</groupId>
     <artifactId>graphql-jpa-query-build</artifactId>
-    <version>0.3.20-SNAPSHOT</version>
+    <version>0.3.28-SNAPSHOT</version>
     <relativePath>../graphql-jpa-query-build</relativePath>
   </parent>
   <artifactId>graphql-jpa-query-autoconfigure</artifactId>

graphql-jpa-query-autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryProperties.java

@@ -44,8 +44,13 @@ public class GraphQLJpaQueryProperties {
     /**
      * Enable or disable distinct distinct sql query fetcher.
      */
-    private boolean isDefaultDistinct = false;
+    private boolean isDefaultDistinct = true;
 
+    /**
+     * Set default value for optional argument for join fetch collections.
+     */
+    private boolean toManyDefaultOptional = true;
+
     /**
      * Enable or disable QraphQL module services.
      */
@@ -105,7 +110,7 @@ public void setUseDistinctParameter(boolean useDistinctParameter) {
     /**
      * @return the distinctFetcher
      */
-    public boolean isDefautltDistinct() {
+    public boolean isDefaultDistinct() {
         return isDefaultDistinct;
     }
 
@@ -143,5 +148,15 @@ public String getPath() {
     public void setPath(String path) {
         this.path = path;
     }
+
+
+    public boolean isToManyDefaultOptional() {
+        return toManyDefaultOptional;
+    }
+
+
+    public void setToManyDefaultOptional(boolean toManyDefaultOptional) {
+        this.toManyDefaultOptional = toManyDefaultOptional;
+    }
 
 }

graphql-jpa-query-autoconfigure/src/main/resources/com/introproventures/graphql/jpa/query/boot/autoconfigure/default.properties

@@ -1,6 +1,6 @@
 spring.graphql.jpa.query.name=Query
-spring.graphql.jpa.query.description=
+spring.graphql.jpa.query.description=Query root
 spring.graphql.jpa.query.useDistinctParameter=false
-spring.graphql.jpa.query.defaultDistinct=false
+spring.graphql.jpa.query.defaultDistinct=true
 spring.graphql.jpa.query.enabled=true
 spring.graphql.jpa.query.path=/graphql

graphql-jpa-query-autoconfigure/src/test/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLSchemaAutoConfigurationTest.java

@@ -4,6 +4,11 @@
 
 import java.util.Map;
 
+import graphql.GraphQL;
+import graphql.Scalars;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,18 +18,15 @@
 import org.springframework.stereotype.Component;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import graphql.GraphQL;
-import graphql.Scalars;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLSchema;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment=WebEnvironment.NONE)
 public class GraphQLSchemaAutoConfigurationTest {
 
     @Autowired
     private GraphQLSchema graphQLSchema;
+
+    @Autowired
+    private GraphQLJpaQueryProperties graphQLJpaQueryProperties;
 
     @SpringBootApplication
     static class Application {
@@ -96,5 +98,13 @@ public void contextLoads() {
     }
 
 
+    @Test
+    public void defaultConfigurationProperties() {
+        // given
+        assertThat(graphQLJpaQueryProperties.isDefaultDistinct()).isTrue();
+        assertThat(graphQLJpaQueryProperties.isUseDistinctParameter()).isFalse();
+        assertThat(graphQLJpaQueryProperties.isToManyDefaultOptional()).isTrue();
+    }
+
 
 }

graphql-jpa-query-boot-starter/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.introproventures</groupId>
     <artifactId>graphql-jpa-query-build</artifactId>
-    <version>0.3.20-SNAPSHOT</version>
+    <version>0.3.28-SNAPSHOT</version>
     <relativePath>../graphql-jpa-query-build</relativePath>
   </parent>
 

graphql-jpa-query-build/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.introproventures</groupId>
         <artifactId>graphql-jpa-query-dependencies</artifactId>
-        <version>0.3.20-SNAPSHOT</version>
+        <version>0.3.28-SNAPSHOT</version>
         <relativePath>../graphql-jpa-query-dependencies</relativePath>
     </parent>
     <artifactId>graphql-jpa-query-build</artifactId>
@@ -19,9 +19,26 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>com.introproventures</groupId>
+                <artifactId>graphql-jpa-query-example-model-starwars</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
-        </dependencies>
+            <dependency>
+                <groupId>com.introproventures</groupId>
+                <artifactId>graphql-jpa-query-example-model-books</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
+            <dependency>
+                <groupId>com.introproventures</groupId>
+                <artifactId>graphql-jpa-query-graphiql</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+        </dependencies>
     </dependencyManagement>
 
     <dependencies>

graphql-jpa-query-dependencies/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.introproventures</groupId>
         <artifactId>graphql-jpa-query</artifactId>
-        <version>0.3.20-SNAPSHOT</version>
+        <version>0.3.28-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>graphql-jpa-query-dependencies</artifactId>

graphql-jpa-query-example-merge/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.introproventures</groupId>
     <artifactId>graphql-jpa-query-build</artifactId>
-    <version>0.3.20-SNAPSHOT</version>
+    <version>0.3.28-SNAPSHOT</version>
     <relativePath>../graphql-jpa-query-build</relativePath>
   </parent>
 
@@ -18,6 +18,21 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>com.introproventures</groupId>
+      <artifactId>graphql-jpa-query-example-model-books</artifactId>
+    </dependency>
+
+    <dependency>
+        <groupId>com.introproventures</groupId>
+        <artifactId>graphql-jpa-query-graphiql</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.introproventures</groupId>
+      <artifactId>graphql-jpa-query-example-model-starwars</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.introproventures</groupId>
       <artifactId>graphql-jpa-query-web</artifactId>

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/books/BooksSchemaConfiguration.java

@@ -11,6 +11,7 @@
 import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
 import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
+import com.introproventures.graphql.jpa.query.schema.model.book.Book;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,7 +90,7 @@ public void configure(GraphQLShemaRegistration registry) {
                     new GraphQLJpaSchemaBuilder(entityManager)
                         .name("GraphQLBooks")
                         .useDistinctParameter(properties.isUseDistinctParameter())
-                        .setDefaultDistinct(properties.isDefautltDistinct())
+                        .setDefaultDistinct(properties.isDefaultDistinct())
                         .build()
             );
         }