From 84d7d827854626bdd720de60fe163a2fa86c8c23 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Wed, 21 Jun 2017 19:26:44 +0200
Subject: [PATCH] moco is failing

---
 pom.xml                                             |  2 +-
 .../stubrunner/spring/StubRunnerProperties.java     | 13 -------------
 .../src/main/java/com/example/loan/Application.java | 11 +++++++++++
 .../src/main/resources/application.yml              |  6 ++++--
 .../example/loan/LoanApplicationServiceTests.java   |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d2b1be910..db5ce885f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
 			<dependency>
 				<groupId>org.springframework.amqp</groupId>
 				<artifactId>spring-rabbit</artifactId>
-				<version>1.6.2.RELEASE</version>
+				<version>2.0.0.M4</version>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerProperties.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerProperties.java
index 3850751a24..6b24c04d04 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerProperties.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerProperties.java
@@ -60,11 +60,6 @@ public class StubRunnerProperties {
 	 */
 	private String classifier = "stubs";
 
-	/**
-	 * The context path that the stub server will run under.
-	 */
-	private String contextPath = "";
-
 	/**
 	 * Repository username
 	 */
@@ -175,14 +170,6 @@ public class StubRunnerProperties {
 		this.classifier = classifier;
 	}
 
-	public String getContextPath() {
-		return this.contextPath;
-	}
-
-	public void setContextPath(String contextPath) {
-		this.contextPath = contextPath;
-	}
-
 	public boolean isStubsPerConsumer() {
 		return this.stubsPerConsumer;
 	}
diff --git a/tests/spring-cloud-contract-stub-runner-context-path/src/main/java/com/example/loan/Application.java b/tests/spring-cloud-contract-stub-runner-context-path/src/main/java/com/example/loan/Application.java
index 6f36301172..56af56d989 100644
--- a/tests/spring-cloud-contract-stub-runner-context-path/src/main/java/com/example/loan/Application.java
+++ b/tests/spring-cloud-contract-stub-runner-context-path/src/main/java/com/example/loan/Application.java
@@ -2,6 +2,8 @@ package com.example.loan;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
 public class Application {
@@ -11,3 +13,12 @@ public class Application {
 	}
 
 }
+
+
+@RestController
+class CustomController {
+	@GetMapping("/foo")
+	String foo() {
+		return "bar";
+	}
+}
\ No newline at end of file
diff --git a/tests/spring-cloud-contract-stub-runner-context-path/src/main/resources/application.yml b/tests/spring-cloud-contract-stub-runner-context-path/src/main/resources/application.yml
index 0d28926451..4ebaff95d9 100644
--- a/tests/spring-cloud-contract-stub-runner-context-path/src/main/resources/application.yml
+++ b/tests/spring-cloud-contract-stub-runner-context-path/src/main/resources/application.yml
@@ -1,2 +1,4 @@
-server.port: 0
-server.context-path: /my-path
\ No newline at end of file
+server:
+  port: 0
+  servlet:
+    context-path: /my-path
\ No newline at end of file
diff --git a/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java b/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java
index ad76c6fa5b..1a3973195b 100644
--- a/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java
+++ b/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java
@@ -41,7 +41,7 @@ public class LoanApplicationServiceTests {
 	@Test
 	public void shouldStartThisAppWithContextPath() {
 		String response = new RestTemplate()
-				.getForObject("http://localhost:" + this.port + "/my-path/health", String.class);
+				.getForObject("http://localhost:" + this.port + "/my-path/foo", String.class);
 
 		assertThat(response).isNotEmpty();
 	}