From 891d5dc0299a5156f9680e040188158dfd850f52 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 16:10:48 -0500 Subject: [PATCH 1/2] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # 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://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to: https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException). * [ ] http://foo:7001/ (UnknownHostException) with 1 occurrences migrated to: https://foo:7001/ ([https](https://foo:7001/) result UnknownHostException). * [ ] http://hello-world/ (UnknownHostException) with 1 occurrences migrated to: https://hello-world/ ([https](https://hello-world/) result UnknownHostException). * [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://curator.apache.org with 3 occurrences migrated to: https://curator.apache.org ([https](https://curator.apache.org) result 200). * [ ] http://curator.apache.org/curator-x-discovery/ with 1 occurrences migrated to: https://curator.apache.org/curator-x-discovery/ ([https](https://curator.apache.org/curator-x-discovery/) result 200). * [ ] http://github.com/ with 1 occurrences migrated to: https://github.com/ ([https](https://github.com/) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 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://zookeeper.apache.org with 2 occurrences migrated to: https://zookeeper.apache.org ([https](https://zookeeper.apache.org) result 200). * [ ] http://zookeeper.apache.org/doc/current/zookeeperOver.html with 2 occurrences migrated to: https://zookeeper.apache.org/doc/current/zookeeperOver.html ([https](https://zookeeper.apache.org/doc/current/zookeeperOver.html) result 200). * [ ] http://zookeeper.apache.org/doc/current/zookeeperStarted.html with 7 occurrences migrated to: https://zookeeper.apache.org/doc/current/zookeeperStarted.html ([https](https://zookeeper.apache.org/doc/current/zookeeperStarted.html) result 200). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 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://eclipse.org with 1 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to: https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302). # Ignored These URLs were intentionally ignored. * http://localhost with 1 occurrences * http://localhost:8080 with 4 occurrences * http://localhost:8081/service-registry with 1 occurrences --- .github/CONTRIBUTING.md | 4 +-- README.adoc | 26 +++++++++---------- docs/src/main/asciidoc/README.adoc | 10 +++---- .../main/asciidoc/spring-cloud-zookeeper.adoc | 12 ++++----- .../ZookeeperPropertySourceLocator.java | 2 +- .../ZookeeprDiscoveryNonWebAppTests.java | 2 +- ...ntConfigServiceAutoConfigurationTests.java | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8560ad2a..eb9a16ae 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 d77b15b9..ad99fe2d 100644 --- a/README.adoc +++ b/README.adoc @@ -18,8 +18,8 @@ with Spring Cloud Netflix provides Intelligent Routing (Zuul), Client Side Load ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. See the -http://zookeeper.apache.org[Zookeeper site] for more information. Spring Cloud Zookeeper -also builds on the http://curator.apache.org[Apache Curator] project, which started life +https://zookeeper.apache.org[Zookeeper site] for more information. Spring Cloud Zookeeper +also builds on the https://curator.apache.org[Apache Curator] project, which started life at Netflix. == Spring Cloud Zookeeper Features @@ -31,11 +31,11 @@ Spring Cloud Zookeeper includes the following features: == Running the Sample -. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_Download[Install +. https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_Download[Install zookeeper] (On a mac with homebrew, use `brew install zookeeper`). -. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode[Start +. https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode[Start zookeeper]. -. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_ConnectingToZooKeeper[Verify +. https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_ConnectingToZooKeeper[Verify zookeeper is running]. . Run `mvn --settings .settings.xml package`. Doing so brings in the required Spring Cloud Maven repositories and Build. @@ -81,7 +81,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, @@ -103,13 +103,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". @@ -167,7 +167,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 @@ -180,7 +180,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). @@ -251,7 +251,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/README.adoc b/docs/src/main/asciidoc/README.adoc index 8ac9c5a3..0b7dd5f7 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -6,8 +6,8 @@ include::intro.adoc[] ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. See the -http://zookeeper.apache.org[Zookeeper site] for more information. Spring Cloud Zookeeper -also builds on the http://curator.apache.org[Apache Curator] project, which started life +https://zookeeper.apache.org[Zookeeper site] for more information. Spring Cloud Zookeeper +also builds on the https://curator.apache.org[Apache Curator] project, which started life at Netflix. == Spring Cloud Zookeeper Features @@ -19,11 +19,11 @@ Spring Cloud Zookeeper includes the following features: == Running the Sample -. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_Download[Install +. https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_Download[Install zookeeper] (On a mac with homebrew, use `brew install zookeeper`). -. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode[Start +. https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode[Start zookeeper]. -. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_ConnectingToZooKeeper[Verify +. https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_ConnectingToZooKeeper[Verify zookeeper is running]. . Run `mvn --settings .settings.xml package`. Doing so brings in the required Spring Cloud Maven repositories and Build. diff --git a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc index ef3d7d7f..21e3970d 100644 --- a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc +++ b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc @@ -1,7 +1,7 @@ :github-tag: master :github-repo: spring-cloud/spring-cloud-zookeeper -: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} :toc: left :nofooter: @@ -11,7 +11,7 @@ include::intro.adoc[] [[spring-cloud-zookeeper-install]] == Install Zookeeper -See the http://zookeeper.apache.org/doc/current/zookeeperStarted.html[installation +See the https://zookeeper.apache.org/doc/current/zookeeperStarted.html[installation documentation] for instructions on how to install Zookeeper. Spring Cloud Zookeeper uses Apache Curator behind the scenes. @@ -67,8 +67,8 @@ compile('org.apache.zookeeper:zookeeper:3.4.12') { Service Discovery is one of the key tenets of a microservice based architecture. Trying to hand-configure each client or some form of convention can be difficult to do and can be -brittle. http://curator.apache.org[Curator](A Java library for Zookeeper) provides Service -Discovery through a http://curator.apache.org/curator-x-discovery/[Service Discovery +brittle. https://curator.apache.org[Curator](A Java library for Zookeeper) provides Service +Discovery through a https://curator.apache.org/curator-x-discovery/[Service Discovery Extension]. Spring Cloud Zookeeper uses this extension for service registration and discovery. @@ -491,7 +491,7 @@ overridden. == Distributed Configuration with Zookeeper Zookeeper provides a -http://zookeeper.apache.org/doc/current/zookeeperOver.html#sc_dataModelNameSpace[hierarchical namespace] +https://zookeeper.apache.org/doc/current/zookeeperOver.html#sc_dataModelNameSpace[hierarchical namespace] that lets clients store arbitrary data, such as configuration data. Spring Cloud Zookeeper Config is an alternative to the https://github.com/spring-cloud/spring-cloud-config[Config Server and Client]. diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java index b9e84fe9..5e770185 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java @@ -36,7 +36,7 @@ import org.springframework.util.ReflectionUtils; /** * Zookeeper provides a hierarchical + * "https://zookeeper.apache.org/doc/current/zookeeperOver.html#sc_dataModelNameSpace">hierarchical * namespace that allows clients to store arbitrary data, such as configuration data. * Spring Cloud Zookeeper Config is an alternative to the * Config Server and diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java index 7cde7ac3..b0326cb6 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java @@ -86,7 +86,7 @@ public class ZookeeprDiscoveryNonWebAppTests { then(bean.discoveryClient.getInstances("hello-world")) .isNotEmpty(); String string = bean.restTemplate - .getForObject("http://hello-world/", String.class); + .getForObject("https://hello-world/", String.class); then(string).isEqualTo("foo"); } catch (IllegalStateException e) { diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java index 572bc83c..71e4b12f 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -77,7 +77,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { verify(client, atLeast(2)).getInstances("configserver"); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); - assertThat(locator.getUri()[0]).isEqualTo("http://foo:7001/"); + assertThat(locator.getUri()[0]).isEqualTo("https://foo:7001/"); } private void setup(String... env) { From 27003570a22f3fb28910c67692a273f5e47e6d8e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Mar 2019 16:51:35 -0400 Subject: [PATCH 2/2] Fixing broken test urls --- .../zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java | 2 +- .../DiscoveryClientConfigServiceAutoConfigurationTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java index 42681eef..4a77599f 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java @@ -86,7 +86,7 @@ public class ZookeeprDiscoveryNonWebAppTests { then(bean.discoveryClient.getInstances("hello-world")) .isNotEmpty(); String string = bean.restTemplate - .getForObject("https://hello-world/", String.class); + .getForObject("http://hello-world/", String.class); then(string).isEqualTo("foo"); } catch (IllegalStateException e) { diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java index fc5fadad..023ee116 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -77,7 +77,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { verify(client, atLeast(2)).getInstances("configserver"); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); - assertThat(locator.getUri()[0]).isEqualTo("https://foo:7001/"); + assertThat(locator.getUri()[0]).isEqualTo("http://foo:7001/"); } private void setup(String... env) {