Upgrade next and simple it sample (upgrade to SCF 2.0)

Author: Dave Syer

src/it/next/pom.xml

@@ -19,7 +19,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
+		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 	</properties>
 
 	<dependencies>

src/it/next/src/test/java/com/example/SampleApplicationTests.java

@@ -15,13 +15,17 @@
  */
 package com.example;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,29 +38,36 @@
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class SampleApplicationTests {
 
+	private HttpHeaders headers;
+
 	@LocalServerPort
 	private int port;
+	private TestRestTemplate rest = new TestRestTemplate();
+
+	@Before
+	public void before() {
+		headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON);
+	}
 
 	@Test
 	public void words() {
-		assertThat(new TestRestTemplate()
-				.getForObject("http://localhost:" + port + "/words", String.class))
-						.isEqualTo("[{\"value\":\"foo\"},{\"value\":\"bar\"}]");
+		assertThat(rest.getForObject("http://localhost:" + port + "/words", String.class))
+				.isEqualTo("[{\"value\":\"foo\"},{\"value\":\"bar\"}]");
 	}
 
 	@Test
 	public void uppercase() {
-		// TODO: make this work with a JSON stream as well (like in WebFlux)
-		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/uppercase", "[{\"value\":\"foo\"}]",
-				String.class)).isEqualTo("[{\"value\":\"FOO\"}]");
+		assertThat(rest.postForObject("http://localhost:" + port + "/uppercase",
+				new HttpEntity<>("[{\"value\":\"foo\"}]", headers), String.class))
+						.isEqualTo("[{\"value\":\"FOO\"}]");
 	}
 
 	@Test
 	public void lowercase() {
-		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/lowercase", "[{\"value\":\"Foo\"}]",
-				String.class)).isEqualTo("[{\"value\":\"foo\"}]");
+		assertThat(rest.postForObject("http://localhost:" + port + "/lowercase",
+				new HttpEntity<>("[{\"value\":\"Foo\"}]", headers), String.class))
+						.isEqualTo("[{\"value\":\"foo\"}]");
 	}
 
 }

src/it/simple/pom.xml

@@ -19,7 +19,7 @@
 
 	<properties>
 		<java.version>11</java.version>
-		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
+		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 	</properties>
 
 	<dependencies>

src/it/simple/src/main/java/com/example/SampleApplication.java

@@ -16,14 +16,11 @@
 package com.example;
 
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
-import reactor.core.publisher.Flux;
-
 @SpringBootApplication
 public class SampleApplication {
 

src/it/simple/src/test/java/com/example/SampleApplicationTests.java

@@ -15,13 +15,17 @@
  */
 package com.example;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,15 +38,23 @@
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class SampleApplicationTests {
 
+	private HttpHeaders headers;
+
 	@LocalServerPort
 	private int port;
+	private TestRestTemplate rest = new TestRestTemplate();
+
+	@Before
+	public void before() {
+		headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_JSON);
+	}
 
 	@Test
 	public void uppercase() {
-		// TODO: make this work with a JSON stream as well (like in WebFlux)
-		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/", "[{\"value\":\"foo\"}]",
-				String.class)).isEqualTo("[{\"value\":\"FOO\"}]");
+		assertThat(rest.postForObject("http://localhost:" + port + "/uppercase",
+				new HttpEntity<>("[{\"value\":\"foo\"}]", headers), String.class))
+						.isEqualTo("[{\"value\":\"FOO\"}]");
 	}
 
 }