fix: spring.graphql.jpa.query.path must be specified (#94)

* fix: remove duplicate graphql-jpa-query-autoconfigure dependency

* fix: stop tracking .classpath

* fix: add spring-boot-configuration-processor dependency

* fix: missing graphql.path property in starters

* fix: add missing Starwars entity models

Author: igdianov

graphql-jpa-query-autoconfigure/.classpath

@@ -30,6 +30,11 @@
       <artifactId>hibernate-validator</artifactId>
       <scope>test</scope>      
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
 </project>

graphql-jpa-query-autoconfigure/pom.xml

@@ -18,15 +18,9 @@
 import javax.validation.constraints.NotEmpty;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
 import org.springframework.validation.annotation.Validated;
 
 @ConfigurationProperties(prefix="spring.graphql.jpa.query")
-@PropertySources(value= {
-    @PropertySource("classpath:/com/introproventures/graphql/jpa/query/boot/autoconfigure/default.properties"),
-    @PropertySource(value = "classpath:graphql-jpa-autoconfigure.properties", ignoreResourceNotFound = true)
-})
 @Validated
 public class GraphQLJpaQueryProperties {
 

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

@@ -9,6 +9,8 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
 import org.springframework.util.CollectionUtils;
 
 import graphql.GraphQL;
@@ -17,6 +19,10 @@
 @Configuration
 @ConditionalOnClass(GraphQL.class)
 @EnableConfigurationProperties(GraphQLJpaQueryProperties.class)
+@PropertySources(value= {
+    @PropertySource("classpath:com/introproventures/graphql/jpa/query/boot/autoconfigure/default.properties"),
+    @PropertySource(value = "classpath:graphql-jpa-autoconfigure.properties", ignoreResourceNotFound = true)
+})
 public class GraphQLSchemaAutoConfiguration {
 
     private final List<GraphQLSchemaConfigurer> graphQLSchemaConfigurers = new ArrayList<>();

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

@@ -27,11 +27,6 @@
       <artifactId>graphql-jpa-query-schema</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.introproventures</groupId>
-      <artifactId>graphql-jpa-query-autoconfigure</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.introproventures</groupId>
       <artifactId>graphql-jpa-query-autoconfigure</artifactId>

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

@@ -0,0 +1,18 @@
+package com.introproventures.graphql.jpa.query.example;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.DEFINED_PORT)
+public class ApplicationTest {
+
+    @Test
+    public void contextLoads() {
+        // success
+    }
+
+}

graphql-jpa-query-example-merge/src/test/java/com/introproventures/graphql/jpa/query/example/ApplicationTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.example.starwars;
+
+import java.util.Set;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OrderBy;
+
+import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Entity
+@GraphQLDescription("Abstract representation of an entity in the Star Wars Universe")
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(exclude={"appearsIn","friends"}) // Fixes NPE in Hibernate when initializing loaded collections #1
+public abstract class Character {
+
+    @Id
+    @GraphQLDescription("Primary Key for the Character Class")
+    String id;
+
+    @GraphQLDescription("Name of the character")
+    String name;
+
+    @GraphQLDescription("Who are the known friends to this character")
+    @ManyToMany
+    @JoinTable(name="character_friends",
+            joinColumns=@JoinColumn(name="source_id", referencedColumnName="id"),
+            inverseJoinColumns=@JoinColumn(name="friend_id", referencedColumnName="id"))
+    Set<Character> friends; 
+
+    @GraphQLDescription("What Star Wars episodes does this character appear in")
+    @ElementCollection(targetClass = Episode.class)
+    @Enumerated(EnumType.ORDINAL)
+    @OrderBy
+    Set<Episode> appearsIn;
+    
+    Character() {}
+
+}

graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/Character.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.example.starwars;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
+import lombok.Data;
+
+@Entity
+@GraphQLDescription("Database driven enumeration")
+@Data
+public class CodeList {
+
+    @Id
+    @GraphQLDescription("Primary Key for the Code List Class")
+    Long id;
+
+    String type;
+    String code;
+    Integer sequence;
+    boolean active;
+    String description;
+
+    @ManyToOne
+    @JoinColumn(name = "parent_id")
+    CodeList parent;
+
+}

graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/CodeList.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.example.starwars;
+
+import javax.persistence.Entity;
+
+import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Entity
+@GraphQLDescription("Represents an electromechanical robot in the Star Wars Universe")
+@Data
+@EqualsAndHashCode(callSuper=true)
+public class Droid extends Character {
+
+    @GraphQLDescription("Documents the primary purpose this droid serves")
+    String primaryFunction;
+
+}

graphql-jpa-query-example/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/Droid.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.example.starwars;
+
+public enum Episode {
+
+    PHANTOM_MENACE,
+    ATTACK_OF_THE_CLONES,
+    REVENGE_OF_THE_SITH,
+    A_NEW_HOPE,
+    EMPIRE_STRIKES_BACK,
+    RETURN_OF_THE_JEDI,
+    THE_FORCE_AWAKENS
+
+}