move custom port code, upgrade to boot 2 (#4126)

spring-rest/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java

@@ -19,14 +19,14 @@ import static org.junit.Assert.assertTrue;
 
 public class TestRestTemplateBasicLiveTest {
 
-    private RestTemplate restTemplate;
+    private RestTemplateBuilder restTemplate;
     private static final String FOO_RESOURCE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest/foos";
     private static final String URL_SECURED_BY_AUTHENTICATION = "http://httpbin.org/basic-auth/user/passwd";
     private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
 
     @Before
     public void beforeTest() {
-        restTemplate = new RestTemplate();
+        restTemplate = new RestTemplateBuilder();
     }
 
     // GET

spring-rest/src/test/java/org/baeldung/pact/PactProviderLiveTest.java

@@ -17,7 +17,7 @@ import au.com.dius.pact.provider.junit.target.TestTarget;
 @RunWith(PactRunner.class)
 @Provider("test_provider")
 @PactFolder("pacts")
-public class PactProviderTest {
+public class PactProviderLiveTest {
 
     @TestTarget
     public final Target target = new HttpTarget("http", "localhost", 8082, "/spring-rest");

spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.0

@@ -8,7 +8,7 @@ Content-Length: 1759
 Connection: keep-alive
 Accept-Ranges: bytes
 Server: nginx/1.10.0 (Ubuntu)
-Date: Fri, 23 Jun 2017 15:44:52 GMT
+Date: Sat, 28 Apr 2018 20:53:35 GMT
 Last-Modified: Tue, 27 May 2014 02:35:47 GMT
 ETag: "5383fa03-6df"
 OkHttp-Sent-Millis: 1489054646765

spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.0

@@ -4,10 +4,10 @@ GET
 HTTP/1.1 301 Moved Permanently
 8
 Server: nginx/1.10.0 (Ubuntu)
-Date: Sat, 24 Jun 2017 01:06:43 GMT
+Date: Sat, 28 Apr 2018 20:53:33 GMT
 Content-Type: text/html
 Content-Length: 194
 Connection: keep-alive
 Location: https://publicobject.com/helloworld.txt
-OkHttp-Sent-Millis: 1498266403462
-OkHttp-Received-Millis: 1498266403727
+OkHttp-Sent-Millis: 1524948815122
+OkHttp-Received-Millis: 1524948815342

spring-rest/src/test/resources/cache/journal

@@ -61,3 +61,9 @@ READ 2d9345a30d2cc31bb3091d70a8ef6c18
 READ 4b217e04ba52215f3a6b64d28f6729c6
 DIRTY 4b217e04ba52215f3a6b64d28f6729c6
 CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
+READ 4b217e04ba52215f3a6b64d28f6729c6
+DIRTY 4b217e04ba52215f3a6b64d28f6729c6
+CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
+READ 2d9345a30d2cc31bb3091d70a8ef6c18
+DIRTY 2d9345a30d2cc31bb3091d70a8ef6c18
+CLEAN 2d9345a30d2cc31bb3091d70a8ef6c18 7618 1759