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

Upgrade to Spring Data Hopper M1

Browse Source 
Closes gh-5120
This commit is contained in:
Stephane Nicoll
2016-02-15 14:22:40 +01:00
parent 1c365662b0
commit b205e02e33
9 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2961,19 +2961,15 @@ https://github.com/spring-projects/spring-data-gemfire/blob/master/src/main/java
[[boot-features-solr]]
=== Solr
http://lucene.apache.org/solr/[Apache Solr] is a search engine. Spring Boot offers basic
auto-configuration for the Solr 4 client library and abstractions on top of it provided by
auto-configuration for the Solr 5 client library and abstractions on top of it provided by
https://github.com/spring-projects/spring-data-solr[Spring Data Solr]. There is
a `spring-boot-starter-data-solr` '`Starter POM`' for collecting the dependencies in a
convenient way.
TIP: Solr 5 is currently not supported and the auto-configuration will not be enabled by
a Solr 5 dependency.
[[boot-features-connecting-to-solr]]
==== Connecting to Solr
You can inject an auto-configured `SolrServer` instance as you would any other Spring
You can inject an auto-configured `SolrClient` instance as you would any other Spring
bean. By default the instance will attempt to connect to a server using
`http://localhost:8983/solr`:
@@ -2982,10 +2978,10 @@ bean. By default the instance will attempt to connect to a server using
@Component
public class MyBean {
private SolrServer solr;
private SolrClient solr;
@Autowired
public MyBean(SolrServer solr) {
public MyBean(SolrClient solr) {
this.solr = solr;
}
@@ -2994,7 +2990,7 @@ bean. By default the instance will attempt to connect to a server using
}
----
If you add a `@Bean` of your own of type `SolrServer` it will replace the default.
If you add a `@Bean` of your own of type `SolrClient` it will replace the default.