Extract graphql-jpa-query-web module from starter (#74)

igdianov · web-flow · commit 8d72bbee8d6a · 2019-02-02T20:51:01.000-08:00
* fix: Extract graphql-jpa-query-web module from starter

* fix: (git) add .classpath to .gitignore

* fix: add  GraphQLControllerAutoConfigurationTest
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 # Eclipse
-#.classpath
 .project/
 .settings/
 build/
@@ -21,13 +20,4 @@ target/
 # Eclipse
 .project
 .springBeans
-
-
-
-graphql-jpa-query-schema/\.classpath
-
-graphql-jpa-query-annotations/\.classpath
-
-graphql-jpa-query-example/\.classpath
-
-graphql-jpa-query-boot-starter/\.classpath
+.classpath
diff --git a/graphql-jpa-query-boot-starter/pom.xml b/graphql-jpa-query-boot-starter/pom.xml
@@ -23,6 +23,11 @@
       <artifactId>graphql-jpa-query-autoconfigure</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.introproventures</groupId>
+      <artifactId>graphql-jpa-query-web</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
diff --git a/graphql-jpa-query-boot-starter/src/main/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/EnableGraphQLJpaQuery.java b/graphql-jpa-query-boot-starter/src/main/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/EnableGraphQLJpaQuery.java
@@ -22,15 +22,15 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import com.introproventures.graphql.jpa.query.boot.autoconfigure.GraphQLJpaQueryAutoConfiguration.DefaultGraphQLJpaQueryConfiguration;
+import com.introproventures.graphql.jpa.query.boot.autoconfigure.GraphQLJpaQueryAutoConfiguration.GraphQLJpaQuerySchemaConfigurer;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 
-import com.introproventures.graphql.jpa.query.boot.autoconfigure.GraphQLJpaQueryAutoConfiguration.DefaultActivitiGraphQLJpaConfiguration;
-
 @Documented
 @Retention( RUNTIME )
 @Target( TYPE )
-@Import(DefaultActivitiGraphQLJpaConfiguration.class)
+@Import({DefaultGraphQLJpaQueryConfiguration.class, GraphQLJpaQuerySchemaConfigurer.class})
 @PropertySource("classpath:/com/introproventures/graphql/jpa/query/boot/autoconfigure/default.properties")
 public @interface EnableGraphQLJpaQuery {
     
diff --git a/graphql-jpa-query-boot-starter/src/main/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/GraphQLJpaQueryAutoConfiguration.java b/graphql-jpa-query-boot-starter/src/main/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/GraphQLJpaQueryAutoConfiguration.java
@@ -23,7 +23,6 @@
 import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
-import com.introproventures.graphql.jpa.query.web.GraphQLController;
 import graphql.GraphQL;
 import graphql.schema.GraphQLSchema;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportAware;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.type.AnnotationMetadata;
@@ -62,9 +60,8 @@ public void configure(GraphQLShemaRegistration registry) {
     }
     
     @Configuration
-    @Import(GraphQLController.class)
     @EnableConfigurationProperties(GraphQLJpaQueryProperties.class)
-    public static class DefaultActivitiGraphQLJpaConfiguration implements ImportAware {
+    public static class DefaultGraphQLJpaQueryConfiguration implements ImportAware {
         
         @Autowired
         GraphQLJpaQueryProperties properties;
diff --git a/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/EnableGraphQLJpaQueryTest.java b/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/EnableGraphQLJpaQueryTest.java
@@ -30,7 +30,7 @@
 import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
-import com.introproventures.graphql.jpa.query.web.model.Author;
+import com.introproventures.graphql.jpa.query.starter.model.Author;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(
diff --git a/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/GraphQLJpaQueryAutoConfigurationTest.java b/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/GraphQLJpaQueryAutoConfigurationTest.java
@@ -30,7 +30,7 @@
 import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
-import com.introproventures.graphql.jpa.query.web.model.Author;
+import com.introproventures.graphql.jpa.query.starter.model.Author;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
diff --git a/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/GraphQLJpaQueryStarterIT.java b/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/GraphQLJpaQueryStarterIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.introproventures.graphql.jpa.query.web;
+package com.introproventures.graphql.jpa.query.starter;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -41,7 +41,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class GraphQLControllerIT {
+public class GraphQLJpaQueryStarterIT {
 	private static final String	WAR_AND_PEACE	= "War and Peace";
 
     @SpringBootApplication
diff --git a/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/model/Author.java b/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/model/Author.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.introproventures.graphql.jpa.query.web.model;
+package com.introproventures.graphql.jpa.query.starter.model;
 
 import java.util.Collection;
 
diff --git a/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/model/Book.java b/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/model/Book.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.introproventures.graphql.jpa.query.web.model;
+package com.introproventures.graphql.jpa.query.starter.model;
 
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
diff --git a/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/model/Genre.java b/graphql-jpa-query-boot-starter/src/test/java/com/introproventures/graphql/jpa/query/starter/model/Genre.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.introproventures.graphql.jpa.query.web.model;
+package com.introproventures.graphql.jpa.query.starter.model;
 
 public enum Genre {
 	NOVEL, PLAY
diff --git a/graphql-jpa-query-dependencies/pom.xml b/graphql-jpa-query-dependencies/pom.xml
@@ -59,6 +59,11 @@
                 <artifactId>graphql-jpa-query-autoconfigure</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.introproventures</groupId>
+                <artifactId>graphql-jpa-query-web</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/graphql-jpa-query-web/pom.xml b/graphql-jpa-query-web/pom.xml
@@ -0,0 +1,24 @@
+<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>
+  <parent>
+    <groupId>com.introproventures</groupId>
+    <artifactId>graphql-jpa-query-build</artifactId>
+    <version>0.3.13-SNAPSHOT</version>
+    <relativePath>../graphql-jpa-query-build</relativePath>
+  </parent>
+  <artifactId>graphql-jpa-query-web</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.introproventures</groupId>
+      <artifactId>graphql-jpa-query-schema</artifactId>
+      <optional>true</optional>
+    </dependency>  
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <optional>true</optional>
+    </dependency>  
+  </dependencies>  
+  
+</project>
diff --git a/graphql-jpa-query-web/src/main/java/com/introproventures/graphql/jpa/query/web/GraphQLController.java b/graphql-jpa-query-web/src/main/java/com/introproventures/graphql/jpa/query/web/GraphQLController.java
@@ -26,8 +26,6 @@
 import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
 import graphql.ExecutionResult;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,8 +41,6 @@
  *
  */
 @RestController
-@ConditionalOnWebApplication
-@ConditionalOnClass(GraphQLExecutor.class)
 public class GraphQLController {
 
     private static final String PATH = "${spring.graphql.jpa.query.path:/graphql}";
diff --git a/graphql-jpa-query-web/src/main/java/com/introproventures/graphql/jpa/query/web/autoconfigure/GraphQLControllerAutoConfiguration.java b/graphql-jpa-query-web/src/main/java/com/introproventures/graphql/jpa/query/web/autoconfigure/GraphQLControllerAutoConfiguration.java
@@ -0,0 +1,20 @@
+package com.introproventures.graphql.jpa.query.web.autoconfigure;
+
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
+import com.introproventures.graphql.jpa.query.web.GraphQLController;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@ConditionalOnWebApplication
+@ConditionalOnClass(GraphQLExecutor.class)
+public class GraphQLControllerAutoConfiguration {
+    
+    @Import(GraphQLController.class)
+    public static class DefaultGraphQLControllerConfiguration {
+        
+    }
+    
+}
diff --git a/graphql-jpa-query-web/src/main/resources/META-INF/spring.factories b/graphql-jpa-query-web/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+	com.introproventures.graphql.jpa.query.web.autoconfigure.GraphQLControllerAutoConfiguration
diff --git a/graphql-jpa-query-web/src/test/java/com/introproventures/graphql/jpa/query/web/GraphQLControllerTest.java b/graphql-jpa-query-web/src/test/java/com/introproventures/graphql/jpa/query/web/GraphQLControllerTest.java
diff --git a/graphql-jpa-query-web/src/test/java/com/introproventures/graphql/jpa/query/web/autoconfigure/GraphQLControllerAutoConfigurationTest.java b/graphql-jpa-query-web/src/test/java/com/introproventures/graphql/jpa/query/web/autoconfigure/GraphQLControllerAutoConfigurationTest.java
@@ -0,0 +1,36 @@
+package com.introproventures.graphql.jpa.query.web.autoconfigure;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
+import com.introproventures.graphql.jpa.query.web.GraphQLController;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
+public class GraphQLControllerAutoConfigurationTest {
+    
+    @MockBean
+    private GraphQLExecutor graphQLExecutor;
+    
+    @Autowired
+    private GraphQLController graphQLController;
+    
+    @SpringBootApplication
+    static class Application {
+        
+    }
+    
+    @Test
+    public void contextLoads() {
+        assertThat(graphQLController).isNotNull();
+    }
+
+}
diff --git a/graphql-jpa-query-web/src/test/java/com/introproventures/graphql/jpa/query/web/autoconfigure/GraphQLControllerAutoConfigurationWebNoneTest.java b/graphql-jpa-query-web/src/test/java/com/introproventures/graphql/jpa/query/web/autoconfigure/GraphQLControllerAutoConfigurationWebNoneTest.java
@@ -0,0 +1,36 @@
+package com.introproventures.graphql.jpa.query.web.autoconfigure;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
+import com.introproventures.graphql.jpa.query.web.GraphQLController;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.NONE)
+public class GraphQLControllerAutoConfigurationWebNoneTest {
+    
+    @MockBean
+    private GraphQLExecutor graphQLExecutor;
+    
+    @Autowired(required=false)
+    private GraphQLController graphQLController;
+    
+    @SpringBootApplication
+    static class Application {
+        
+    }
+    
+    @Test
+    public void contextLoads() {
+        assertThat(graphQLController).isNull();
+    }
+
+}
diff --git a/pom.xml b/pom.xml
@@ -38,6 +38,7 @@
         <module>graphql-jpa-query-dependencies</module>
         <module>graphql-jpa-query-build</module>
         <module>graphql-jpa-query-autoconfigure</module>
+        <module>graphql-jpa-query-web</module>
     </modules>
 
     <distributionManagement>
