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 b106f8c5f..d078f0e36 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 @@ -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: @@ -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`. @@ -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 @@ -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. @@ -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 784ce2244..34b177bd1 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 0c5101081..d61859ef2 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 abc6d24f1..e1cf80e37 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-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 1c80a7f63..7c95cfadd 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-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/ribbon/apache/HttpClientStatusCodeExceptionTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientStatusCodeExceptionTest.java index ee5abb7be..40d98bfa4 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 c33b50fc8..776c9c8af 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/apache/RibbonApacheHttpRequestTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java index 3992bab31..95e38ef74 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 f704f82e5..af86f4f01 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 58f632db4..857fd7ccf 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 9c0ea1217..91b0144d3 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-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 840d08b89..fe706168e 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 57a64804a..0fdbb28c3 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 7d1e2a196..b91065f20 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 e33886834..14f203441 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);