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 ReadTimeoutException). * [ ] http://allowed-origin.com (UnknownHostException) with 2 occurrences migrated to: https://allowed-origin.com ([https](https://allowed-origin.com) 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://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://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://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://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://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:pwd@test1.com (UnknownHostException) with 1 occurrences migrated to: https://user:pwd@test1.com ([https](https://user:pwd@test1.com) result UnknownHostException). * [ ] http://example.com/users_service (404) with 1 occurrences migrated to: https://example.com/users_service ([https](https://example.com/users_service) result 404). * [ ] 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://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://%s:%s with 1 occurrences * http://badClients/good with 1 occurrences * http://badClients/null with 1 occurrences * http://badClients/ping with 1 occurrences * http://badClients/timeout with 1 occurrences * http://bar with 1 occurrences * http://defaul-host3:8678/eureka/,http://defaul-host4:8678/eureka/ with 1 occurrences * http://defaul-host4:8678/eureka/ with 2 occurrences * http://defaul-host5:8678/eureka/ with 2 occurrences * http://defaul-host6:8678/eureka/ with 2 occurrences * http://default-host1:8678/eureka/ with 2 occurrences * http://default-host2:8678/eureka/ with 2 occurrences * http://default-host3:8678/eureka/ with 2 occurrences * http://foo with 5 occurrences * http://foo/ with 2 occurrences * http://foo/%20bar with 1 occurrences * http://foo/%20bar?hello=1+2 with 2 occurrences * http://foo:7001/ with 1 occurrences * http://foo:7777/ with 1 occurrences * http://host/doStuff with 1 occurrences * http://host:7777/Management/health with 1 occurrences * http://host:7777/Management/info with 1 occurrences * http://host:7777/Server/Management/health with 1 occurrences * http://host:7777/Server/Management/info with 1 occurrences * http://host:7777/Server/health with 1 occurrences * http://host:7777/Server/info with 1 occurrences * http://host:7777/health with 1 occurrences * http://host:7777/info with 1 occurrences * http://host:8888/Management/health with 3 occurrences * http://host:8888/Management/info with 3 occurrences * http://host:8888/health with 2 occurrences * http://host:8888/info with 2 occurrences * http://localhost with 133 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://mhhost2:0/foo/health with 2 occurrences * http://mhhost2:0/foo/info with 2 occurrences * http://myhost2:9000 with 1 occurrences * http://myhost:8080 with 1 occurrences * http://myhost:8989 with 1 occurrences * http://myhost:9000 with 1 occurrences * http://myservice with 1 occurrences * http://peer1/eureka/ with 1 occurrences * http://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/ with 1 occurrences * http://peer2/eureka/ with 1 occurrences * http://region1-zone-host:8678/eureka/ with 2 occurrences * http://region2-zone-host:8678/eureka/ with 2 occurrences * http://region4-zone-host:8678/eureka/ with 2 occurrences * http://simple/ with 1 occurrences * http://simple/emptypost with 1 occurrences * http://simple/header with 1 occurrences * http://simple/path/ with 2 occurrences * http://simple/post with 1 occurrences * http://simple/request?param= with 1 occurrences * http://simple_bad with 1 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 * http://user:password@localhost:8761/eureka with 1 occurrences * http://user:password@localhost:8761/eureka/ with 1 occurrences
This commit is contained in:
Spring Operator
4
.github/CONTRIBUTING.md
vendored
4
.github/CONTRIBUTING.md
vendored
@@ -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).
|
||||
|
||||
14
README.adoc
14
README.adoc
@@ -60,7 +60,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,
|
||||
@@ -82,13 +82,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".
|
||||
|
||||
@@ -145,7 +145,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
|
||||
@@ -158,6 +158,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).
|
||||
@@ -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}
|
||||
|
||||
@@ -60,7 +60,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,
|
||||
@@ -82,13 +82,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".
|
||||
|
||||
@@ -147,7 +147,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
|
||||
@@ -160,7 +160,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).
|
||||
|
||||
@@ -231,7 +231,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE suppressions PUBLIC
|
||||
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
|
||||
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
|
||||
"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
|
||||
<suppressions>
|
||||
<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
|
||||
<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -536,7 +536,7 @@ A demo Eureka Server can be found in the Spring Cloud Samples https://github.com
|
||||
|
||||
== 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
|
||||
@@ -558,7 +558,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:
|
||||
|
||||
@@ -675,7 +675,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.
|
||||
@@ -707,7 +707,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`.
|
||||
@@ -798,10 +798,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).
|
||||
@@ -826,7 +826,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
|
||||
|
||||
@@ -1045,7 +1045,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 Dynamic<Type>Property classes as handles to properties, as shown in the following example:
|
||||
|
||||
@@ -1074,7 +1074,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
|
||||
@@ -1098,7 +1098,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
|
||||
@@ -1164,7 +1164,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.
|
||||
@@ -1191,7 +1191,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
|
||||
@@ -1427,7 +1427,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
|
||||
@@ -1436,7 +1436,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.
|
||||
@@ -1697,13 +1697,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.
|
||||
|
||||
@@ -2052,7 +2052,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]
|
||||
|
||||
@@ -60,7 +60,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"));
|
||||
new URI("https://service.com"));
|
||||
assertEquals("en", ex.getResponse().getLocale().toString());
|
||||
assertArrayEquals(headers, ex.getResponse().getAllHeaders());
|
||||
assertEquals("Success", ex.getResponse().getStatusLine().getReasonPhrase());
|
||||
|
||||
@@ -41,9 +41,9 @@ public class OkHttpStatusCodeExceptionTest {
|
||||
Headers headers = new Headers.Builder().add("foo", "bar").build();
|
||||
Response response = new Response.Builder().code(200).headers(headers).code(200).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"));
|
||||
OkHttpStatusCodeException ex = new OkHttpStatusCodeException("service", response, body, new URI("https://service.com"));
|
||||
assertEquals(headers, ex.getResponse().headers());
|
||||
assertEquals(200, ex.getResponse().code());
|
||||
assertEquals("Success", ex.getResponse().message());
|
||||
|
||||
@@ -229,7 +229,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
|
||||
*
|
||||
* 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.
|
||||
|
||||
@@ -336,9 +336,9 @@ public class EurekaClientAutoConfigurationTests {
|
||||
EurekaInstanceConfigBean instance = this.context
|
||||
.getBean(EurekaInstanceConfigBean.class);
|
||||
|
||||
assertEquals("statusPageUrl is wrong", "http://192.168.13.90:9999/actuator/info",
|
||||
assertEquals("statusPageUrl is wrong", "https://192.168.13.90:9999/actuator/info",
|
||||
instance.getStatusPageUrl());
|
||||
assertEquals("healthCheckUrl is wrong", "http://192.168.13.90:9999/actuator/health",
|
||||
assertEquals("healthCheckUrl is wrong", "https://192.168.13.90:9999/actuator/health",
|
||||
instance.getHealthCheckUrl());
|
||||
}
|
||||
|
||||
@@ -438,7 +438,7 @@ public class EurekaClientAutoConfigurationTests {
|
||||
@Test
|
||||
public void basicAuth() {
|
||||
TestPropertyValues.of( "server.port=8989",
|
||||
"eureka.client.serviceUrl.defaultZone=http://user:foo@example.com:80/eureka").applyTo(this.context);
|
||||
"eureka.client.serviceUrl.defaultZone=https://user:foo@example.com:80/eureka").applyTo(this.context);
|
||||
setupContext(MockClientConfiguration.class);
|
||||
// ApacheHttpClient4 http = this.context.getBean(ApacheHttpClient4.class);
|
||||
// Mockito.verify(http).addFilter(Matchers.any(HTTPBasicAuthFilter.class));
|
||||
|
||||
@@ -58,14 +58,14 @@ public class EurekaClientConfigBeanTests {
|
||||
@Test
|
||||
public void serviceUrl() {
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
"eureka.client.serviceUrl.defaultZone:http://example.com");
|
||||
"eureka.client.serviceUrl.defaultZone:https://example.com");
|
||||
this.context.register(PropertyPlaceholderAutoConfiguration.class,
|
||||
TestConfiguration.class);
|
||||
this.context.refresh();
|
||||
assertEquals("{defaultZone=http://example.com}",
|
||||
assertEquals("{defaultZone=https://example.com}",
|
||||
this.context.getBean(EurekaClientConfigBean.class).getServiceUrl()
|
||||
.toString());
|
||||
assertEquals("[http://example.com/]", getEurekaServiceUrlsForDefaultZone());
|
||||
assertEquals("[https://example.com/]", getEurekaServiceUrlsForDefaultZone());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -74,35 +74,35 @@ public class EurekaClientConfigBeanTests {
|
||||
this.context.getEnvironment().getPropertySources().addFirst(source);
|
||||
source.addPropertySource(new MapPropertySource("config", Collections
|
||||
.<String, Object> 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();
|
||||
assertEquals("{defaultZone=http://example.com,http://example2.com, http://example3.com}",
|
||||
assertEquals("{defaultZone=https://example.com,http://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}",
|
||||
this.context.getBean(EurekaClientConfigBean.class).getServiceUrl()
|
||||
.toString());
|
||||
assertEquals("[http://example.com/, http://example2.com/, http://example3.com/]",
|
||||
assertEquals("[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com]",
|
||||
getEurekaServiceUrlsForDefaultZone());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void serviceUrlWithDefault() {
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
"eureka.client.serviceUrl.defaultZone:http://example.com");
|
||||
"eureka.client.serviceUrl.defaultZone:https://example.com");
|
||||
this.context.register(PropertyPlaceholderAutoConfiguration.class,
|
||||
TestConfiguration.class);
|
||||
this.context.refresh();
|
||||
assertEquals("[http://example.com/]", getEurekaServiceUrlsForDefaultZone());
|
||||
assertEquals("[https://example.com/]", getEurekaServiceUrlsForDefaultZone());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void serviceUrlWithCustomZone() {
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
"eureka.client.serviceUrl.customZone:http://custom-example.com");
|
||||
"eureka.client.serviceUrl.customZone:https://custom-example.com");
|
||||
this.context.register(PropertyPlaceholderAutoConfiguration.class,
|
||||
TestConfiguration.class);
|
||||
this.context.refresh();
|
||||
assertEquals("[http://custom-example.com/]", getEurekaServiceUrls("customZone"));
|
||||
assertEquals("[https://custom-example.com/]", getEurekaServiceUrls("customZone"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -20,8 +20,8 @@ public class EurekaControllerReplicasTests {
|
||||
String noAuthList1 = "http://test1.com";
|
||||
String noAuthList2 = noAuthList1 + ",http://test2.com";
|
||||
|
||||
String authList1 = "http://user:pwd@test1.com";
|
||||
String authList2 = authList1 + ",http://user2:pwd2@test2.com";
|
||||
String authList1 = "https://user:pwd@test1.com";
|
||||
String authList2 = authList1 + ",https://user2:pwd2@test2.com";
|
||||
|
||||
String combinationAuthList1 = "http://test1.com,http://user2:pwd2@test2.com";
|
||||
String combinationAuthList2 = "http://test3.com,http://user4:pwd4@test4.com";
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -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%; }
|
||||
|
||||
@@ -1 +1 @@
|
||||
http://simplegrid.info/
|
||||
https://simplegrid.info/
|
||||
@@ -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; }
|
||||
|
||||
@@ -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)*(i<u?-1:(i>u?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<b(this).length;l++){var o=l>=f&&l<f+d.s.length;if(a(n,l)){o=true}var r=(o?d.s:d.n)[q[o?0:1]].e;r.parent().append(r);if(o||!e.returns){m.push(r.get(0))}q[o?0:1]++}}return this.pushStack(m)}});function c(e){var d=/^\s*?[\+-]?(\d*\.?\d*?)\s*?$/.exec(e);return d&&d.length>0?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);
|
||||
@@ -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 = {};
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<#import "/spring.ftl" as spring />
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<base href="${basePath}">
|
||||
@@ -36,13 +36,13 @@
|
||||
<br>
|
||||
|
||||
<h2>Hystrix Dashboard</h2>
|
||||
<input id="stream" type="textfield" size="120" placeholder="http://hostname:port/turbine/turbine.stream"></input>
|
||||
<input id="stream" type="textfield" size="120" placeholder="https://hostname:port/turbine/turbine.stream"></input>
|
||||
<br><br>
|
||||
<i>Cluster via Turbine (default cluster):</i> http://turbine-hostname:port/turbine.stream
|
||||
<i>Cluster via Turbine (default cluster):</i> https://turbine-hostname:port/turbine.stream
|
||||
<br>
|
||||
<i>Cluster via Turbine (custom cluster):</i> http://turbine-hostname:port/turbine.stream?cluster=[clusterName]
|
||||
<i>Cluster via Turbine (custom cluster):</i> https://turbine-hostname:port/turbine.stream?cluster=[clusterName]
|
||||
<br>
|
||||
<i>Single Hystrix App:</i> http://hystrix-app:port/actuator/hystrix.stream
|
||||
<i>Single Hystrix App:</i> https://hystrix-app:port/actuator/hystrix.stream
|
||||
<br><br>
|
||||
Delay: <input id="delay" type="textfield" size="10" placeholder="2000"></input>ms
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -49,7 +49,7 @@ public class RibbonApacheHttpRequestTests {
|
||||
|
||||
@Test
|
||||
public void testNullEntity() throws Exception {
|
||||
String uri = "http://example.com";
|
||||
String uri = "https://example.com";
|
||||
LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
|
||||
headers.add("my-header", "my-value");
|
||||
headers.add("content-length", "5192");
|
||||
@@ -86,7 +86,7 @@ public class RibbonApacheHttpRequestTests {
|
||||
void testEntity(String entityValue, ByteArrayInputStream requestEntity, 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<String, String> headers = new LinkedMultiValueMap<>();
|
||||
if (addContentLengthHeader) {
|
||||
headers.add("Content-Length", lengthString);
|
||||
|
||||
@@ -42,7 +42,7 @@ public class RibbonApacheHttpResponseTests {
|
||||
HttpResponse response = mock(HttpResponse.class);
|
||||
given(response.getStatusLine()).willReturn(statusLine);
|
||||
|
||||
RibbonApacheHttpResponse httpResponse = new RibbonApacheHttpResponse(response, URI.create("http://example.com"));
|
||||
RibbonApacheHttpResponse httpResponse = new RibbonApacheHttpResponse(response, URI.create("https://example.com"));
|
||||
|
||||
assertThat(httpResponse.isSuccess(), is(true));
|
||||
assertThat(httpResponse.hasPayload(), is(false));
|
||||
@@ -61,7 +61,7 @@ public class RibbonApacheHttpResponseTests {
|
||||
entity.setContent(new ByteArrayInputStream(new byte[0]));
|
||||
given(response.getEntity()).willReturn(entity);
|
||||
|
||||
RibbonApacheHttpResponse httpResponse = new RibbonApacheHttpResponse(response, URI.create("http://example.com"));
|
||||
RibbonApacheHttpResponse httpResponse = new RibbonApacheHttpResponse(response, URI.create("https://example.com"));
|
||||
|
||||
assertThat(httpResponse.isSuccess(), is(true));
|
||||
assertThat(httpResponse.hasPayload(), is(true));
|
||||
|
||||
@@ -44,7 +44,7 @@ public class OkHttpRibbonRequestTests {
|
||||
|
||||
@Test
|
||||
public void testNullEntity() throws Exception {
|
||||
String uri = "http://example.com";
|
||||
String uri = "https://example.com";
|
||||
LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
|
||||
headers.add("my-header", "my-value");
|
||||
// headers.add(HttpEncoding.CONTENT_LENGTH, "5192");
|
||||
@@ -84,7 +84,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<String, String> headers = new LinkedMultiValueMap<>();
|
||||
if (addContentLengthHeader) {
|
||||
headers.add("Content-Length", lengthString);
|
||||
|
||||
@@ -39,7 +39,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);
|
||||
@@ -52,7 +52,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();
|
||||
|
||||
@@ -100,7 +100,7 @@ public class ZuulProxyApplicationTests {
|
||||
@Test
|
||||
public void preflightRequestSucceedsForGetRequest() {
|
||||
MultiValueMap<String, String> 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<Void> result = testRestTemplate.exchange(url(), HttpMethod.OPTIONS,
|
||||
new HttpEntity<>(headers), Void.class);
|
||||
@@ -111,7 +111,7 @@ public class ZuulProxyApplicationTests {
|
||||
@Test
|
||||
public void preflightRequestIsForbiddenForUnsupportedMethod() {
|
||||
MultiValueMap<String, String> 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<Void> result = testRestTemplate.exchange(url(), HttpMethod.OPTIONS,
|
||||
new HttpEntity<>(headers), Void.class);
|
||||
@@ -167,7 +167,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");
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public class ProxyRequestHelperTests {
|
||||
|
||||
MultiValueMap<String, String> headers = helper.buildZuulRequestHeaders(request);
|
||||
|
||||
helper.debug("POST", "http://example.com", headers,
|
||||
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", "multiName");
|
||||
|
||||
@@ -564,7 +564,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("*"));
|
||||
@@ -588,7 +588,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);
|
||||
@@ -597,7 +597,7 @@ public class DiscoveryClientRouteLocatorTests {
|
||||
List<Route> routesMap = routeLocator.getRoutes();
|
||||
assertNotNull("routesMap was null", routesMap);
|
||||
assertFalse("routesMap was empty", routesMap.isEmpty());
|
||||
assertMapping(routesMap, "http://example.com/" + MYSERVICE, MYSERVICE);
|
||||
assertMapping(routesMap, "https://example.com/" + MYSERVICE, MYSERVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -60,7 +60,7 @@ public class RestClientRibbonCommandTests {
|
||||
@Test
|
||||
@Deprecated
|
||||
public void testNullEntityWithOldConstruct() throws Exception {
|
||||
String uri = "http://example.com";
|
||||
String uri = "https://example.com";
|
||||
LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
|
||||
headers.add("my-header", "my-value");
|
||||
LinkedMultiValueMap<String, String> params = new LinkedMultiValueMap<>();
|
||||
@@ -88,7 +88,7 @@ public class RestClientRibbonCommandTests {
|
||||
|
||||
@Test
|
||||
public void testNullEntity() throws Exception {
|
||||
String uri = "http://example.com";
|
||||
String uri = "https://example.com";
|
||||
LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
|
||||
headers.add("my-header", "my-value");
|
||||
LinkedMultiValueMap<String, String> params = new LinkedMultiValueMap<>();
|
||||
@@ -127,7 +127,7 @@ public class RestClientRibbonCommandTests {
|
||||
void testEntity(String entityValue, ByteArrayInputStream requestEntity, 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<String, String> headers = new LinkedMultiValueMap<>();
|
||||
if (addContentLengthHeader) {
|
||||
headers.add("Content-Length", lengthString);
|
||||
|
||||
Reference in New Issue
Block a user