From 9bf73652ac3847ff7bec8552e5e33d16be36ca31 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Wed, 22 May 2019 19:17:24 -0400
Subject: [PATCH] Changes to https for example.com

---
 feign-eureka/src/main/java/demo/HelloClientApplication.java   | 2 +-
 feign-hystrix/src/main/java/demo/FeignClientApplication.java  | 2 +-
 .../java/demo/FeignClientWithServerListApplicationTests.java  | 4 +++-
 feign/src/main/java/demo/FeignClientApplication.java          | 2 +-
 .../java/demo/FeignClientWithServerListApplicationTests.java  | 4 +++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/feign-eureka/src/main/java/demo/HelloClientApplication.java b/feign-eureka/src/main/java/demo/HelloClientApplication.java
index 664843d..5ced5b0 100644
--- a/feign-eureka/src/main/java/demo/HelloClientApplication.java
+++ b/feign-eureka/src/main/java/demo/HelloClientApplication.java
@@ -57,7 +57,7 @@ class HelloRibbonClientConfiguration {
 		//because of this, it doesn't use eureka to lookup the server,
 		// but the classpath is tested
 		BaseLoadBalancer balancer = new BaseLoadBalancer();
-		balancer.setServersList(Arrays.asList(new Server("example.com", 80)));
+		balancer.setServersList(Arrays.asList(new Server("example.com", 443)));
 		return balancer;
 	}
 
diff --git a/feign-hystrix/src/main/java/demo/FeignClientApplication.java b/feign-hystrix/src/main/java/demo/FeignClientApplication.java
index 14f2bfa..5fd50ef 100644
--- a/feign-hystrix/src/main/java/demo/FeignClientApplication.java
+++ b/feign-hystrix/src/main/java/demo/FeignClientApplication.java
@@ -31,7 +31,7 @@ public class FeignClientApplication {
 	}
 }
 
-@FeignClient(name = "example", url = "example.com", fallback=FallbackClient.class)
+@FeignClient(name = "example", url = "https://example.com", fallback=FallbackClient.class)
 interface UrlRestClient {
 	@RequestMapping(value="/", method = RequestMethod.GET)
 	String hello();
diff --git a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
index adc2ac2..8c64916 100644
--- a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
+++ b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 //Increase hystrix timeout or else requests timeout on CI server
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"myexample.ribbon.listOfServers:example.com", "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000"})
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"myexample.ribbon.listOfServers:example.com:443",
+		"myexample.ribbon.IsSecure:true",
+		"hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000"})
 @DirtiesContext
 public class FeignClientWithServerListApplicationTests {
 
diff --git a/feign/src/main/java/demo/FeignClientApplication.java b/feign/src/main/java/demo/FeignClientApplication.java
index 3e645ed..2235d11 100644
--- a/feign/src/main/java/demo/FeignClientApplication.java
+++ b/feign/src/main/java/demo/FeignClientApplication.java
@@ -16,7 +16,7 @@ public class FeignClientApplication {
 	}
 }
 
-@FeignClient(name = "example", url = "example.com")
+@FeignClient(name = "example", url = "https://example.com")
 @RequestMapping("/")
 interface RestClient {
 	@RequestMapping(method = RequestMethod.GET)
diff --git a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
index 4ab7528..791d675 100644
--- a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
+++ b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 // We disable Hystrix because we are not concerned about testing circuit breakers in this
 // test and it eliminates hystrix timeouts from messing with the request
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
-		"myexample.ribbon.listOfServers:example.com", "feign.hystrix.enabled=false" })
+		"myexample.ribbon.listOfServers:example.com:443",
+		"myexample.ribbon.IsSecure:true",
+		"feign.hystrix.enabled=false" })
 @DirtiesContext
 public class FeignClientWithServerListApplicationTests {