Fixed some unit tests and bumped version for release 5.0.5

Author: oliemansm

README.md

@@ -42,13 +42,13 @@ repositories {
 }
 
 dependencies {
-  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:5.0.4'
+  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:5.0.5'
   
   // to embed GraphiQL tool
-  compile 'com.graphql-java-kickstart:graphiql-spring-boot-starter:5.0.4'
+  compile 'com.graphql-java-kickstart:graphiql-spring-boot-starter:5.0.5'
 
   // to embed Voyager tool
-  compile 'com.graphql-java-kickstart:voyager-spring-boot-starter:5.0.4'
+  compile 'com.graphql-java-kickstart:voyager-spring-boot-starter:5.0.5'
 }
 ```
 
@@ -57,21 +57,21 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 ```
 

example-graphql-tools/src/test/java/com/oembedler/moon/graphql/boot/SpringBootTestWithoutWebEnvironmentTest.java

@@ -0,0 +1,17 @@
+package com.oembedler.moon.graphql.boot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringBootTestWithoutWebEnvironmentTest {
+
+    @Test
+    public void loads_without_complaining_about_missing_ServerContainer() {
+
+    }
+
+}

gradle.properties

@@ -17,7 +17,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-version = 5.0.5-SNAPSHOT
+version = 5.0.5
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot
 PROJECT_DESC = GraphQL Spring Framework Boot
@@ -40,8 +40,8 @@ LIB_GRAPHQL_JAVA_VER = 9.2
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
 LIB_SPRING_BOOT_VER = 2.0.5.RELEASE
-LIB_GRAPHQL_SERVLET_VER = 6.1.4
-LIB_GRAPHQL_JAVA_TOOLS_VER = 5.3.4-SNAPSHOT
+LIB_GRAPHQL_SERVLET_VER = 6.2.0
+LIB_GRAPHQL_JAVA_TOOLS_VER = 5.3.4
 LIB_COMMONS_IO_VER = 2.6
 
 GRADLE_WRAPPER_VER = 4.7

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebsocketAutoConfiguration.java

@@ -41,7 +41,7 @@ public ServerEndpointRegistration serverEndpointRegistration(GraphQLWebsocketSer
 
     @Bean
     @ConditionalOnMissingBean
-    @ConditionalOnClass(ServerContainer.class)
+    @ConditionalOnBean(ServerContainer.class)
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
     }

graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTestAutoConfiguration.java

@@ -1,16 +1,15 @@
 package com.graphql.spring.boot.test;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.*;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.DispatcherServlet;
 
 @Configuration
 @ConditionalOnWebApplication
-@ConditionalOnClass(DispatcherServlet.class)
+@ConditionalOnBean(TestRestTemplate.class)
+@ConditionalOnClass({DispatcherServlet.class})
 @ConditionalOnProperty(value = "graphql.servlet.enabled", havingValue = "true", matchIfMissing = true)
 public class GraphQLTestAutoConfiguration {