Merge remote-tracking branch 'origin/master'

Author: jvmlet

.gitignore

@@ -1,7 +1,8 @@
-.gradle
+.*
 build/
 gradle-app.setting
 !gradle-wrapper.jar
 .gradletasknamecache
 .idea
-*.iml
+*.iml
+bin/

build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'idea'
 buildscript {
     ext {
-        springBootVersion = '1.3.6.RELEASE'
-        grpcVersion = '1.0.0-pre2' //0.15.0
+        springBootVersion = '1.4.0.RELEASE'
+        grpcVersion = '1.0.0'
     }
     repositories {
         mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
         classpath group: 'com.netflix.nebula', name: 'nebula-project-plugin', version: '2.2.1'
         classpath group: 'com.netflix.nebula', name: 'nebula-interactive', version: '2.0.+'
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.0.0"

gradle.properties

@@ -1,6 +1,6 @@
-version=0.0.5-SNAPSHOT
+version=0.0.6-SNAPSHOT
 group=org.lognet
 description=Spring Boot starter for Google RPC.
 gitHubUrl=https\://github.com/LogNet/grpc-spring-boot-starter
 bintrayUser=secured
-bintrayApiKey=secured
+bintrayApiKey=secured

grpc-spring-boot-starter-demo/build.gradle

@@ -55,7 +55,7 @@ clean.dependsOn cleanProtoGen
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:Brixton.SR3'
+        mavenBom "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
     }
 }
 

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/GreeterApp.java

@@ -1,13 +1,14 @@
 package org.lognet.springboot.grpc.demo;
 
 
-import io.grpc.examples.GreeterGrpc;
-import io.grpc.examples.GreeterOuterClass;
-import io.grpc.stub.StreamObserver;
 import org.lognet.springboot.grpc.GRpcService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import io.grpc.examples.GreeterGrpc;
+import io.grpc.examples.GreeterOuterClass;
+import io.grpc.stub.StreamObserver;
+
 /**
  * Created by alexf on 28-Jan-16.
  */
@@ -29,5 +30,6 @@ public void sayHello(GreeterOuterClass.HelloRequest request, StreamObserver<Gree
     public static void main(String[] args) {
         SpringApplication.run(GreeterApp.class,args);
     }
+
 }
 

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java

@@ -21,7 +21,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.0.0-pre2)",
+    value = "by gRPC proto compiler (version 1.0.0)",
     comments = "Source: greeter.proto")
 public class GreeterGrpc {
 

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/GreeterAppTest.java

@@ -1,20 +1,20 @@
 package org.lognet.springboot.grpc;
 
 import static org.junit.Assert.assertEquals;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
+
+import java.util.concurrent.ExecutionException;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.lognet.springboot.grpc.demo.GreeterApp;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.concurrent.ExecutionException;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -24,10 +24,8 @@
 /**
  * Created by alexf on 28-Jan-16.
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(GreeterApp.class)
-@WebIntegrationTest
-
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GreeterApp.class, webEnvironment = DEFINED_PORT)
 public class GreeterAppTest {
 
     private ManagedChannel channel;
@@ -37,7 +35,6 @@ public void setup() {
         channel = ManagedChannelBuilder.forAddress("localhost", 6565)
             .usePlaintext(true)
             .build();
-
     }
 
     @After