pull change

CHANGELOG.md

@@ -1,6 +1,25 @@
 # Change Log
 
-## 0.3.28-SNAPSHOT
+## 0.3.34-SNAPSHOT
+* fix(GH-193): Fixed error in GQL Queries when `total` or `pages` is included with condition `where: NOT_EXISTS` or `EXISTS` (#201) [40a0e2d](https://github.com/introproventures/graphql-jpa-query/commit/40a0e2d844854f8888e3502d1d6434db9cb1dd7e)
+* fix(GH-198): adedd support for fetching optional element collections elements (#200) [5d99c3b](https://github.com/introproventures/graphql-jpa-query/commit/5d99c3b4629521ebee2788c6b877250c279c8bf2)
+* fix: Added support for binding orderBy argument as a variable (#195) [2a01382](https://github.com/introproventures/graphql-jpa-query/commit/2a0138237cb639427f169b18f6b6f159c430afac)
+* fix: removed EntityManager.clear() from GraphQLJpaQueryDataFetcher (#192) [ae25aba](https://github.com/introproventures/graphql-jpa-query/commit/ae25aba8cbcf4397f2f0fb2c79fa2a23d9697cb6)
+* chore: remove obsolete JpaQueryBuilder class (#190) [ae9ce62](https://github.com/introproventures/graphql-jpa-query/commit/ae9ce6203c6d1f3c9448dddfa2405c61057f0035)
+* fix: switch off lower(COLUMN_NAME) decoration on String equality check (#186) [9445f89](https://github.com/introproventures/graphql-jpa-query/commit/9445f8965cb9e23665f4dc4f6ecc88833157bd5f)
+* fix: coerce Zoned and Offset time to UTC  [f2d4756](https://github.com/introproventures/graphql-jpa-query/commit/f2d475640aa36ecbb6592fa4e216aa645772e832)
+* fix: Javadoc errors [8284cbd](https://github.com/introproventures/graphql-jpa-query/commit/8284cbd84c80092b4e506fbffc5706d0bed8133d)
+* fix: support uppercase attribute names introspection (#173) [798b30d](https://github.com/introproventures/graphql-jpa-query/commit/798b30d7fd8978f2cf8819d2e52d8c355f689b8b)
+* fix: add query support for entities with `@EmbeddedId` attribute (#180) [6552cb8](https://github.com/introproventures/graphql-jpa-query/commit/6552cb8b749ab5e1254b614375ad44badbc43b9d)
+* fix: Error querying entity with @IdClass #176 (#179) [50df533](https://github.com/introproventures/graphql-jpa-query/commit/50df533b87cd174f3eeb45266e23adf7172327ce)
+* fix: Description is not inherited from the parent class (#169) [82be5d5](https://github.com/introproventures/graphql-jpa-query/commit/82be5d5e3773923119cc549052875e6f9e3ee050)
+* Add java arrays basic support (#171) [a5f72bc](https://github.com/introproventures/graphql-jpa-query/commit/a5f72bc2c359c72cf7b91d6098286a2c3a903b68)
+* feat: support transient field modifier with class hierarchy introspection (#168) [81a6a19](https://github.com/introproventures/graphql-jpa-query/commit/81a6a198a1eecafb6056ed8ea9752482d26ba589)
+* feat: add support for variable where criteria expressions (#162) [5385a41](https://github.com/introproventures/graphql-jpa-query/commit/5385a4147cba654b4f57f3c6fc7cb4d40009ca3a)
+* Add METHOD to the @GraphQLIgnore annotation target (#165) [8028d12](https://github.com/introproventures/graphql-jpa-query/commit/8028d129f70f497e38463ad18fe2900072129877)
+* feat: add conditional property to disable GraphQLController (#161) [4bf7596](https://github.com/introproventures/graphql-jpa-query/commit/4bf75966b31e9a7d7e931ad9fbd300fec109d02d)
+* Add LocalDate/LocalDateTime/OffsetDateTime/ZonedDateTime/Instant support for query and filter (#158) [a3f7877](https://github.com/introproventures/graphql-jpa-query/commit/a3f7877b1b80fc074c4677c67511c55413172ef1)
+* fix(versions): update Spring Boot to 2.1.7 (#159) [257a92d](https://github.com/introproventures/graphql-jpa-query/commit/257a92d58cd12ef67ec4134c0277967c72d8eb9e)
 * 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)

README.md

@@ -6,16 +6,16 @@ GraphQL Query Api for JPA Entity Models [![Try in PWD](https://cdn.rawgit.com/pl
 [![Maven Central](https://img.shields.io/maven-central/v/com.introproventures/graphql-jpa-query.svg)](https://mvnrepository.com/artifact/com.introproventures/graphql-jpa-query)
 [![Jitpack.io](https://jitpack.io/v/introproventures/graphql-jpa-query.svg)](https://jitpack.io/#introproventures/graphql-jpa-query) 
 
-GraphQL is a query language for Web APIs implemented by GraphQL Java [graphql-java 11.0](https://github.com/andimarek/graphql-java) runtime for fulfilling those queries with your existing data. GraphQL provides a complete and understandable description of the data in your API, gives clients the power to ask for exactly what they need and nothing more, makes it easier to evolve APIs over time, and enables powerful developer tools.
-
-JPA 2.1 (Java Persistence Annotation) is Java's standard solution to bridge the gap between object-oriented domain models and relational database systems. 
-
 GraphQL JPA Query library uses JPA 2.1 specification to derive and build GraphQL Apis using GraphQL Java for your JPA Entity Java Classes. It provides a powerfull JPA Query Schema Builder to generate GraphQL Schema using JPA EntityManager Api and instruments GraphQL Schema with JPA Query Data Fetchers that transform GraphQL queries into JPA queries on the fly.
 
-Your applications can now use GraphQL queries that smoothly follow references between JPA resources with flexible type safe criteria expressions and user-friendly SQL query syntax semantics i.e. query by page, where criteria expressions, select, order by etc. 
+GraphQL is a query language for Web APIs implemented by GraphQL Java [graphql-java 11.0](https://github.com/andimarek/graphql-java) runtime for fulfilling those queries with your existing data. GraphQL provides a complete and understandable description of the data in your API, gives clients the power to ask for exactly what they need and nothing more, makes it easier to evolve APIs over time, and enables powerful developer tools.
+
+Your applications can now use GraphQL queries that smoothly follow references between JPA entities with flexible type safe criteria expressions and user-friendly SQL query syntax semantics i.e. query by page, where criteria expressions, select, order by etc. 
 
 While typical REST APIs require loading from multiple URLs, GraphQL APIs get all the data your app needs in a single request. Apps using GraphQL can be quick even on slow mobile network connections.
 
+JPA 2.1 (Java Persistence Annotation) is Java's standard solution to bridge the gap between object-oriented domain models and relational database systems. 
+
 GraphQL JPA Query creates a uniform query API across for your applications without being limited by a single data source. You can use it with multiple JPA compliant databases by instrumenting separate EntityManager for each DataSource and expose a single GraphQL Query Apis for your Web application domain using Spring Boot Auto Configuration magic.
 
 Tested using JDK Versions

graphql-jpa-query-annotations/pom.xml

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

graphql-jpa-query-annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnore.java

@@ -16,6 +16,7 @@
 package com.introproventures.graphql.jpa.query.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -28,7 +29,7 @@
  * @author Igor Dianov
  *
  */
-@Target( { TYPE, FIELD })
+@Target( { TYPE, FIELD, METHOD })
 @Retention(RUNTIME)
 public @interface GraphQLIgnore {
 }

graphql-jpa-query-autoconfigure/pom.xml

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

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.28-SNAPSHOT</version>
+    <version>0.3.34-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.28-SNAPSHOT</version>
+        <version>0.3.34-SNAPSHOT</version>
         <relativePath>../graphql-jpa-query-dependencies</relativePath>
     </parent>
     <artifactId>graphql-jpa-query-build</artifactId>
@@ -15,7 +15,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.3.RELEASE</version>
+                <version>2.1.7.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

graphql-jpa-query-dependencies/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.introproventures</groupId>
         <artifactId>graphql-jpa-query</artifactId>
-        <version>0.3.28-SNAPSHOT</version>
+        <version>0.3.34-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.28-SNAPSHOT</version>
+    <version>0.3.34-SNAPSHOT</version>
     <relativePath>../graphql-jpa-query-build</relativePath>
   </parent>
 

graphql-jpa-query-example-merge/src/main/resources/books.sql

@@ -7,3 +7,16 @@ insert into book (id, title, author_id, genre) values (5, 'The Cherry Orchard',
 insert into book (id, title, author_id, genre) values (6, 'The Seagull', 4, 'PLAY');
 insert into book (id, title, author_id, genre) values (7, 'Three Sisters', 4, 'PLAY');
 insert into author (id, name, genre) values (8, 'Igor Dianov', 'JAVA');
+
+insert into book_tags (book_id, tags) values (2, 'war'), (2, 'piece');
+insert into book_tags (book_id, tags) values (3, 'anna'), (3, 'karenina');
+insert into book_tags (book_id, tags) values (5, 'cherry'), (5, 'orchard');
+insert into book_tags (book_id, tags) values (6, 'seagull');
+insert into book_tags (book_id, tags) values (7, 'three'), (7, 'sisters');
+
+insert into author_phone_numbers(phone_number, author_id) values
+	('1-123-1234', 1),
+	('1-123-5678', 1),
+	('4-123-1234', 4),
+	('4-123-5678', 4);
+

graphql-jpa-query-example-model-books/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.introproventures</groupId>
     <artifactId>graphql-jpa-query-build</artifactId>
-    <version>0.3.28-SNAPSHOT</version>
+    <version>0.3.34-SNAPSHOT</version>
     <relativePath>../graphql-jpa-query-build</relativePath>
   </parent>
   <artifactId>graphql-jpa-query-example-model-books</artifactId>

graphql-jpa-query-example-model-books/src/main/java/com/introproventures/graphql/jpa/query/schema/model/book/Book.java

@@ -17,22 +17,29 @@
 package com.introproventures.graphql.jpa.query.schema.model.book;
 
 import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Transient;
 
+import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
+import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnore;
 import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreFilter;
 import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreOrder;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
 @Entity
-@EqualsAndHashCode(exclude="author")
+@EqualsAndHashCode(exclude= {"author", "tags"})
 public class Book {
 	@Id
 	Long id;
@@ -42,12 +49,22 @@ public class Book {
 	@GraphQLIgnoreOrder
 	@GraphQLIgnoreFilter
 	String description;
+
+	@ElementCollection(fetch = FetchType.LAZY)
+	@GraphQLDescription("A set of user-defined tags")
+	private Set<String> tags = new LinkedHashSet<>();	
 
 	@ManyToOne(fetch=FetchType.LAZY, optional = false)
 	Author author;
 
 	@Enumerated(EnumType.STRING)
 	Genre genre;
 
-    Date publicationDate;	
+    Date publicationDate;
+
+    @Transient
+	@GraphQLIgnore
+    public String getAuthorName(){
+    	return author.getName();
+	}
 }

graphql-jpa-query-example-model-starwars/pom.xml

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

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

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

graphql-jpa-query-graphiql/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.introproventures</groupId>
     <artifactId>graphql-jpa-query</artifactId>
-    <version>0.3.28-SNAPSHOT</version>
+    <version>0.3.34-SNAPSHOT</version>
   </parent>
   <artifactId>graphql-jpa-query-graphiql</artifactId>
 </project>

graphql-jpa-query-schema/pom.xml

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

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/introspection/AnnotationDescriptor.java

@@ -0,0 +1,115 @@
+package com.introproventures.graphql.jpa.query.introspection;
+
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.Objects;
+
+public class AnnotationDescriptor {
+
+    private final Annotation annotation;
+
+    private final Class<? extends Annotation> annotationType;
+
+    private final ElementType[] elementTypes;
+
+    private final RetentionPolicy policy;
+
+    private final boolean isDocumented;
+
+    private final boolean isInherited;
+
+    public <A extends Annotation> AnnotationDescriptor(A annotation) {
+        this.annotation = annotation;
+        annotationType = annotation.annotationType();
+
+        Target target = annotationType.getAnnotation(Target.class);
+        elementTypes = (target == null) ? ElementType.values() : target.value();
+
+        Retention retention = annotationType.getAnnotation(Retention.class);
+        policy = (retention == null) ? RetentionPolicy.CLASS : retention.value();
+
+        Documented documented = annotationType.getAnnotation(Documented.class);
+        isDocumented = (documented != null);
+
+        Inherited inherited = annotationType.getAnnotation(Inherited.class);
+        isInherited = (inherited != null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Annotation> A getAnnotation() {
+        return (A) annotation;
+    }
+
+    public Class<? extends Annotation> getAnnotationType() {
+        return annotationType;
+    }
+
+    public ElementType[] getElementTypes() {
+        return elementTypes;
+    }
+
+    public RetentionPolicy getPolicy() {
+        return policy;
+    }
+
+    public boolean isDocumented() {
+        return isDocumented;
+    }
+
+    public boolean isInherited() {
+        return isInherited;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("AnnotationDescriptor [annotation=")
+               .append(annotation)
+               .append(", annotationType=")
+               .append(annotationType)
+               .append(", elementTypes=")
+               .append(Arrays.toString(elementTypes))
+               .append(", policy=")
+               .append(policy)
+               .append(", isDocumented=")
+               .append(isDocumented)
+               .append(", isInherited=")
+               .append(isInherited)
+               .append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Arrays.hashCode(elementTypes);
+        result = prime * result + Objects.hash(annotation, annotationType, isDocumented, isInherited, policy);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        AnnotationDescriptor other = (AnnotationDescriptor) obj;
+        return Objects.equals(annotation, other.annotation) 
+                && Objects.equals(annotationType, other.annotationType) 
+                && Arrays.equals(elementTypes, other.elementTypes) 
+                && isDocumented == other.isDocumented 
+                && isInherited == other.isInherited 
+                && policy == other.policy;
+    }
+
+}