Merge pull request #20 from spring-operator/polish-urls-remaining-master
URL Cleanup
This commit is contained in:
@@ -4,7 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
@FeignClient(name = "example", url = "http://example.com")
|
||||
@FeignClient(name = "example", url = "https://example.com")
|
||||
public interface ExampleClient {
|
||||
|
||||
@RequestMapping(value = "/", method = RequestMethod.GET)
|
||||
|
||||
@@ -13,7 +13,7 @@ eureka:
|
||||
password: password
|
||||
client:
|
||||
serviceUrl:
|
||||
defaultZone: http://user:${eureka.password}@localhost:8761/eureka/
|
||||
defaultZone: https://user:${eureka.password}@localhost:8761/eureka/
|
||||
instance:
|
||||
leaseRenewalIntervalInSeconds: 10
|
||||
metadataMap:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# About
|
||||
This project is a sample of using just the Hystrix Starter. For more information see the
|
||||
[Hystrix documentation](http://cloud.spring.io/spring-cloud-static/spring-cloud.html#_circuit_breaker_hystrix_clients).
|
||||
[Hystrix documentation](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_circuit_breaker_hystrix_clients).
|
||||
|
||||
# Usage
|
||||
This simple app contains two endpoints both surrounded by Hystrix circuit breakers.
|
||||
|
||||
@@ -12,7 +12,7 @@ eureka:
|
||||
password: password
|
||||
client:
|
||||
serviceUrl:
|
||||
defaultZone: http://user:${eureka.password}@localhost:8761/eureka/
|
||||
defaultZone: https://user:${eureka.password}@localhost:8761/eureka/
|
||||
instance:
|
||||
leaseRenewalIntervalInSeconds: 10
|
||||
metadataMap:
|
||||
|
||||
@@ -45,7 +45,7 @@ public class RibbonClientApplicationTests {
|
||||
public void oauth2RestTemplateHasLoadBalancer() throws Exception {
|
||||
/* // Just to prove that the interceptor is present...
|
||||
ClientHttpRequest request = oauth2RestTemplate.getRequestFactory()
|
||||
.createRequest(new URI("http://nosuchservice"), HttpMethod.GET);
|
||||
.createRequest(new URI("https://nosuchservice"), HttpMethod.GET);
|
||||
expected.expectMessage("No instances available for nosuchservice");
|
||||
request.execute();*/
|
||||
}
|
||||
@@ -56,7 +56,7 @@ public class RibbonClientApplicationTests {
|
||||
this.expected.expect(UserRedirectRequiredException.class);
|
||||
RequestContextHolder
|
||||
.setRequestAttributes(new ServletRequestAttributes(this.request));
|
||||
this.oauth2RestTemplate.getForEntity("http://foo/bar", String.class);
|
||||
this.oauth2RestTemplate.getForEntity("https://foo/bar", String.class);
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ public class HelloClientApplication {
|
||||
|
||||
@RequestMapping("/")
|
||||
public String hello() {
|
||||
return this.client.getForObject("http://simple/", String.class);
|
||||
return this.client.getForObject("https://simple/", String.class);
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -12,4 +12,4 @@ spring:
|
||||
eureka:
|
||||
client:
|
||||
serviceUrl:
|
||||
defaultZone: http://user::password@localhost:8761/eureka/
|
||||
defaultZone: https://user::password@localhost:8761/eureka/
|
||||
|
||||
Reference in New Issue
Block a user