Merge pull request #2 from ExpediaInc/upgrade-versions

Update Spring Cloud version to Brixton RC2 because the old version do…

Author: Joholland

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.M4'
+        mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:Brixton.SR3'
     }
 }
 

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

@@ -1,29 +1,25 @@
 package org.lognet.springboot.grpc;
 
-import com.google.common.util.concurrent.ListenableFuture;
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import io.grpc.examples.GreeterGrpc;
-import io.grpc.examples.GreeterOuterClass;
-import io.netty.handler.codec.http.HttpMethod;
+import static org.junit.Assert.assertEquals;
+
 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.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
 import org.springframework.boot.test.WebIntegrationTest;
-import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.util.concurrent.ExecutionException;
 
-import static org.junit.Assert.assertEquals;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.examples.GreeterGrpc;
+import io.grpc.examples.GreeterOuterClass;
 
 /**
  * Created by alexf on 28-Jan-16.
@@ -33,33 +29,38 @@
 @WebIntegrationTest
 
 public class GreeterAppTest {
+
     private ManagedChannel channel;
+
     @Before
-    public void setup(){
+    public void setup() {
         channel = ManagedChannelBuilder.forAddress("localhost", 6565)
-                .usePlaintext(true)
-                .build();
+            .usePlaintext(true)
+            .build();
 
     }
+
     @After
-    public void tearDown(){
+    public void tearDown() {
         channel.shutdown();
     }
 
     @Test
-    public  void simpleGreeting () throws ExecutionException, InterruptedException {
+    public void simpleGreeting() throws ExecutionException, InterruptedException {
 
         final GreeterGrpc.GreeterFutureStub greeterFutureStub = GreeterGrpc.newFutureStub(channel);
-        final GreeterOuterClass.HelloRequest helloRequest = GreeterOuterClass.HelloRequest.newBuilder().setName("John").build();
+        final GreeterOuterClass.HelloRequest
+            helloRequest =
+            GreeterOuterClass.HelloRequest.newBuilder().setName("John").build();
         final String replay = greeterFutureStub.sayHello(helloRequest).get().getMessage();
         System.out.println(replay);
     }
 
     @Test
-    public  void actuatorTest () throws ExecutionException, InterruptedException {
+    public void actuatorTest() throws ExecutionException, InterruptedException {
         final TestRestTemplate template = new TestRestTemplate();
 
-        ResponseEntity<String> response = template.getForEntity("http://localhost:8080/env",String.class);
+        ResponseEntity<String> response = template.getForEntity("http://localhost:8080/env", String.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
     }