SpringCloud/spring-cloud-zookeeper
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'spring-operator-polish-urls-remaining-master'

Browse Source
This commit is contained in:
Ryan Baxter
2019-03-21 16:52:19 -04:00
parent a9ae6f734b 27003570a2
commit 03f59b8550
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/CONTRIBUTING.md vendored
View File

@@ -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).

26
README.adoc
View File

@@ -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
<?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"/>

10
docs/src/main/asciidoc/README.adoc
View File

@@ -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.

12
docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
View File

@@ -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].

2
spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
View File

@@ -36,7 +36,7 @@ import org.springframework.util.ReflectionUtils;
/**
* Zookeeper provides a <a href=
* "http://zookeeper.apache.org/doc/current/zookeeperOver.html#sc_dataModelNameSpace">hierarchical
* "https://zookeeper.apache.org/doc/current/zookeeperOver.html#sc_dataModelNameSpace">hierarchical
* namespace</a> that allows clients to store arbitrary data, such as configuration data.
* Spring Cloud Zookeeper Config is an alternative to the
* <a href="https://github.com/spring-cloud/spring-cloud-config">Config Server and