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

Refactor Jest auto-configuration package space

Browse Source 
This commit moves the Jest auto-configuration from `spring.jest` to
`spring.elasticsearch.jest`

Closes gh-6032
This commit is contained in:
Stephane Nicoll
2016-06-23 10:39:16 +02:00
parent 5182bc4f2b
commit 2dc6e5b6fa
9 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -624,19 +624,19 @@ 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])
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.username= # Login user.
# H2 Web Console ({sc-spring-boot-autoconfigure}/h2/H2ConsoleProperties.{sc-ext}[H2ConsoleProperties])
spring.h2.console.enabled=false # Enable the console.
spring.h2.console.path=/h2-console # Path at which the console will be available.
spring.h2.console.settings.trace=false # Enable trace output.
spring.h2.console.settings.web-allow-others=false # Enable remote access.
# JEST (ElasticSearch HTTP client) ({sc-spring-boot-autoconfigure}/jest/JestProperties.{sc-ext}[JestProperties])
spring.jest.connection-timeout=3000 # Connection timeout in milliseconds.
spring.jest.password= # Login password.
spring.jest.read-timeout=3000 # Read timeout in milliseconds.
spring.jest.uris=http://localhost:9200 # Comma-separated list of the elasticsearch instances to use.
spring.jest.username= # Login user.
# JOOQ ({sc-spring-boot-autoconfigure}/jooq/JooqAutoConfiguration.{sc-ext}[JooqAutoConfiguration])
spring.jooq.sql-dialect= # SQLDialect JOOQ used when communicating with the configured datasource. For instance `POSTGRES`

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

@@ -3342,10 +3342,10 @@ configured:
[source,properties,indent=0]
----
spring.jest.uris=http://search.example.com:9200
spring.jest.read-timeout=10000
spring.jest.username=user
spring.jest.password=secret
spring.elasticsearch.jest.uris=http://search.example.com:9200
spring.elasticsearch.jest.read-timeout=10000
spring.elasticsearch.jest.username=user
spring.elasticsearch.jest.password=secret
----
To take full control over the registration, define a `JestClient` bean.