From 88b71f05fa6fab2486666534bbc60d3970adf9fe Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 15:47:00 -0500 Subject: [PATCH 1/2] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://conor.cc (200) with 4 occurrences could not be migrated: ([https](https://conor.cc) result SSLProtocolException). * [ ] http://richclarkdesign.com (200) with 1 occurrences could not be migrated: ([https](https://richclarkdesign.com) result SSLHandshakeException). * [ ] http://tinysort.sjeiti.com/ (200) with 1 occurrences could not be migrated: ([https](https://tinysort.sjeiti.com/) result SSLException). * [ ] http://unknown-origin.com (200) with 1 occurrences could not be migrated: ([https](https://unknown-origin.com) result AnnotatedConnectException). * [ ] http://www.sjeiti.com/ (301) with 1 occurrences could not be migrated: ([https](https://www.sjeiti.com/) result SSLException). * [ ] http://foo.com (301) with 1 occurrences could not be migrated: ([https](https://foo.com) result SSLHandshakeException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://ejohn.org/ (301) with 1 occurrences migrated to: https://johnresig.com/ ([https](https://ejohn.org/) result ClosedChannelException). * [ ] http://ejohn.org/blog/javascript-micro-templating/ (301) with 1 occurrences migrated to: https://johnresig.com/blog/javascript-micro-templating/ ([https](https://ejohn.org/blog/javascript-micro-templating/) result ClosedChannelException). * [ ] http://example3.com/ (302) with 1 occurrences migrated to: https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com ([https](https://example3.com/) result ConnectTimeoutException). * [ ] http://example3.com (302) with 2 occurrences migrated to: https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com ([https](https://example3.com) result ConnectTimeoutException). * [ ] http://192.168.13.90:9999/actuator/health (ConnectTimeoutException) with 1 occurrences migrated to: https://192.168.13.90:9999/actuator/health ([https](https://192.168.13.90:9999/actuator/health) result ConnectTimeoutException). * [ ] http://192.168.13.90:9999/actuator/info (ConnectTimeoutException) with 1 occurrences migrated to: https://192.168.13.90:9999/actuator/info ([https](https://192.168.13.90:9999/actuator/info) result ConnectTimeoutException). * [ ] http://www.w3.org/TR/html4/loose.dtd (ReadTimeoutException) with 1 occurrences migrated to: https://www.w3.org/TR/html4/loose.dtd ([https](https://www.w3.org/TR/html4/loose.dtd) result SSLException). * [ ] http://%s:%s (UnknownHostException) with 1 occurrences migrated to: https://%s:%s ([https](https://%s:%s) result UnknownHostException). * [ ] http://allowed-origin.com (UnknownHostException) with 2 occurrences migrated to: https://allowed-origin.com ([https](https://allowed-origin.com) result UnknownHostException). * [ ] http://badClients/good (UnknownHostException) with 1 occurrences migrated to: https://badClients/good ([https](https://badClients/good) result UnknownHostException). * [ ] http://badClients/null (UnknownHostException) with 1 occurrences migrated to: https://badClients/null ([https](https://badClients/null) result UnknownHostException). * [ ] http://badClients/ping (UnknownHostException) with 1 occurrences migrated to: https://badClients/ping ([https](https://badClients/ping) result UnknownHostException). * [ ] http://badClients/timeout (UnknownHostException) with 1 occurrences migrated to: https://badClients/timeout ([https](https://badClients/timeout) result UnknownHostException). * [ ] http://bar (UnknownHostException) with 1 occurrences migrated to: https://bar ([https](https://bar) result UnknownHostException). * [ ] http://compose.docker.io/ (UnknownHostException) with 2 occurrences migrated to: https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException). * [ ] http://custom-example.com (UnknownHostException) with 1 occurrences migrated to: https://custom-example.com ([https](https://custom-example.com) result UnknownHostException). * [ ] http://custom-example.com/ (UnknownHostException) with 1 occurrences migrated to: https://custom-example.com/ ([https](https://custom-example.com/) result UnknownHostException). * [ ] http://defaul-host3:8678/eureka/,http://defaul-host4:8678/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://defaul-host3:8678/eureka/,http://defaul-host4:8678/eureka/ ([https](https://defaul-host3:8678/eureka/,https://defaul-host4:8678/eureka/) result UnknownHostException). * [ ] http://defaul-host4:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://defaul-host4:8678/eureka/ ([https](https://defaul-host4:8678/eureka/) result UnknownHostException). * [ ] http://defaul-host5:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://defaul-host5:8678/eureka/ ([https](https://defaul-host5:8678/eureka/) result UnknownHostException). * [ ] http://defaul-host6:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://defaul-host6:8678/eureka/ ([https](https://defaul-host6:8678/eureka/) result UnknownHostException). * [ ] http://default-host1:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://default-host1:8678/eureka/ ([https](https://default-host1:8678/eureka/) result UnknownHostException). * [ ] http://default-host2:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://default-host2:8678/eureka/ ([https](https://default-host2:8678/eureka/) result UnknownHostException). * [ ] http://default-host3:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://default-host3:8678/eureka/ ([https](https://default-host3:8678/eureka/) result UnknownHostException). * [ ] http://earlymade.com (UnknownHostException) with 4 occurrences migrated to: https://earlymade.com ([https](https://earlymade.com) result UnknownHostException). * [ ] http://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/ ([https](https://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/) result UnknownHostException). * [ ] http://example.com,http://example2.com (UnknownHostException) with 2 occurrences migrated to: https://example.com,http://example2.com ([https](https://example.com,https://example2.com) result UnknownHostException). * [ ] http://example1.com,http://example2.com (UnknownHostException) with 1 occurrences migrated to: https://example1.com,http://example2.com ([https](https://example1.com,https://example2.com) result UnknownHostException). * [ ] http://first.example.com (UnknownHostException) with 1 occurrences migrated to: https://first.example.com ([https](https://first.example.com) result UnknownHostException). * [ ] http://foo (UnknownHostException) with 5 occurrences migrated to: https://foo ([https](https://foo) result UnknownHostException). * [ ] http://foo/ (UnknownHostException) with 2 occurrences migrated to: https://foo/ ([https](https://foo/) result UnknownHostException). * [ ] http://foo/%20bar (UnknownHostException) with 1 occurrences migrated to: https://foo/%20bar ([https](https://foo/%20bar) result UnknownHostException). * [ ] http://foo/%20bar?hello=1+2 (UnknownHostException) with 2 occurrences migrated to: https://foo/%20bar?hello=1+2 ([https](https://foo/%20bar?hello=1+2) result UnknownHostException). * [ ] http://foo:7001/ (UnknownHostException) with 1 occurrences migrated to: https://foo:7001/ ([https](https://foo:7001/) result UnknownHostException). * [ ] http://foo:7777/ (UnknownHostException) with 1 occurrences migrated to: https://foo:7777/ ([https](https://foo:7777/) result UnknownHostException). * [ ] http://host/doStuff (UnknownHostException) with 1 occurrences migrated to: https://host/doStuff ([https](https://host/doStuff) result UnknownHostException). * [ ] http://host:7777/Management/health (UnknownHostException) with 1 occurrences migrated to: https://host:7777/Management/health ([https](https://host:7777/Management/health) result UnknownHostException). * [ ] http://host:7777/Management/info (UnknownHostException) with 1 occurrences migrated to: https://host:7777/Management/info ([https](https://host:7777/Management/info) result UnknownHostException). * [ ] http://host:7777/Server/Management/health (UnknownHostException) with 1 occurrences migrated to: https://host:7777/Server/Management/health ([https](https://host:7777/Server/Management/health) result UnknownHostException). * [ ] http://host:7777/Server/Management/info (UnknownHostException) with 1 occurrences migrated to: https://host:7777/Server/Management/info ([https](https://host:7777/Server/Management/info) result UnknownHostException). * [ ] http://host:7777/Server/health (UnknownHostException) with 1 occurrences migrated to: https://host:7777/Server/health ([https](https://host:7777/Server/health) result UnknownHostException). * [ ] http://host:7777/Server/info (UnknownHostException) with 1 occurrences migrated to: https://host:7777/Server/info ([https](https://host:7777/Server/info) result UnknownHostException). * [ ] http://host:7777/health (UnknownHostException) with 1 occurrences migrated to: https://host:7777/health ([https](https://host:7777/health) result UnknownHostException). * [ ] http://host:7777/info (UnknownHostException) with 1 occurrences migrated to: https://host:7777/info ([https](https://host:7777/info) result UnknownHostException). * [ ] http://host:8888/Management/health (UnknownHostException) with 3 occurrences migrated to: https://host:8888/Management/health ([https](https://host:8888/Management/health) result UnknownHostException). * [ ] http://host:8888/Management/info (UnknownHostException) with 3 occurrences migrated to: https://host:8888/Management/info ([https](https://host:8888/Management/info) result UnknownHostException). * [ ] http://host:8888/health (UnknownHostException) with 2 occurrences migrated to: https://host:8888/health ([https](https://host:8888/health) result UnknownHostException). * [ ] http://host:8888/info (UnknownHostException) with 2 occurrences migrated to: https://host:8888/info ([https](https://host:8888/info) result UnknownHostException). * [ ] http://hostname:port/turbine/turbine.stream (UnknownHostException) with 1 occurrences migrated to: https://hostname:port/turbine/turbine.stream ([https](https://hostname:port/turbine/turbine.stream) result UnknownHostException). * [ ] http://hystrix-app:port/actuator/hystrix.stream (UnknownHostException) with 1 occurrences migrated to: https://hystrix-app:port/actuator/hystrix.stream ([https](https://hystrix-app:port/actuator/hystrix.stream) result UnknownHostException). * [ ] http://legacy.example.com (UnknownHostException) with 1 occurrences migrated to: https://legacy.example.com ([https](https://legacy.example.com) result UnknownHostException). * [ ] http://mhhost2:0/foo/health (UnknownHostException) with 2 occurrences migrated to: https://mhhost2:0/foo/health ([https](https://mhhost2:0/foo/health) result UnknownHostException). * [ ] http://mhhost2:0/foo/info (UnknownHostException) with 2 occurrences migrated to: https://mhhost2:0/foo/info ([https](https://mhhost2:0/foo/info) result UnknownHostException). * [ ] http://my.turbine.server:8080/turbine.stream?cluster=CLUSTERNAME (UnknownHostException) with 1 occurrences migrated to: https://my.turbine.server:8080/turbine.stream?cluster=CLUSTERNAME ([https](https://my.turbine.server:8080/turbine.stream?cluster=CLUSTERNAME) result UnknownHostException). * [ ] http://my.turbine.sever:8989/turbine.stream (UnknownHostException) with 1 occurrences migrated to: https://my.turbine.sever:8989/turbine.stream ([https](https://my.turbine.sever:8989/turbine.stream) result UnknownHostException). * [ ] http://my.turbine.sever:8989/turbine.stream?cluster=customers (UnknownHostException) with 1 occurrences migrated to: https://my.turbine.sever:8989/turbine.stream?cluster=customers ([https](https://my.turbine.sever:8989/turbine.stream?cluster=customers) result UnknownHostException). * [ ] http://my.turbine.sever:8989/turbine.stream?cluster=default (UnknownHostException) with 1 occurrences migrated to: https://my.turbine.sever:8989/turbine.stream?cluster=default ([https](https://my.turbine.sever:8989/turbine.stream?cluster=default) result UnknownHostException). * [ ] http://my.turbine.sever:8989/turbine.stream?cluster=products (UnknownHostException) with 1 occurrences migrated to: https://my.turbine.sever:8989/turbine.stream?cluster=products ([https](https://my.turbine.sever:8989/turbine.stream?cluster=products) result UnknownHostException). * [ ] http://myhost2:9000 (UnknownHostException) with 1 occurrences migrated to: https://myhost2:9000 ([https](https://myhost2:9000) result UnknownHostException). * [ ] http://myhost:8080 (UnknownHostException) with 1 occurrences migrated to: https://myhost:8080 ([https](https://myhost:8080) result UnknownHostException). * [ ] http://myhost:8989 (UnknownHostException) with 1 occurrences migrated to: https://myhost:8989 ([https](https://myhost:8989) result UnknownHostException). * [ ] http://myhost:9000 (UnknownHostException) with 1 occurrences migrated to: https://myhost:9000 ([https](https://myhost:9000) result UnknownHostException). * [ ] http://myservice (UnknownHostException) with 1 occurrences migrated to: https://myservice ([https](https://myservice) result UnknownHostException). * [ ] http://peer1/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://peer1/eureka/ ([https](https://peer1/eureka/) result UnknownHostException). * [ ] http://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/ ([https](https://peer1/eureka/,https://peer2/eureka/,https://peer3/eureka/) result UnknownHostException). * [ ] http://peer2/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://peer2/eureka/ ([https](https://peer2/eureka/) result UnknownHostException). * [ ] http://region1-zone-host:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://region1-zone-host:8678/eureka/ ([https](https://region1-zone-host:8678/eureka/) result UnknownHostException). * [ ] http://region2-zone-host:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://region2-zone-host:8678/eureka/ ([https](https://region2-zone-host:8678/eureka/) result UnknownHostException). * [ ] http://region4-zone-host:8678/eureka/ (UnknownHostException) with 2 occurrences migrated to: https://region4-zone-host:8678/eureka/ ([https](https://region4-zone-host:8678/eureka/) result UnknownHostException). * [ ] http://sidecar.local.spring.io:5678/configserver/default-master.yml (UnknownHostException) with 1 occurrences migrated to: https://sidecar.local.spring.io:5678/configserver/default-master.yml ([https](https://sidecar.local.spring.io:5678/configserver/default-master.yml) result UnknownHostException). * [ ] http://simple/ (UnknownHostException) with 1 occurrences migrated to: https://simple/ ([https](https://simple/) result UnknownHostException). * [ ] http://simple/emptypost (UnknownHostException) with 1 occurrences migrated to: https://simple/emptypost ([https](https://simple/emptypost) result UnknownHostException). * [ ] http://simple/header (UnknownHostException) with 1 occurrences migrated to: https://simple/header ([https](https://simple/header) result UnknownHostException). * [ ] http://simple/path/ (UnknownHostException) with 2 occurrences migrated to: https://simple/path/ ([https](https://simple/path/) result UnknownHostException). * [ ] http://simple/post (UnknownHostException) with 1 occurrences migrated to: https://simple/post ([https](https://simple/post) result UnknownHostException). * [ ] http://simple/request?param= (UnknownHostException) with 1 occurrences migrated to: https://simple/request?param= ([https](https://simple/request?param=) result UnknownHostException). * [ ] http://simple_bad (UnknownHostException) with 1 occurrences migrated to: https://simple_bad ([https](https://simple_bad) result UnknownHostException). * [ ] http://turbine-hostname:port/turbine.stream (UnknownHostException) with 1 occurrences migrated to: https://turbine-hostname:port/turbine.stream ([https](https://turbine-hostname:port/turbine.stream) result UnknownHostException). * [ ] http://turbine-hostname:port/turbine.stream?cluster= (UnknownHostException) with 1 occurrences migrated to: https://turbine-hostname:port/turbine.stream?cluster= ([https](https://turbine-hostname:port/turbine.stream?cluster=) result UnknownHostException). * [ ] http://user2:pwd2@test2.com (UnknownHostException) with 1 occurrences migrated to: https://user2:pwd2@test2.com ([https](https://user2:pwd2@test2.com) result UnknownHostException). * [ ] http://user:foo@example.com:80/eureka (UnknownHostException) with 1 occurrences migrated to: https://user:foo@example.com:80/eureka ([https](https://user:foo@example.com:80/eureka) result UnknownHostException). * [ ] http://user:password@localhost:8761/eureka (UnknownHostException) with 1 occurrences migrated to: https://user:password@localhost:8761/eureka ([https](https://user:password@localhost:8761/eureka) result UnknownHostException). * [ ] http://user:password@localhost:8761/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://user:password@localhost:8761/eureka/ ([https](https://user:password@localhost:8761/eureka/) result UnknownHostException). * [ ] http://user:pwd@test1.com (UnknownHostException) with 1 occurrences migrated to: https://user:pwd@test1.com ([https](https://user:pwd@test1.com) result UnknownHostException). * [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://asciidoctor.org with 1 occurrences migrated to: https://asciidoctor.org ([https](https://asciidoctor.org) result 200). * [ ] http://example.com with 15 occurrences migrated to: https://example.com ([https](https://example.com) result 200). * [ ] http://example.com/ with 5 occurrences migrated to: https://example.com/ ([https](https://example.com/) result 200). * [ ] http://example.com/users_service with 1 occurrences migrated to: https://example.com/users_service ([https](https://example.com/users_service) result 200). * [ ] http://github.com/ with 1 occurrences migrated to: https://github.com/ ([https](https://github.com/) result 200). * [ ] http://hello.com with 3 occurrences migrated to: https://hello.com ([https](https://hello.com) result 200). * [ ] http://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html with 1 occurrences migrated to: https://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html ([https](https://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html) result 200). * [ ] http://martinfowler.com/bliki/CircuitBreaker.html with 1 occurrences migrated to: https://martinfowler.com/bliki/CircuitBreaker.html ([https](https://martinfowler.com/bliki/CircuitBreaker.html) result 200). * [ ] http://projects.spring.io/spring-cloud/ with 6 occurrences migrated to: https://projects.spring.io/spring-cloud/ ([https](https://projects.spring.io/spring-cloud/) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 3 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://www.gnu.org/licenses/gpl.html with 1 occurrences migrated to: https://www.gnu.org/licenses/gpl.html ([https](https://www.gnu.org/licenses/gpl.html) result 200). * [ ] http://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27 with 1 occurrences migrated to: https://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27 ([https](https://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27) result 200). * [ ] http://commons.apache.org/proper/commons-configuration with 1 occurrences migrated to: https://commons.apache.org/proper/commons-configuration ([https](https://commons.apache.org/proper/commons-configuration) result 301). * [ ] http://creativecommons.org/licenses/MIT/ with 4 occurrences migrated to: https://creativecommons.org/licenses/MIT/ ([https](https://creativecommons.org/licenses/MIT/) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 3 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://raw.github.com/ with 1 occurrences migrated to: https://raw.github.com/ ([https](https://raw.github.com/) result 301). * [ ] http://service.com with 3 occurrences migrated to: https://service.com ([https](https://service.com) result 301). * [ ] http://www.opensource.org/licenses/mit-license.php with 1 occurrences migrated to: https://www.opensource.org/licenses/mit-license.php ([https](https://www.opensource.org/licenses/mit-license.php) result 301). * [ ] http://eclipse.org with 2 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 4 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://example2.com/ with 1 occurrences migrated to: https://example2.com/ ([https](https://example2.com/) result 302). * [ ] http://simplegrid.info with 4 occurrences migrated to: https://simplegrid.info ([https](https://simplegrid.info) result 302). * [ ] http://simplegrid.info/ with 1 occurrences migrated to: https://simplegrid.info/ ([https](https://simplegrid.info/) result 302). * [ ] http://www.springsource.com/developer/sts with 2 occurrences migrated to: https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302). # Ignored These URLs were intentionally ignored. * http://localhost with 135 occurrences * http://localhost/ with 2 occurrences * http://localhost/info with 1 occurrences * http://localhost/ping with 2 occurrences * http://localhost/status with 1 occurrences * http://localhost:%d/lazy/sample with 1 occurrences * http://localhost:%d/service/redirectedUri with 1 occurrences * http://localhost:5678/configserver with 1 occurrences * http://localhost:5678/customers with 1 occurrences * http://localhost:5678/hosts/ with 1 occurrences * http://localhost:7777/local with 4 occurrences * http://localhost:8000/health.json with 1 occurrences * http://localhost:8000/src/test/resources/health.json with 1 occurrences * http://localhost:8080 with 2 occurrences * http://localhost:8081 with 3 occurrences * http://localhost:8383/turbine.stream?cluster=RACES with 1 occurrences * http://localhost:8383/turbine.stream?cluster=WEB with 1 occurrences * http://localhost:8678/eureka/ with 1 occurrences * http://localhost:8761 with 2 occurrences * http://localhost:8761/eureka/ with 5 occurrences * http://localhost:9000 with 2 occurrences * http://test1.com with 1 occurrences * http://test1.com,http://test2.com with 1 occurrences * http://test1.com,http://user2:pwd2@test2.com with 1 occurrences * http://test2.com with 1 occurrences * http://test3.com,http://test4.com with 1 occurrences * http://test3.com,http://user4:pwd4@test4.com with 1 occurrences * http://test:test@localhost:8761 with 1 occurrences * http://test@localhost:8761 with 1 occurrences * http://testService with 1 occurrences --- .github/CONTRIBUTING.md | 4 +- README.adoc | 14 ++--- asciidoctor.css | 2 +- docs/README.adoc | 16 ++--- .../main/asciidoc/spring-cloud-netflix.adoc | 62 +++++++++---------- .../eureka/EurekaClientConfigBean.java | 2 +- .../EurekaClientAutoConfigurationTests.java | 6 +- .../eureka/EurekaClientConfigBeanTests.java | 20 +++--- ...ntConfigServiceAutoConfigurationTests.java | 2 +- ...DefaultManagementMetadataProviderTest.java | 36 +++++------ .../RibbonEurekaAutoConfigurationTests.java | 2 +- .../server/EurekaControllerReplicasTests.java | 4 +- .../RefreshablePeerEurekaNodesTests.java | 38 ++++++------ .../hystrix/css/simplegrid/1236_grid.css | 6 +- .../hystrix/css/simplegrid/720_grid.css | 6 +- .../hystrix/css/simplegrid/986_grid.css | 6 +- .../static/hystrix/css/simplegrid/README.txt | 2 +- .../css/simplegrid/percentage_grid.css | 6 +- .../static/hystrix/js/jquery.tinysort.min.js | 6 +- .../main/resources/static/hystrix/js/tmpl.js | 4 +- .../resources/templates/hystrix/index.ftl | 10 +-- .../resources/templates/hystrix/monitor.ftl | 2 +- .../resttemplate/RestTemplateRetryTests.java | 8 +-- .../HttpClientStatusCodeExceptionTest.java | 2 +- .../okhttp/OkHttpStatusCodeExceptionTest.java | 4 +- .../RibbonClientConfigurationTests.java | 10 +-- .../RibbonClientHttpRequestFactoryTests.java | 16 ++--- .../ribbon/RibbonInterceptorTests.java | 4 +- .../netflix/ribbon/RibbonUtilsTests.java | 6 +- .../apache/RibbonApacheHttpRequestTests.java | 4 +- .../apache/RibbonApacheHttpResponseTests.java | 4 +- .../okhttp/OkHttpRibbonRequestTests.java | 4 +- .../okhttp/OkHttpRibbonResponseTests.java | 4 +- .../support/ContextAwareRequestTests.java | 4 +- .../sidecar/SidecarApplicationTests.java | 8 +-- .../src/test/resources/application.yml | 2 +- .../netflix/turbine/TurbineHttpTests.java | 4 +- .../zuul/ZuulProxyApplicationTests.java | 6 +- .../zuul/filters/ProxyRequestHelperTests.java | 2 +- .../DiscoveryClientRouteLocatorTests.java | 6 +- .../route/RestClientRibbonCommandTests.java | 6 +- 41 files changed, 180 insertions(+), 180 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8560ad2a7..eb9a16ae6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ added after the original pull request but before a merge. you can import formatter settings using the `eclipse-code-formatter.xml` file from the [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the - [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file. + [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. @@ -40,6 +40,6 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), +* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/README.adoc b/README.adoc index 61e07d0dd..4a268129d 100644 --- a/README.adoc +++ b/README.adoc @@ -84,7 +84,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -http://compose.docker.io/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -106,13 +106,13 @@ a modified file in the correct place. Just commit it and push the change. === Working with the code If you don't have an IDE preference we would recommend that you use -http://www.springsource.com/developer/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. ==== Importing into eclipse with m2eclipse -We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with +We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace". @@ -169,7 +169,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -182,6 +182,6 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). \ No newline at end of file diff --git a/asciidoctor.css b/asciidoctor.css index 06d52e688..58c68541c 100644 --- a/asciidoctor.css +++ b/asciidoctor.css @@ -1,4 +1,4 @@ -/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */ +/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ /* Remove the comments around the @import statement below when using this as a custom stylesheet */ /*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/ article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block} diff --git a/docs/README.adoc b/docs/README.adoc index ff9a86184..96ad0a3d7 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -88,7 +88,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -http://compose.docker.io/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -110,13 +110,13 @@ a modified file in the correct place. Just commit it and push the change. === Working with the code If you don't have an IDE preference we would recommend that you use -http://www.springsource.com/developer/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. ==== Importing into eclipse with m2eclipse -We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with +We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace". @@ -175,7 +175,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -188,7 +188,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). @@ -259,7 +259,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index a02184760..f8956e17e 100755 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -1,7 +1,7 @@ :github-tag: master :github-repo: spring-cloud/spring-cloud-netflix -:github-raw: http://raw.github.com/{github-repo}/{github-tag} -:github-code: http://github.com/{github-repo}/tree/{github-tag} +:github-raw: https://raw.github.com/{github-repo}/{github-tag} +:github-code: https://github.com/{github-repo}/tree/{github-tag} :all: {asterisk}{asterisk} :nofooter: :branch: master @@ -23,7 +23,7 @@ The server can be configured and deployed to be highly available, with each serv === How to Include Eureka Client To include the Eureka Client in your project, use the starter with a group ID of `org.springframework.cloud` and an artifact ID of `spring-cloud-starter-netflix-eureka-client`. -See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. +See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. === Registering with Eureka @@ -76,7 +76,7 @@ To disable the Eureka Discovery Client, you can set `eureka.client.enabled` to ` === Authenticating with the Eureka Server -HTTP basic authentication is automatically added to your eureka client if one of the `eureka.client.serviceUrl.defaultZone` URLs has credentials embedded in it (curl style, as follows: `http://user:password@localhost:8761/eureka`). +HTTP basic authentication is automatically added to your eureka client if one of the `eureka.client.serviceUrl.defaultZone` URLs has credentials embedded in it (curl style, as follows: `https://user:password@localhost:8761/eureka`). For more complex needs, you can create a `@Bean` of type `DiscoveryClientOptionalArgs` and inject `ClientFilter` instances into it, all of which is applied to the calls from the client to the server. NOTE: Because of a limitation in Eureka, it is not possible to support per-server basic auth credentials, so only the first set that are found is used. @@ -333,7 +333,7 @@ This section describes how to set up a Eureka server. === How to Include Eureka Server To include Eureka Server in your project, use the starter with a group ID of `org.springframework.cloud` and an artifact ID of `spring-cloud-starter-netflix-eureka-server`. -See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. +See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. NOTE: If your project already uses Thymeleaf as its template engine, the Freemarker templates of the Eureka server may not be loaded correctly. In this case it is necessary to configure the template loader manually: @@ -443,7 +443,7 @@ eureka: hostname: peer1 client: serviceUrl: - defaultZone: http://peer2/eureka/ + defaultZone: https://peer2/eureka/ --- spring: @@ -453,7 +453,7 @@ eureka: hostname: peer2 client: serviceUrl: - defaultZone: http://peer1/eureka/ + defaultZone: https://peer1/eureka/ ---- In the preceding example, we have a YAML file that can be used to run the same server on two hosts (`peer1` and `peer2`) by running it in different Spring profiles. @@ -472,7 +472,7 @@ the registrations amongst themselves. eureka: client: serviceUrl: - defaultZone: http://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/ + defaultZone: https://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/ --- spring: @@ -549,7 +549,7 @@ when running a Eureka server you must include these dependencies in your POM or == Circuit Breaker: Hystrix Clients -Netflix has created a library called https://github.com/Netflix/Hystrix[Hystrix] that implements the http://martinfowler.com/bliki/CircuitBreaker.html[circuit breaker pattern]. +Netflix has created a library called https://github.com/Netflix/Hystrix[Hystrix] that implements the https://martinfowler.com/bliki/CircuitBreaker.html[circuit breaker pattern]. In a microservice architecture, it is common to have multiple layers of service calls, as shown in the following example: .Microservice Graph @@ -571,7 +571,7 @@ Fallbacks may be chained so that the first fallback makes some other business ca To include Hystrix in your project, use the starter with a group ID of `org.springframework.cloud` and a artifact ID of `spring-cloud-starter-netflix-hystrix`. -See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. +See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. The following example shows a minimal Eureka server with a Hystrix circuit breaker: @@ -688,7 +688,7 @@ be slightly more than three seconds. === How to Include the Hystrix Dashboard To include the Hystrix Dashboard in your project, use the starter with a group ID of `org.springframework.cloud` and an artifact ID of `spring-cloud-starter-netflix-hystrix-dashboard`. -See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. +See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. To run the Hystrix Dashboard, annotate your Spring Boot main class with `@EnableHystrixDashboard`. Then visit `/hystrix` and point the dashboard to an individual instance's `/hystrix.stream` endpoint in a Hystrix client application. @@ -720,7 +720,7 @@ eureka: The `turbine.appConfig` configuration key is a list of Eureka serviceIds that turbine uses to lookup instances. The turbine stream is then used in the Hystrix dashboard with a URL similar to the following: -`http://my.turbine.server:8080/turbine.stream?cluster=CLUSTERNAME` +`https://my.turbine.server:8080/turbine.stream?cluster=CLUSTERNAME` The cluster parameter can be omitted if the name is `default`. The `cluster` parameter must match an entry in `turbine.aggregator.clusterConfig`. @@ -799,7 +799,7 @@ The Turbine Stream server requires the use of Spring Webflux, therefore `spring- By default `spring-boot-starter-webflux` is included when adding `spring-cloud-starter-netflix-turbine-stream` to your application. You can then point the Hystrix Dashboard to the Turbine Stream Server instead of individual Hystrix streams. -If Turbine Stream is running on port 8989 on myhost, then put `http://myhost:8989` in the stream input field in the Hystrix Dashboard. +If Turbine Stream is running on port 8989 on myhost, then put `https://myhost:8989` in the stream input field in the Hystrix Dashboard. Circuits are prefixed by their respective `serviceId`, followed by a dot (`.`), and then the circuit name. Spring Cloud provides a `spring-cloud-starter-netflix-turbine-stream` that has all the dependencies you need to get a Turbine Stream server running. @@ -811,10 +811,10 @@ Unlike Turbine server, Turbine Stream uses eureka serviceIds as cluster names an If Turbine Stream server is running on port 8989 on `my.turbine.server` and you have two eureka serviceIds `customers` and `products` in your environment, the following URLs will be available on your Turbine Stream server. `default` and empty cluster name will provide all metrics that Turbine Stream server receives. ---- -http://my.turbine.sever:8989/turbine.stream?cluster=customers -http://my.turbine.sever:8989/turbine.stream?cluster=products -http://my.turbine.sever:8989/turbine.stream?cluster=default -http://my.turbine.sever:8989/turbine.stream +https://my.turbine.sever:8989/turbine.stream?cluster=customers +https://my.turbine.sever:8989/turbine.stream?cluster=products +https://my.turbine.sever:8989/turbine.stream?cluster=default +https://my.turbine.sever:8989/turbine.stream ---- So, you can use eureka serviceIds as cluster names for your Turbine dashboard (or any compatible dashboard). @@ -839,7 +839,7 @@ This contains (amongst other things) an `ILoadBalancer`, a `RestClient`, and a ` === How to Include Ribbon To include Ribbon in your project, use the starter with a group ID of `org.springframework.cloud` and an artifact ID of `spring-cloud-starter-netflix-ribbon`. -See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. +See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. === Customizing the Ribbon Client @@ -980,7 +980,7 @@ public class MyClass { public void doStuff() { ServiceInstance instance = loadBalancer.choose("stores"); - URI storesUri = URI.create(String.format("http://%s:%s", instance.getHost(), instance.getPort())); + URI storesUri = URI.create(String.format("https://%s:%s", instance.getHost(), instance.getPort())); // ... do something with the URI } } @@ -1058,7 +1058,7 @@ If you do not put any value with `LOAD_BALANCER_KEY` in `RequestContext`, null i https://github.com/Netflix/archaius[Archaius] is the Netflix client-side configuration library. It is the library used by all of the Netflix OSS components for configuration. -Archaius is an extension of the http://commons.apache.org/proper/commons-configuration[Apache Commons Configuration] project. +Archaius is an extension of the https://commons.apache.org/proper/commons-configuration[Apache Commons Configuration] project. It allows updates to configuration by either polling a source for changes or by letting a source push changes to the client. Archaius uses DynamicProperty classes as handles to properties, as shown in the following example: @@ -1087,7 +1087,7 @@ Routing is an integral part of a microservice architecture. For example, `/` may be mapped to your web application, `/api/users` is mapped to the user service and `/api/shop` is mapped to the shop service. https://github.com/Netflix/zuul[Zuul] is a JVM-based router and server-side load balancer from Netflix. -http://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27[Netflix uses Zuul] for the following: +https://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27[Netflix uses Zuul] for the following: * Authentication * Insights @@ -1111,7 +1111,7 @@ NOTE: The default Hystrix isolation pattern (`ExecutionIsolationStrategy`) for a === How to Include Zuul To include Zuul in your project, use the starter with a group ID of `org.springframework.cloud` and a artifact ID of `spring-cloud-starter-netflix-zuul`. -See the http://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. +See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train. [[netflix-zuul-reverse-proxy]] === Embedded Zuul Reverse Proxy @@ -1177,7 +1177,7 @@ The location of the back end can be specified as either a `serviceId` (for a ser routes: users: path: /myusers/** - url: http://example.com/users_service + url: https://example.com/users_service ---- These simple url-routes do not get executed as a `HystrixCommand`, nor do they load-balance multiple URLs with Ribbon. @@ -1204,7 +1204,7 @@ hystrix: myusers-service: ribbon: NIWSServerListClassName: com.netflix.loadbalancer.ConfigurationBasedServerList - listOfServers: http://example1.com,http://example2.com + listOfServers: https://example1.com,http://example2.com ConnectTimeout: 1000 ReadTimeout: 3000 MaxTotalHttpConnections: 500 @@ -1440,7 +1440,7 @@ The following example shows the configuration details for a "`strangle`" scenari routes: first: path: /first/** - url: http://first.example.com + url: https://first.example.com second: path: /second/** url: forward:/second @@ -1449,7 +1449,7 @@ The following example shows the configuration details for a "`strangle`" scenari url: forward:/3rd legacy: path: /** - url: http://legacy.example.com + url: https://legacy.example.com ---- In the preceding example, we are strangle the "`legacy`" application, which is mapped to all requests that do not match one of the other patterns. @@ -1710,13 +1710,13 @@ public WebMvcConfigurer corsConfigurer() { return new WebMvcConfigurer() { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/path-1/**") - .allowedOrigins("http://allowed-origin.com") + .allowedOrigins("https://allowed-origin.com") .allowedMethods("GET", "POST"); } }; } ---- -In the example above, we allow `GET` and `POST` methods from `http://allowed-origin.com` to send cross-origin requests to the endpoints starting with `path-1`. +In the example above, we allow `GET` and `POST` methods from `https://allowed-origin.com` to send cross-origin requests to the endpoints starting with `path-1`. You can apply CORS configuration to a specific path pattern or globally for the whole application, using `/**` mapping. You can customize properties: `allowedOrigins`,`allowedMethods`,`allowedHeaders`,`exposedHeaders`,`allowCredentials` and `maxAge` via this configuration. @@ -2043,14 +2043,14 @@ The following example response for `/hosts/customers` returns two instances on d { "host": "myhost", "port": 9000, - "uri": "http://myhost:9000", + "uri": "https://myhost:9000", "serviceId": "CUSTOMERS", "secure": false }, { "host": "myhost2", "port": 9000, - "uri": "http://myhost2:9000", + "uri": "https://myhost2:9000", "serviceId": "CUSTOMERS", "secure": false } @@ -2066,7 +2066,7 @@ If the Config Server is registered with Eureka, the non-JVM application can acce If the `serviceId` of the ConfigServer is `configserver` and the Sidecar is on port 5678, then it can be accessed at http://localhost:5678/configserver. Non-JVM applications can take advantage of the Config Server's ability to return YAML documents. -For example, a call to http://sidecar.local.spring.io:5678/configserver/default-master.yml +For example, a call to https://sidecar.local.spring.io:5678/configserver/default-master.yml might result in a YAML document resembling the following: [source,yaml] diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java index a96ece424..8db470e17 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java @@ -241,7 +241,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered { * * Typically the eureka server URLs carry protocol,host,port,context and version * information if any. Example: - * http://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/ + * https://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/ * * The changes are effective at runtime at the next service url refresh cycle as * specified by eurekaServiceUrlPollIntervalSeconds. diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index 5c53e1507..c3c07cf65 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java @@ -360,9 +360,9 @@ public class EurekaClientAutoConfigurationTests { .getBean(EurekaInstanceConfigBean.class); assertThat(instance.getStatusPageUrl()).as("statusPageUrl is wrong") - .isEqualTo("http://192.168.13.90:9999/actuator/info"); + .isEqualTo("https://192.168.13.90:9999/actuator/info"); assertThat(instance.getHealthCheckUrl()).as("healthCheckUrl is wrong") - .isEqualTo("http://192.168.13.90:9999/actuator/health"); + .isEqualTo("https://192.168.13.90:9999/actuator/health"); } @Test @@ -474,7 +474,7 @@ public class EurekaClientAutoConfigurationTests { @Test public void basicAuth() { TestPropertyValues.of("server.port=8989", - "eureka.client.serviceUrl.defaultZone=http://user:foo@example.com:80/eureka") + "eureka.client.serviceUrl.defaultZone=https://user:foo@example.com:80/eureka") .applyTo(this.context); setupContext(MockClientConfiguration.class); // ApacheHttpClient4 http = this.context.getBean(ApacheHttpClient4.class); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java index 3f09942dc..13a870fe2 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java @@ -58,15 +58,15 @@ public class EurekaClientConfigBeanTests { @Test public void serviceUrl() { - TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:http://example.com") + TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:https://example.com") .applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() - .toString()).isEqualTo("{defaultZone=http://example.com}"); + .toString()).isEqualTo("{defaultZone=https://example.com}"); assertThat(getEurekaServiceUrlsForDefaultZone()) - .isEqualTo("[http://example.com/]"); + .isEqualTo("[https://example.com/]"); } @Test @@ -76,38 +76,38 @@ public class EurekaClientConfigBeanTests { source.addPropertySource(new MapPropertySource("config", Collections.singletonMap( "eureka.client.serviceUrl.defaultZone", - "http://example.com,http://example2.com, http://example3.com"))); + "https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com"))); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() .toString()).isEqualTo( - "{defaultZone=http://example.com,http://example2.com, http://example3.com}"); + "{defaultZone=https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}"); assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo( - "[http://example.com/, http://example2.com/, http://example3.com/]"); + "[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com]"); } @Test public void serviceUrlWithDefault() { - TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:http://example.com") + TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:https://example.com") .applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); assertThat(getEurekaServiceUrlsForDefaultZone()) - .isEqualTo("[http://example.com/]"); + .isEqualTo("[https://example.com/]"); } @Test public void serviceUrlWithCustomZone() { TestPropertyValues - .of("eureka.client.serviceUrl.customZone:http://custom-example.com") + .of("eureka.client.serviceUrl.customZone:https://custom-example.com") .applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); assertThat(getEurekaServiceUrls("customZone")) - .isEqualTo("[http://custom-example.com/]"); + .isEqualTo("[https://custom-example.com/]"); } @Test diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java index 4adafca58..7a7ccd53c 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -73,7 +73,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { Mockito.verify(eurekaClient, times(1)).shutdown(); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); - assertThat(locator.getUri()[0]).isEqualTo("http://foo:7001/"); + assertThat(locator.getUri()[0]).isEqualTo("https://foo:7001/"); ApplicationInfoManager infoManager = this.context .getBean(ApplicationInfoManager.class); assertThat(infoManager.getInfo().getMetadata().get("foo")).isEqualTo("bar"); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java index 7e9b2d837..4b6949e0e 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java @@ -74,9 +74,9 @@ public class DefaultManagementMetadataProviderTest { ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath, managementPort); - assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:7777/health"); + assertThat(actual.getHealthCheckUrl()).isEqualTo("https://host:7777/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:7777/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -89,9 +89,9 @@ public class DefaultManagementMetadataProviderTest { ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath, managementPort); - assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/health"); + assertThat(actual.getHealthCheckUrl()).isEqualTo("https://host:8888/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:8888/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -104,9 +104,9 @@ public class DefaultManagementMetadataProviderTest { ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath, managementPort); - assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/health"); + assertThat(actual.getHealthCheckUrl()).isEqualTo("https://host:8888/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:8888/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -121,10 +121,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("http://host:8888/Management/health"); + .isEqualTo("https://host:8888/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("http://host:8888/Management/info"); + .isEqualTo("https://host:8888/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -138,10 +138,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("http://host:7777/Server/Management/health"); + .isEqualTo("https://host:7777/Server/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("http://host:7777/Server/Management/info"); + .isEqualTo("https://host:7777/Server/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -155,10 +155,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("http://host:7777/Management/health"); + .isEqualTo("https://host:7777/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("http://host:7777/Management/info"); + .isEqualTo("https://host:7777/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -172,9 +172,9 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("http://host:7777/Server/health"); + .isEqualTo("https://host:7777/Server/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/Server/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:7777/Server/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -188,10 +188,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("http://host:8888/Management/health"); + .isEqualTo("https://host:8888/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("http://host:8888/Management/info"); + .isEqualTo("https://host:8888/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -207,11 +207,11 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("http://host:8888/Management/health"); + .isEqualTo("https://host:8888/Management/health"); assertThat(actual.getSecureHealthCheckUrl()) .isEqualTo("https://host:8888/Management/health"); assertThat(actual.getStatusPageUrl()) - .isEqualTo("http://host:8888/Management/info"); + .isEqualTo("https://host:8888/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java index 6128646ef..70fd85cc1 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java @@ -90,7 +90,7 @@ public class RibbonEurekaAutoConfigurationTests { public void doStuff() { ServiceInstance serviceInstance = loadBalancerClient - .choose("http://host/doStuff"); + .choose("https://host/doStuff"); if (serviceInstance != null) { log.info( "There is a service instance, because Eureka discovery is enabled and the service is registered"); diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java index 6c63d22c1..f73d9eca1 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java @@ -36,9 +36,9 @@ public class EurekaControllerReplicasTests { String noAuthList2 = noAuthList1 + ",http://test2.com"; - String authList1 = "http://user:pwd@test1.com"; + String authList1 = "https://user:pwd@test1.com"; - String authList2 = authList1 + ",http://user2:pwd2@test2.com"; + String authList2 = authList1 + ",https://user2:pwd2@test2.com"; String combinationAuthList1 = "http://test1.com,http://user2:pwd2@test2.com"; diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java index c22becb3a..a2b4f1fe8 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java @@ -82,11 +82,11 @@ public class RefreshablePeerEurekaNodesTests { public void notUpdatedWhenDnsIsTrue() { changeProperty("eureka.client.use-dns-for-fetching-service-urls=true", "eureka.client.region=unavailable-region", // to force defaultZone - "eureka.client.service-url.defaultZone=http://default-host1:8678/eureka/"); + "eureka.client.service-url.defaultZone=https://default-host1:8678/eureka/"); this.context.publishEvent(new EnvironmentChangeEvent( new HashSet(Arrays.asList(USE_DNS, DEFAULT_ZONE)))); - assertThat(serviceUrlMatches("http://default-host1:8678/eureka/")).as( + assertThat(serviceUrlMatches("https://default-host1:8678/eureka/")).as( "PeerEurekaNodes' are updated when eureka.client.use-dns-for-fetching-service-urls is true") .isFalse(); } @@ -95,11 +95,11 @@ public class RefreshablePeerEurekaNodesTests { public void updatedWhenDnsIsFalse() { changeProperty("eureka.client.use-dns-for-fetching-service-urls=false", "eureka.client.region=unavailable-region", // to force defaultZone - "eureka.client.service-url.defaultZone=http://default-host2:8678/eureka/"); + "eureka.client.service-url.defaultZone=https://default-host2:8678/eureka/"); this.context.publishEvent(new EnvironmentChangeEvent( new HashSet(Arrays.asList(USE_DNS, DEFAULT_ZONE)))); - assertThat(serviceUrlMatches("http://default-host2:8678/eureka/")).as( + assertThat(serviceUrlMatches("https://default-host2:8678/eureka/")).as( "PeerEurekaNodes' are not updated when eureka.client.use-dns-for-fetching-service-urls is false") .isTrue(); } @@ -110,18 +110,18 @@ public class RefreshablePeerEurekaNodesTests { "eureka.client.region=region1", "eureka.client.availability-zones.region1=region1-zone", "eureka.client.availability-zones.region2=region2-zone", - "eureka.client.service-url.region1-zone=http://region1-zone-host:8678/eureka/", - "eureka.client.service-url.region2-zone=http://region2-zone-host:8678/eureka/"); + "eureka.client.service-url.region1-zone=https://region1-zone-host:8678/eureka/", + "eureka.client.service-url.region2-zone=https://region2-zone-host:8678/eureka/"); this.context .publishEvent(new EnvironmentChangeEvent(Collections.singleton(REGION))); - assertThat(serviceUrlMatches("http://region1-zone-host:8678/eureka/")).as( + assertThat(serviceUrlMatches("https://region1-zone-host:8678/eureka/")).as( "PeerEurekaNodes' are not updated when eureka.client.region is changed") .isTrue(); changeProperty("eureka.client.region=region2"); this.context .publishEvent(new EnvironmentChangeEvent(Collections.singleton(REGION))); - assertThat(serviceUrlMatches("http://region2-zone-host:8678/eureka/")).as( + assertThat(serviceUrlMatches("https://region2-zone-host:8678/eureka/")).as( "PeerEurekaNodes' are not updated when eureka.client.region is changed") .isTrue(); } @@ -131,17 +131,17 @@ public class RefreshablePeerEurekaNodesTests { changeProperty("eureka.client.use-dns-for-fetching-service-urls=false", "eureka.client.region=region4", "eureka.client.availability-zones.region3=region3-zone", - "eureka.client.service-url.region4-zone=http://region4-zone-host:8678/eureka/", - "eureka.client.service-url.defaultZone=http://default-host3:8678/eureka/"); + "eureka.client.service-url.region4-zone=https://region4-zone-host:8678/eureka/", + "eureka.client.service-url.defaultZone=https://default-host3:8678/eureka/"); this.context.publishEvent(new EnvironmentChangeEvent( Collections.singleton("eureka.client.availability-zones.region3"))); assertThat(this.peerEurekaNodes.getPeerEurekaNodes().get(0).getServiceUrl() - .equals("http://default-host3:8678/eureka/")).isTrue(); + .equals("https://default-host3:8678/eureka/")).isTrue(); changeProperty("eureka.client.availability-zones.region4=region4-zone"); this.context.publishEvent(new EnvironmentChangeEvent( Collections.singleton("eureka.client.availability-zones.region4"))); - assertThat(serviceUrlMatches("http://region4-zone-host:8678/eureka/")).as( + assertThat(serviceUrlMatches("https://region4-zone-host:8678/eureka/")).as( "PeerEurekaNodes' are not updated when eureka.client.availability-zones are changed") .isTrue(); } @@ -191,7 +191,7 @@ public class RefreshablePeerEurekaNodesTests { @Test public void serviceUrlsCountAsSoonAsRefreshed() { changeProperty( - "eureka.client.service-url.defaultZone=http://defaul-host3:8678/eureka/,http://defaul-host4:8678/eureka/"); + "eureka.client.service-url.defaultZone=https://defaul-host3:8678/eureka/,http://defaul-host4:8678/eureka/"); forceUpdate(); assertThat(this.peerEurekaNodes.getPeerEurekaNodes().size()) .as("PeerEurekaNodes' peer count is incorrect.").isEqualTo(2); @@ -200,23 +200,23 @@ public class RefreshablePeerEurekaNodesTests { @Test public void serviceUrlsValueAsSoonAsRefreshed() { changeProperty( - "eureka.client.service-url.defaultZone=http://defaul-host4:8678/eureka/"); + "eureka.client.service-url.defaultZone=https://defaul-host4:8678/eureka/"); forceUpdate(); - assertThat(serviceUrlMatches("http://defaul-host4:8678/eureka/")) + assertThat(serviceUrlMatches("https://defaul-host4:8678/eureka/")) .as("PeerEurekaNodes' new peer[0] is incorrect").isTrue(); } @Test public void dashboardUpdatedAsSoonAsRefreshed() { changeProperty( - "eureka.client.service-url.defaultZone=http://defaul-host5:8678/eureka/"); + "eureka.client.service-url.defaultZone=https://defaul-host5:8678/eureka/"); forceUpdate(); final ResponseEntity entity = new TestRestTemplate() .getForEntity("http://localhost:" + this.port + "/", String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); final String body = entity.getBody(); assertThat(body).isNotNull(); - assertThat(body.contains("http://defaul-host5:8678/eureka/")) + assertThat(body.contains("https://defaul-host5:8678/eureka/")) .as("DS Replicas not updated in the Eureka Server dashboard").isTrue(); } @@ -224,10 +224,10 @@ public class RefreshablePeerEurekaNodesTests { public void notUpdatedForRelaxedKeys() { changeProperty("eureka.client.use-dns-for-fetching-service-urls=false", "eureka.client.region=unavailable-region", // to force defaultZone - "eureka.client.service-url.defaultZone=http://defaul-host6:8678/eureka/"); + "eureka.client.service-url.defaultZone=https://defaul-host6:8678/eureka/"); this.context.publishEvent(new EnvironmentChangeEvent( Collections.singleton("eureka.client.serviceUrl.defaultZone"))); - assertThat(serviceUrlMatches("http://defaul-host6:8678/eureka/")) + assertThat(serviceUrlMatches("https://defaul-host6:8678/eureka/")) .as("PeerEurekaNodes' are updated for keys with relaxed binding") .isFalse(); } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css index 052ee4882..ca5653416 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css @@ -1,7 +1,7 @@ /* SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 1.125em; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css index 0ef2432c8..c694dc27d 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css @@ -1,7 +1,7 @@ /* SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 0.875em; padding: 0; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css index 83a597887..0496041f7 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css @@ -1,7 +1,7 @@ /* SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 100%; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt index 15cfc8c35..772768319 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt @@ -1 +1 @@ -http://simplegrid.info/ \ No newline at end of file +https://simplegrid.info/ \ No newline at end of file diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css index 13cb4b2dc..1254f636d 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css @@ -1,9 +1,9 @@ /* Extension of SimpleGrid by benjchristensen to allow percentage based sizing on very large displays * * SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 1.125em; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js index 40d62eb53..733bbec36 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js @@ -3,10 +3,10 @@ * * Version: 1.0.5 * -* Copyright (c) 2008-2011 Ron Valstar http://www.sjeiti.com/ +* Copyright (c) 2008-2011 Ron Valstar http://ronvalstar.nl/ * * Dual licensed under the MIT and GPL licenses: -* http://www.opensource.org/licenses/mit-license.php -* http://www.gnu.org/licenses/gpl.html +* https://www.opensource.org/licenses/mit-license.php +* https://www.gnu.org/licenses/gpl.html */ (function(b){b.tinysort={id:"TinySort",version:"1.0.5",copyright:"Copyright (c) 2008-2011 Ron Valstar",uri:"http://tinysort.sjeiti.com/",defaults:{order:"asc",attr:"",place:"start",returns:false,useVal:false}};b.fn.extend({tinysort:function(h,j){if(h&&typeof(h)!="string"){j=h;h=null}var e=b.extend({},b.tinysort.defaults,j);var p={};this.each(function(t){var v=(!h||h=="")?b(this):b(this).find(h);var u=e.order=="rand"?""+Math.random():(e.attr==""?(e.useVal?v.val():v.text()):v.attr(e.attr));var s=b(this).parent();if(!p[s]){p[s]={s:[],n:[]}}if(v.length>0){p[s].s.push({s:u,e:b(this),n:t})}else{p[s].n.push({e:b(this),n:t})}});for(var g in p){var d=p[g];d.s.sort(function k(t,s){var i=t.s.toLowerCase?t.s.toLowerCase():t.s;var u=s.s.toLowerCase?s.s.toLowerCase():s.s;if(c(t.s)&&c(s.s)){i=parseFloat(t.s);u=parseFloat(s.s)}return(e.order=="asc"?1:-1)*(iu?1:0))})}var m=[];for(var g in p){var d=p[g];var n=[];var f=b(this).length;switch(e.place){case"first":b.each(d.s,function(s,t){f=Math.min(f,t.n)});break;case"org":b.each(d.s,function(s,t){n.push(t.n)});break;case"end":f=d.n.length;break;default:f=0}var q=[0,0];for(var l=0;l=f&&l0?d[1]:false}function a(e,f){var d=false;b.each(e,function(h,g){if(!d){d=g==f}});return d}b.fn.TinySort=b.fn.Tinysort=b.fn.tsort=b.fn.tinysort})(jQuery); \ No newline at end of file diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js index d7098f784..251b3681b 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js @@ -1,7 +1,7 @@ //Simple JavaScript Templating -//John Resig - http://ejohn.org/ - MIT Licensed -// http://ejohn.org/blog/javascript-micro-templating/ +//John Resig - https://johnresig.com/ - MIT Licensed +// https://johnresig.com/blog/javascript-micro-templating/ (function(window, undefined) { var cache = {}; diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl index a540f1800..d9d62a692 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl @@ -1,5 +1,5 @@ <#import "/spring.ftl" as spring /> - + @@ -36,13 +36,13 @@

Hystrix Dashboard

- +

- Cluster via Turbine (default cluster): http://turbine-hostname:port/turbine.stream + Cluster via Turbine (default cluster): https://turbine-hostname:port/turbine.stream
- Cluster via Turbine (custom cluster): http://turbine-hostname:port/turbine.stream?cluster=[clusterName] + Cluster via Turbine (custom cluster): https://turbine-hostname:port/turbine.stream?cluster=[clusterName]
- Single Hystrix App: http://hystrix-app:port/actuator/hystrix.stream + Single Hystrix App: https://hystrix-app:port/actuator/hystrix.stream

Delay: ms      diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl index b4f3edb0a..373a2f2ee 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl @@ -181,7 +181,7 @@ }); //Read a page's GET URL variables and return them as an associative array. - // from: http://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html + // from: https://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html function getUrlVars() { var vars = [], hash; diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java index 065ecff68..249a72471 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java @@ -77,7 +77,7 @@ public class RestTemplateRetryTests { @Before public void setup() throws Exception { // Force Ribbon configuration by making one call. - this.testClient.getForObject("http://badClients/ping", Integer.class); + this.testClient.getForObject("https://badClients/ping", Integer.class); } @Test @@ -100,7 +100,7 @@ public class RestTemplateRetryTests { // A null pointer should NOT trigger a circuit breaker. for (int index = 0; index < numCalls; index++) { try { - this.testClient.getForObject("http://badClients/null", Integer.class); + this.testClient.getForObject("https://badClients/null", Integer.class); } catch (Exception exception) { } @@ -149,7 +149,7 @@ public class RestTemplateRetryTests { int hits = 0; for (int index = 0; index < numCalls; index++) { - hits = this.testClient.getForObject("http://badClients/good", Integer.class); + hits = this.testClient.getForObject("https://badClients/good", Integer.class); } logServerStats(LocalBadClientConfiguration.badServer); @@ -185,7 +185,7 @@ public class RestTemplateRetryTests { int numCalls = 15; for (int index = 0; index < numCalls; index++) { - hits = this.testClient.getForObject("http://badClients/timeout", + hits = this.testClient.getForObject("https://badClients/timeout", Integer.class); } logServerStats(LocalBadClientConfiguration.badServer); diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientStatusCodeExceptionTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientStatusCodeExceptionTest.java index 6ecde8ceb..00e29d691 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientStatusCodeExceptionTest.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientStatusCodeExceptionTest.java @@ -61,7 +61,7 @@ public class HttpClientStatusCodeExceptionTest { doReturn(entity).when(response).getEntity(); HttpEntity copiedEntity = HttpClientUtils.createEntity(response); HttpClientStatusCodeException ex = new HttpClientStatusCodeException("service", - response, copiedEntity, new URI("http://service.com")); + response, copiedEntity, new URI("https://service.com")); assertThat(ex.getResponse().getLocale().toString()).isEqualTo("en"); assertThat(ex.getResponse().getAllHeaders()).isEqualTo(headers); assertThat(ex.getResponse().getStatusLine().getReasonPhrase()) diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java index 71cf55e77..03ba030c2 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java @@ -43,10 +43,10 @@ public class OkHttpStatusCodeExceptionTest { .message("Success") .body(ResponseBody.create(MediaType.parse("text/plain"), "foo")) .protocol(Protocol.HTTP_1_1) - .request(new Request.Builder().url("http://service.com").build()).build(); + .request(new Request.Builder().url("https://service.com").build()).build(); ResponseBody body = response.peekBody(Integer.MAX_VALUE); OkHttpStatusCodeException ex = new OkHttpStatusCodeException("service", response, - body, new URI("http://service.com")); + body, new URI("https://service.com")); assertThat(ex.getResponse().headers()).isEqualTo(headers); assertThat(ex.getResponse().code()).isEqualTo(200); assertThat(ex.getResponse().message()).isEqualTo("Success"); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java index 44a0bd199..357387c58 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java @@ -91,7 +91,7 @@ public class RibbonClientConfigurationTests { when(this.inspector.isSecure(server)).thenReturn(true); for (AbstractLoadBalancerAwareClient client : clients()) { - URI uri = client.reconstructURIWithServer(server, new URI("http://foo/")); + URI uri = client.reconstructURIWithServer(server, new URI("https://foo/")); assertThat(uri).as(getReason(client)).isEqualTo(new URI("https://foo:7777/")); } } @@ -102,8 +102,8 @@ public class RibbonClientConfigurationTests { when(this.inspector.isSecure(server)).thenReturn(false); for (AbstractLoadBalancerAwareClient client : clients()) { - URI uri = client.reconstructURIWithServer(server, new URI("http://foo/")); - assertThat(uri).as(getReason(client)).isEqualTo(new URI("http://foo:7777/")); + URI uri = client.reconstructURIWithServer(server, new URI("https://foo/")); + assertThat(uri).as(getReason(client)).isEqualTo(new URI("https://foo:7777/")); } } @@ -118,7 +118,7 @@ public class RibbonClientConfigurationTests { for (AbstractLoadBalancerAwareClient client : clients()) { URI uri = client.reconstructURIWithServer(server, - new URI("http://foo/%20bar")); + new URI("https://foo/%20bar")); assertThat(uri).as(getReason(client)) .isEqualTo(new URI("https://foo:7777/%20bar")); } @@ -131,7 +131,7 @@ public class RibbonClientConfigurationTests { for (AbstractLoadBalancerAwareClient client : clients()) { URI uri = client.reconstructURIWithServer(server, - new URI("http://foo/%20bar?hello=1+2")); + new URI("https://foo/%20bar?hello=1+2")); assertThat(uri).isEqualTo(new URI("https://foo:7777/%20bar?hello=1%202")); } } diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java index d4321c351..07d354566 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java @@ -82,7 +82,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void vanillaRequestWorks() { - ResponseEntity response = this.restTemplate.getForEntity("http://simple/", + ResponseEntity response = this.restTemplate.getForEntity("https://simple/", String.class); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); @@ -92,7 +92,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithPathParamWorks() { ResponseEntity response = this.restTemplate - .getForEntity("http://simple/path/{param}", String.class, "world"); + .getForEntity("https://simple/path/{param}", String.class, "world"); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello world"); @@ -101,7 +101,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithEncodedPathParamWorks() { ResponseEntity response = this.restTemplate.getForEntity( - "http://simple/path/{param}", String.class, "world & everyone else"); + "https://simple/path/{param}", String.class, "world & everyone else"); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body") @@ -111,7 +111,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithRequestParamWorks() { ResponseEntity response = this.restTemplate.getForEntity( - "http://simple/request?param={param}", String.class, "world"); + "https://simple/request?param={param}", String.class, "world"); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello world"); @@ -120,7 +120,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithPostWorks() { ResponseEntity response = this.restTemplate - .postForEntity("http://simple/post", "world", String.class); + .postForEntity("https://simple/post", "world", String.class); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello world"); @@ -129,7 +129,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithEmptyPostWorks() { ResponseEntity response = this.restTemplate - .postForEntity("http://simple/emptypost", "", String.class); + .postForEntity("https://simple/emptypost", "", String.class); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello empty"); @@ -137,7 +137,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithHeaderWorks() throws Exception { - RequestEntity entity = RequestEntity.get(new URI("http://simple/header")) + RequestEntity entity = RequestEntity.get(new URI("https://simple/header")) .header("X-Param", "world").build(); ResponseEntity response = this.restTemplate.exchange(entity, String.class); @@ -150,7 +150,7 @@ public class RibbonClientHttpRequestFactoryTests { public void invalidHostNameError() { this.exceptionRule.expect(ResourceAccessException.class); this.exceptionRule.expectMessage("Invalid hostname"); - this.restTemplate.getForEntity("http://simple_bad", String.class); + this.restTemplate.getForEntity("https://simple_bad", String.class); } @Configuration diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonInterceptorTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonInterceptorTests.java index ab4c7e799..bd3d46ead 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonInterceptorTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonInterceptorTests.java @@ -68,7 +68,7 @@ public class RibbonInterceptorTests { RibbonServer server = new RibbonServer("myservice", new Server("myhost", 8080)); LoadBalancerInterceptor interceptor = new LoadBalancerInterceptor( new MyClient(server)); - given(this.request.getURI()).willReturn(new URL("http://myservice").toURI()); + given(this.request.getURI()).willReturn(new URL("https://myservice").toURI()); given(this.execution.execute(isA(HttpRequest.class), isA(byte[].class))) .willReturn(this.response); ArgumentCaptor argument = ArgumentCaptor @@ -79,7 +79,7 @@ public class RibbonInterceptorTests { verify(this.execution).execute(argument.capture(), isA(byte[].class)); HttpRequestWrapper wrapper = argument.getValue(); assertThat(wrapper.getURI()).as("wrong constructed uri") - .isEqualTo(new URL("http://myhost:8080").toURI()); + .isEqualTo(new URL("https://myhost:8080").toURI()); } protected static class MyClient implements LoadBalancerClient { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java index 6afb3d059..44e649e6c 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java @@ -88,7 +88,7 @@ public class RibbonUtilsTests { @Test public void uriIsNotChangedWhenServerIsNotSecured() throws URISyntaxException { - URI original = new URI("http://foo"); + URI original = new URI("https://foo"); URI updated = updateToSecureConnectionIfNeeded(original, NON_SECURE_CONFIG, NON_SECURE_INTROSPECTOR, SERVER); assertThat(original) @@ -110,7 +110,7 @@ public class RibbonUtilsTests { @Test public void shouldUpgradeUriToHttpsWhenServerIsSecureAndUriNotInHttps() throws URISyntaxException { - URI original = new URI("http://foo"); + URI original = new URI("https://foo"); URI updated = updateToSecureConnectionIfNeeded(original, SECURE_CONFIG, SECURE_INTROSPECTOR, SERVER); assertThat(updated).as("URI should have been updated to https.") @@ -129,7 +129,7 @@ public class RibbonUtilsTests { @Test public void shouldSubstitutePlusInQueryParam() throws URISyntaxException { - URI original = new URI("http://foo/%20bar?hello=1+2"); + URI original = new URI("https://foo/%20bar?hello=1+2"); URI updated = updateToSecureConnectionIfNeeded(original, SECURE_CONFIG, SECURE_INTROSPECTOR, SERVER); assertThat(updated) diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java index f8dcd0b30..5937c92d4 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java @@ -44,7 +44,7 @@ public class RibbonApacheHttpRequestTests { @Test public void testNullEntity() throws Exception { - String uri = "http://example.com"; + String uri = "https://example.com"; LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); headers.add("my-header", "my-value"); headers.add("content-length", "5192"); @@ -90,7 +90,7 @@ public class RibbonApacheHttpRequestTests { boolean addContentLengthHeader, String method) throws IOException { String lengthString = String.valueOf(entityValue.length()); Long length = null; - URI uri = URI.create("http://example.com"); + URI uri = URI.create("https://example.com"); LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); if (addContentLengthHeader) { headers.add("Content-Length", lengthString); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpResponseTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpResponseTests.java index 899653418..1bce90e81 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpResponseTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpResponseTests.java @@ -41,7 +41,7 @@ public class RibbonApacheHttpResponseTests { given(response.getStatusLine()).willReturn(statusLine); RibbonApacheHttpResponse httpResponse = new RibbonApacheHttpResponse(response, - URI.create("http://example.com")); + URI.create("https://example.com")); assertThat(httpResponse.isSuccess()).isTrue(); assertThat(httpResponse.hasPayload()).isFalse(); @@ -60,7 +60,7 @@ public class RibbonApacheHttpResponseTests { given(response.getEntity()).willReturn(entity); RibbonApacheHttpResponse httpResponse = new RibbonApacheHttpResponse(response, - URI.create("http://example.com")); + URI.create("https://example.com")); assertThat(httpResponse.isSuccess()).isTrue(); assertThat(httpResponse.hasPayload()).isTrue(); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequestTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequestTests.java index 01b29d677..c13bacd4c 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequestTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequestTests.java @@ -39,7 +39,7 @@ public class OkHttpRibbonRequestTests { @Test public void testNullEntity() throws Exception { - String uri = "http://example.com"; + String uri = "https://example.com"; LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); headers.add("my-header", "my-value"); // headers.add(HttpEncoding.CONTENT_LENGTH, "5192"); @@ -79,7 +79,7 @@ public class OkHttpRibbonRequestTests { boolean addContentLengthHeader, String method) throws IOException { String lengthString = String.valueOf(entityValue.length()); Long length = null; - String uri = "http://example.com"; + String uri = "https://example.com"; LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); if (addContentLengthHeader) { headers.add("Content-Length", lengthString); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonResponseTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonResponseTests.java index 6371886fc..a3c92d71c 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonResponseTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonResponseTests.java @@ -37,7 +37,7 @@ public class OkHttpRibbonResponseTests { @Test public void testNullEntity() throws Exception { - URI uri = URI.create("http://example.com"); + URI uri = URI.create("https://example.com"); Response response = response(uri).build(); OkHttpRibbonResponse httpResponse = new OkHttpRibbonResponse(response, uri); @@ -50,7 +50,7 @@ public class OkHttpRibbonResponseTests { @Test public void testNotNullEntity() throws Exception { - URI uri = URI.create("http://example.com"); + URI uri = URI.create("https://example.com"); Response response = response(uri) .body(ResponseBody.create(MediaType.parse("text/plain"), "abcd")).build(); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java index 491ffde20..3c39bc9d8 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java @@ -51,7 +51,7 @@ public class ContextAwareRequestTests { headers.put("header2", Arrays.asList("value1", "value2")); headers.put("header3", Arrays.asList("value1")); doReturn(headers).when(context).getHeaders(); - doReturn(new URI("http://foo")).when(context).uri(); + doReturn(new URI("https://foo")).when(context).uri(); doReturn("foo").when(context).getServiceId(); doReturn(new LinkedMultiValueMap<>()).when(context).getParams(); doReturn("testLoadBalancerKey").when(context).getLoadBalancerKey(); @@ -76,7 +76,7 @@ public class ContextAwareRequestTests { @Test public void getURI() throws Exception { - assertThat(request.getURI()).isEqualTo(new URI("http://foo")); + assertThat(request.getURI()).isEqualTo(new URI("https://foo")); RibbonCommandContext badUriContext = mock(RibbonCommandContext.class); doReturn(new LinkedMultiValueMap()).when(badUriContext).getHeaders(); diff --git a/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java b/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java index 06dbac0e6..f669aa0be 100644 --- a/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java +++ b/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java @@ -124,9 +124,9 @@ public class SidecarApplicationTests { EurekaInstanceConfigBean config; public void testStatusAndHealthCheckUrls() { - assertThat(config.getStatusPageUrl()).isEqualTo("http://mhhost2:0/foo/info"); + assertThat(config.getStatusPageUrl()).isEqualTo("https://mhhost2:0/foo/info"); assertThat(config.getHealthCheckUrl()) - .isEqualTo("http://mhhost2:0/foo/health"); + .isEqualTo("https://mhhost2:0/foo/health"); } } @@ -144,9 +144,9 @@ public class SidecarApplicationTests { @Test public void testStatusAndHealthCheckUrls() { - assertThat(config.getStatusPageUrl()).isEqualTo("http://mhhost2:0/foo/info"); + assertThat(config.getStatusPageUrl()).isEqualTo("https://mhhost2:0/foo/info"); assertThat(config.getHealthCheckUrl()) - .isEqualTo("http://mhhost2:0/foo/health"); + .isEqualTo("https://mhhost2:0/foo/health"); } } diff --git a/spring-cloud-netflix-sidecar/src/test/resources/application.yml b/spring-cloud-netflix-sidecar/src/test/resources/application.yml index 5a78e0959..2ea917289 100644 --- a/spring-cloud-netflix-sidecar/src/test/resources/application.yml +++ b/spring-cloud-netflix-sidecar/src/test/resources/application.yml @@ -14,7 +14,7 @@ eureka: app-group-name: mysidecargroup client: serviceUrl: - defaultZone: http://user:password@localhost:8761/eureka/ + defaultZone: https://user:password@localhost:8761/eureka/ ribbon: ServerListRefreshInterval: 5000 diff --git a/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java b/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java index f5ac31ebb..08e7baf14 100644 --- a/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java +++ b/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java @@ -46,10 +46,10 @@ import static org.assertj.core.api.Assertions.assertThat; public class TurbineHttpTests { private static final ClusterInformation foo = new ClusterInformation("foo", - "http://foo"); + "https://foo"); private static final ClusterInformation bar = new ClusterInformation("bar", - "http://bar"); + "https://bar"); @Autowired TestRestTemplate rest; diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java index 26fc7983d..73a82ee81 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java @@ -99,7 +99,7 @@ public class ZuulProxyApplicationTests { @Test public void preflightRequestSucceedsForGetRequest() { MultiValueMap headers = new LinkedMultiValueMap<>(); - headers.put("Origin", singletonList("http://hello.com")); + headers.put("Origin", singletonList("https://hello.com")); headers.put("Access-Control-Request-Method", singletonList("GET")); ResponseEntity result = testRestTemplate.exchange(url(), HttpMethod.OPTIONS, new HttpEntity<>(headers), Void.class); @@ -110,7 +110,7 @@ public class ZuulProxyApplicationTests { @Test public void preflightRequestIsForbiddenForUnsupportedMethod() { MultiValueMap headers = new LinkedMultiValueMap<>(); - headers.put("Origin", singletonList("http://hello.com")); + headers.put("Origin", singletonList("https://hello.com")); headers.put("Access-Control-Request-Method", singletonList("PUT")); ResponseEntity result = testRestTemplate.exchange(url(), HttpMethod.OPTIONS, new HttpEntity<>(headers), Void.class); @@ -166,7 +166,7 @@ public class ZuulProxyApplicationTests { return new WebMvcConfigurer() { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/simplezpat/**") - .allowedOrigins("http://hello.com") + .allowedOrigins("https://hello.com") .allowedMethods("GET", "POST") .allowedHeaders("Authorization"); } diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java index 0dacdcf8f..c166d9187 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java @@ -81,7 +81,7 @@ public class ProxyRequestHelperTests { MultiValueMap headers = helper.buildZuulRequestHeaders(request); - helper.debug("POST", "http://example.com", headers, new LinkedMultiValueMap<>(), + helper.debug("POST", "https://example.com", headers, new LinkedMultiValueMap<>(), request.getInputStream()); HttpTrace actual = this.traceRepository.findAll().get(0); Assertions.assertThat(actual.getRequest().getHeaders()).containsKeys("singleName", diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java index dbf850ba7..0bbb60471 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java @@ -523,7 +523,7 @@ public class DiscoveryClientRouteLocatorTests { @Test public void testIgnoredRouteIncludedIfConfiguredAndNotDiscovered() { this.properties.getRoutes().put("foo", - new ZuulRoute("/foo/**", "http://foo.com")); + new ZuulRoute("/foo/**", "http://www.foo.com/")); DiscoveryClientRouteLocator routeLocator = new DiscoveryClientRouteLocator("/", this.discovery, this.properties); this.properties.setIgnoredServices(Collections.singleton("*")); @@ -548,7 +548,7 @@ public class DiscoveryClientRouteLocatorTests { @Test public void testAutoRoutesCanBeOverridden() { ZuulRoute route = new ZuulRoute("/" + MYSERVICE + "/**", - "http://example.com/" + MYSERVICE); + "https://example.com/" + MYSERVICE); this.properties.getRoutes().put(MYSERVICE, route); DiscoveryClientRouteLocator routeLocator = new DiscoveryClientRouteLocator("/", this.discovery, this.properties); @@ -557,7 +557,7 @@ public class DiscoveryClientRouteLocatorTests { List routesMap = routeLocator.getRoutes(); assertThat(routesMap).as("routesMap was null").isNotNull(); assertThat(routesMap.isEmpty()).as("routesMap was empty").isFalse(); - assertMapping(routesMap, "http://example.com/" + MYSERVICE, MYSERVICE); + assertMapping(routesMap, "https://example.com/" + MYSERVICE, MYSERVICE); } @Test diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandTests.java index 1a379ea39..0cf8b4787 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandTests.java @@ -55,7 +55,7 @@ public class RestClientRibbonCommandTests { @Test @Deprecated public void testNullEntityWithOldConstruct() throws Exception { - String uri = "http://example.com"; + String uri = "https://example.com"; LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); headers.add("my-header", "my-value"); LinkedMultiValueMap params = new LinkedMultiValueMap<>(); @@ -85,7 +85,7 @@ public class RestClientRibbonCommandTests { @Test public void testNullEntity() throws Exception { - String uri = "http://example.com"; + String uri = "https://example.com"; LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); headers.add("my-header", "my-value"); LinkedMultiValueMap params = new LinkedMultiValueMap<>(); @@ -131,7 +131,7 @@ public class RestClientRibbonCommandTests { boolean addContentLengthHeader, String method) throws Exception { String lengthString = String.valueOf(entityValue.length()); Long length = null; - URI uri = URI.create("http://example.com"); + URI uri = URI.create("https://example.com"); LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); if (addContentLengthHeader) { headers.add("Content-Length", lengthString); From 37d39617bff778517d795f8e0266a82f52879c22 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 28 Mar 2019 20:12:03 -0400 Subject: [PATCH 2/2] Fixing tests --- .../EurekaClientAutoConfigurationTests.java | 4 +-- .../eureka/EurekaClientConfigBeanTests.java | 6 ++-- ...ntConfigServiceAutoConfigurationTests.java | 2 +- ...DefaultManagementMetadataProviderTest.java | 36 +++++++++---------- .../server/EurekaControllerReplicasTests.java | 4 +-- .../resttemplate/RestTemplateRetryTests.java | 8 ++--- .../okhttp/OkHttpStatusCodeExceptionTest.java | 3 +- .../RibbonClientConfigurationTests.java | 2 +- .../RibbonClientHttpRequestFactoryTests.java | 14 ++++---- .../netflix/ribbon/RibbonUtilsTests.java | 2 +- 10 files changed, 41 insertions(+), 40 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index d61859ef2..270af8275 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java @@ -360,9 +360,9 @@ public class EurekaClientAutoConfigurationTests { .getBean(EurekaInstanceConfigBean.class); assertThat(instance.getStatusPageUrl()).as("statusPageUrl is wrong") - .isEqualTo("https://192.168.13.90:9999/actuator/info"); + .isEqualTo("http://192.168.13.90:9999/actuator/info"); assertThat(instance.getHealthCheckUrl()).as("healthCheckUrl is wrong") - .isEqualTo("https://192.168.13.90:9999/actuator/health"); + .isEqualTo("http://192.168.13.90:9999/actuator/health"); } @Test diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java index e1cf80e37..dc6a59345 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java @@ -76,15 +76,15 @@ public class EurekaClientConfigBeanTests { source.addPropertySource(new MapPropertySource("config", Collections.singletonMap( "eureka.client.serviceUrl.defaultZone", - "https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com"))); + "https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com"))); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() .toString()).isEqualTo( - "{defaultZone=https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}"); + "{defaultZone=https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}"); assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo( - "[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com]"); + "[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com/]"); } @Test diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java index 5f522af99..f6d3f86be 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -73,7 +73,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { Mockito.verify(eurekaClient, times(1)).shutdown(); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); - assertThat(locator.getUri()[0]).isEqualTo("https://foo:7001/"); + assertThat(locator.getUri()[0]).isEqualTo("http://foo:7001/"); ApplicationInfoManager infoManager = this.context .getBean(ApplicationInfoManager.class); assertThat(infoManager.getInfo().getMetadata().get("foo")).isEqualTo("bar"); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java index 366869f61..2596bc422 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java @@ -74,9 +74,9 @@ public class DefaultManagementMetadataProviderTest { ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath, managementPort); - assertThat(actual.getHealthCheckUrl()).isEqualTo("https://host:7777/health"); + assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:7777/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:7777/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -89,9 +89,9 @@ public class DefaultManagementMetadataProviderTest { ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath, managementPort); - assertThat(actual.getHealthCheckUrl()).isEqualTo("https://host:8888/health"); + assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:8888/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -104,9 +104,9 @@ public class DefaultManagementMetadataProviderTest { ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath, managementPort); - assertThat(actual.getHealthCheckUrl()).isEqualTo("https://host:8888/health"); + assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:8888/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -121,10 +121,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("https://host:8888/Management/health"); + .isEqualTo("http://host:8888/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("https://host:8888/Management/info"); + .isEqualTo("http://host:8888/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -138,10 +138,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("https://host:7777/Server/Management/health"); + .isEqualTo("http://host:7777/Server/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("https://host:7777/Server/Management/info"); + .isEqualTo("http://host:7777/Server/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -155,10 +155,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("https://host:7777/Management/health"); + .isEqualTo("http://host:7777/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("https://host:7777/Management/info"); + .isEqualTo("http://host:7777/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -172,9 +172,9 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("https://host:7777/Server/health"); + .isEqualTo("http://host:7777/Server/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); - assertThat(actual.getStatusPageUrl()).isEqualTo("https://host:7777/Server/info"); + assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/Server/info"); assertThat(actual.getManagementPort()).isEqualTo(7777); } @@ -188,10 +188,10 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("https://host:8888/Management/health"); + .isEqualTo("http://host:8888/Management/health"); assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty(); assertThat(actual.getStatusPageUrl()) - .isEqualTo("https://host:8888/Management/info"); + .isEqualTo("http://host:8888/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } @@ -207,11 +207,11 @@ public class DefaultManagementMetadataProviderTest { managementContextPath, managementPort); assertThat(actual.getHealthCheckUrl()) - .isEqualTo("https://host:8888/Management/health"); + .isEqualTo("http://host:8888/Management/health"); assertThat(actual.getSecureHealthCheckUrl()) .isEqualTo("https://host:8888/Management/health"); assertThat(actual.getStatusPageUrl()) - .isEqualTo("https://host:8888/Management/info"); + .isEqualTo("http://host:8888/Management/info"); assertThat(actual.getManagementPort()).isEqualTo(8888); } diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java index 7c95cfadd..22da4fafe 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerReplicasTests.java @@ -32,9 +32,9 @@ import static org.springframework.cloud.netflix.eureka.server.EurekaControllerTe public class EurekaControllerReplicasTests { - String noAuthList1 = "http://test1.com"; + String noAuthList1 = "https://test1.com"; - String noAuthList2 = noAuthList1 + ",http://test2.com"; + String noAuthList2 = noAuthList1 + ",https://test2.com"; String authList1 = "https://user:pwd@test1.com"; diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java index bc894891e..55f3749f3 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java @@ -77,7 +77,7 @@ public class RestTemplateRetryTests { @Before public void setup() throws Exception { // Force Ribbon configuration by making one call. - this.testClient.getForObject("https://badClients/ping", Integer.class); + this.testClient.getForObject("http://badClients/ping", Integer.class); } @Test @@ -100,7 +100,7 @@ public class RestTemplateRetryTests { // A null pointer should NOT trigger a circuit breaker. for (int index = 0; index < numCalls; index++) { try { - this.testClient.getForObject("https://badClients/null", Integer.class); + this.testClient.getForObject("http://badClients/null", Integer.class); } catch (Exception exception) { } @@ -149,7 +149,7 @@ public class RestTemplateRetryTests { int hits = 0; for (int index = 0; index < numCalls; index++) { - hits = this.testClient.getForObject("https://badClients/good", Integer.class); + hits = this.testClient.getForObject("http://badClients/good", Integer.class); } logServerStats(LocalBadClientConfiguration.badServer); @@ -185,7 +185,7 @@ public class RestTemplateRetryTests { int numCalls = 15; for (int index = 0; index < numCalls; index++) { - hits = this.testClient.getForObject("https://badClients/timeout", + hits = this.testClient.getForObject("http://badClients/timeout", Integer.class); } logServerStats(LocalBadClientConfiguration.badServer); diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java index 776c9c8af..d24ac6029 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpStatusCodeExceptionTest.java @@ -43,7 +43,8 @@ public class OkHttpStatusCodeExceptionTest { .message("Success") .body(ResponseBody.create(MediaType.parse("text/plain"), "foo")) .protocol(Protocol.HTTP_1_1) - .request(new Request.Builder().url("https://service.com").build()).build(); + .request(new Request.Builder().url("https://service.com").build()) + .build(); ResponseBody body = response.peekBody(Integer.MAX_VALUE); OkHttpStatusCodeException ex = new OkHttpStatusCodeException("service", response, body, new URI("https://service.com")); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java index 479a9f712..290745307 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java @@ -131,7 +131,7 @@ public class RibbonClientConfigurationTests { for (AbstractLoadBalancerAwareClient client : clients()) { URI uri = client.reconstructURIWithServer(server, - new URI("https://foo/%20bar?hello=1+2")); + new URI("http://foo/%20bar?hello=1+2")); assertThat(uri).isEqualTo(new URI("https://foo:7777/%20bar?hello=1%202")); } } diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java index 7ec406673..2d73d468d 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java @@ -82,7 +82,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void vanillaRequestWorks() { - ResponseEntity response = this.restTemplate.getForEntity("https://simple/", + ResponseEntity response = this.restTemplate.getForEntity("http://simple/", String.class); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); @@ -92,7 +92,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithPathParamWorks() { ResponseEntity response = this.restTemplate - .getForEntity("https://simple/path/{param}", String.class, "world"); + .getForEntity("http://simple/path/{param}", String.class, "world"); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello world"); @@ -101,7 +101,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithEncodedPathParamWorks() { ResponseEntity response = this.restTemplate.getForEntity( - "https://simple/path/{param}", String.class, "world & everyone else"); + "http://simple/path/{param}", String.class, "world & everyone else"); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body") @@ -111,7 +111,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithRequestParamWorks() { ResponseEntity response = this.restTemplate.getForEntity( - "https://simple/request?param={param}", String.class, "world"); + "http://simple/request?param={param}", String.class, "world"); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello world"); @@ -120,7 +120,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithPostWorks() { ResponseEntity response = this.restTemplate - .postForEntity("https://simple/post", "world", String.class); + .postForEntity("http://simple/post", "world", String.class); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello world"); @@ -129,7 +129,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithEmptyPostWorks() { ResponseEntity response = this.restTemplate - .postForEntity("https://simple/emptypost", "", String.class); + .postForEntity("http://simple/emptypost", "", String.class); assertThat(response.getStatusCode()).as("wrong response code") .isEqualTo(HttpStatus.OK); assertThat(response.getBody()).as("wrong response body").isEqualTo("hello empty"); @@ -137,7 +137,7 @@ public class RibbonClientHttpRequestFactoryTests { @Test public void requestWithHeaderWorks() throws Exception { - RequestEntity entity = RequestEntity.get(new URI("https://simple/header")) + RequestEntity entity = RequestEntity.get(new URI("http://simple/header")) .header("X-Param", "world").build(); ResponseEntity response = this.restTemplate.exchange(entity, String.class); diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java index 9d4fbaadb..6f893fb85 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonUtilsTests.java @@ -129,7 +129,7 @@ public class RibbonUtilsTests { @Test public void shouldSubstitutePlusInQueryParam() throws URISyntaxException { - URI original = new URI("https://foo/%20bar?hello=1+2"); + URI original = new URI("http://foo/%20bar?hello=1+2"); URI updated = updateToSecureConnectionIfNeeded(original, SECURE_CONFIG, SECURE_INTROSPECTOR, SERVER); assertThat(updated)