Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-6244
This commit is contained in:
Johnny Lim
2016-06-29 13:51:52 +09:00
committed by Stephane Nicoll
parent f54bec835d
commit 5bc9d5b380
8 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -629,11 +629,11 @@ content into your application; rather pick only the properties that you need.
spring.datasource.url= # JDBC url of the database.
spring.datasource.username=
# JEST (ElasticSearch HTTP client) ({sc-spring-boot-autoconfigure}/jest/JestProperties.{sc-ext}[JestProperties])
# JEST (Elasticsearch HTTP client) ({sc-spring-boot-autoconfigure}/jest/JestProperties.{sc-ext}[JestProperties])
spring.elasticsearch.jest.connection-timeout=3000 # Connection timeout in milliseconds.
spring.elasticsearch.jest.password= # Login password.
spring.elasticsearch.jest.read-timeout=3000 # Read timeout in milliseconds.
spring.elasticsearch.jest.uris=http://localhost:9200 # Comma-separated list of the elasticsearch instances to use.
spring.elasticsearch.jest.uris=http://localhost:9200 # Comma-separated list of the Elasticsearch instances to use.
spring.elasticsearch.jest.username= # Login user.
# H2 Web Console ({sc-spring-boot-autoconfigure}/h2/H2ConsoleProperties.{sc-ext}[H2ConsoleProperties])

2
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@@ -292,7 +292,7 @@ The following `HealthIndicators` are auto-configured by Spring Boot when appropr
|Checks that a connection to `DataSource` can be obtained.
|{sc-spring-boot-actuator}/health/ElasticsearchHealthIndicator.{sc-ext}[`ElasticsearchHealthIndicator`]
|Checks that an ElasticSearch cluster is up.
|Checks that an Elasticsearch cluster is up.
|{sc-spring-boot-actuator}/health/JmsHealthIndicator.{sc-ext}[`JmsHealthIndicator`]
|Checks that a JMS broker is up.

7
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -3335,7 +3335,7 @@ https://github.com/searchbox-io/Jest[Jest].
[[boot-features-connecting-to-elasticsearch-jest]]
==== Connecting to Elasticsearch using Spring Data
==== Connecting to Elasticsearch using Jest
If you have `Jest` on the classpath, you can inject an auto-configured `JestClient`
targeting `http://localhost:9200` by default. You can further tune how the client is
configured:
@@ -3352,14 +3352,13 @@ To take full control over the registration, define a `JestClient` bean.
[[boot-features-connecting-to-elasticsearch]]
[[boot-features-connecting-to-elasticsearch-spring-data]]
==== Connecting to Elasticsearch using Spring Data
You can inject an auto-configured `ElasticsearchTemplate` or Elasticsearch `Client`
instance as you would any other Spring Bean. By default the instance will embed a
local in-memory server (a `Node` in ElasticSearch terms) and use the current working
local in-memory server (a `Node` in Elasticsearch terms) and use the current working
directory as the home directory for the server. In this setup, the first thing to do
is to tell ElasticSearch where to store its files:
is to tell Elasticsearch where to store its files:
[source,properties,indent=0]
----