DATASOLR-232 - Upgrade to Solr 5 / Bump version to 2.0

The upgrade requires a switch to SolrClient and its derivates. 
This is a breaking change that demands a major version upgrade of spring-data-solr.

XML namspace and JavaConfig bean definition changes accordingly to reflect the changes.

  <solr:solr-client ../> replaces <solr:solr-server ../>

  @bean SolrClient solrClient() replaces @bean SolrServer solrServer()

Author: christophstrobl

.gitignore

@@ -10,3 +10,4 @@ spring-data-solr.iml
 .DS_Store
 _site
 
+/bin/

README.md

@@ -133,8 +133,8 @@ public class SolrContext {
   private @Resource Environment env;
 
   @Bean
-  public SolrServer solrServer() throws MalformedURLException, IllegalStateException {
-    return new HttpSolrServer(env.getRequiredProperty("solr.host"));
+  public SolrClient solrClient() throws MalformedURLException, IllegalStateException {
+    return new HttpSolrClient(env.getRequiredProperty("solr.host"));
   }
 
 }
@@ -177,7 +177,7 @@ You can set up repository scanning via xml configuration, which will happily cre
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <solr:repositories base-package="com.acme.repository" multicoreSupport="true" />
-  <solr:solr-server id="solrServer" url="http://localhost:8983/solr" />
+  <solr:solr-client id="solrClient" url="http://localhost:8983/solr" />
 
 </beans>
 ```
@@ -194,8 +194,8 @@ Use `@Indexed` to provide additional details like specific solr types to use.
 class Config {
 
   @Bean
-  public SolrServer solrServer() {
-    return new HttpSolrServer("http://localhost:8983/solr");
+  public SolrClient solrClient() {
+    return new HttpSolrClient("http://localhost:8983/solr");
   }
 }
 

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-solr</artifactId>
-	<version>1.6.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 
 	<name>Spring Data Solr</name>
 	<description>Spring Data module providing support for Apache Solr repositories.</description>
@@ -22,8 +22,8 @@
 		<dist.key>DATASOLR</dist.key>
 		<commons.collections>3.2.1</commons.collections>
 		<commons.lang>3.1</commons.lang>
-		<httpcomponents>4.2.2</httpcomponents>
-		<solr>4.10.4</solr>
+		<httpcomponents>4.3.1</httpcomponents>
+		<solr>5.3.0</solr>
 		<springdata.commons>1.12.0.BUILD-SNAPSHOT</springdata.commons>
 	</properties>
 
@@ -90,33 +90,7 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpcomponents}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpmime</artifactId>
-			<version>${httpcomponents}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient-cache</artifactId>
-			<version>${httpcomponents}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+		
 
 		<!-- JODA Time -->
 		<dependency>
@@ -143,15 +117,7 @@
 				<exclusion>
 					<groupId>org.slf4j</groupId>
 					<artifactId>jcl-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpclient</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpmime</artifactId>
-				</exclusion>
+				</exclusion>	
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -168,6 +134,10 @@
 					<artifactId>jdk.tools</artifactId>
 					<groupId>jdk.tools</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-core</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 

src/main/asciidoc/preface.adoc

@@ -16,8 +16,7 @@ The Spring Data Solr project applies core Spring concepts to the development of
 [preface]
 == Requirements
 
-Requires http://lucene.apache.org/solr/[Apache Solr] 3.6. Preferably the latest 4.x version.
-The client library of SolrJ 5.x is currently, due to breaking changes in the API, not supported.
+Requires http://lucene.apache.org/solr/[Apache Solr] 5. Preferably the latest 5.x version.
 
 [source,xml]
 ----
@@ -26,7 +25,4 @@ The client library of SolrJ 5.x is currently, due to breaking changes in the API
   <artifactId>solr-core</artifactId>
   <version>${solr.version}</version>
 </dependency>
-----
-
-NOTE: If you tend to use the Embedded Version of Solr Server 4.x you will also have to add a version of servlet-api and check your <lockType> as well as <unlockOnStartup> settings.
-
+----

src/main/asciidoc/reference/data-solr.adoc

@@ -9,7 +9,7 @@ This chapter includes details of the Solr repository implementation.
 [[solr.namespace]]
 === Spring Namespace
 
-The Spring Data Solr module contains a custom namespace allowing definition of repository beans as well as elements for instantiating a `SolrServer` .
+The Spring Data Solr module contains a custom namespace allowing definition of repository beans as well as elements for instantiating a `SolrClient` .
 
 Using the `repositories` element looks up Spring Data repositories as described in <<repositories.create-instances>> .
 
@@ -31,9 +31,9 @@ Using the `repositories` element looks up Spring Data repositories as described
 ----
 ====
 
-Using the `solr-server` or `embedded-solr-server` element registers an instance of `SolrServer` in the context. 
+Using the `solr-server` or `embedded-solr-server` element registers an instance of `SolrClient` in the context. 
 
-.HttpSolrServer using Namespace
+.HttpSolrClient using Namespace
 ====
 [source,xml]
 ----
@@ -46,12 +46,12 @@ Using the `solr-server` or `embedded-solr-server` element registers an instance
     http://www.springframework.org/schema/data/solr
     http://www.springframework.org/schema/data/solr/spring-solr.xsd">
 
-  <solr:solr-server id="solrServer" url="http://locahost:8983/solr" />
+  <solr:solr-client id="solrClient" url="http://locahost:8983/solr" />
 </beans> 
 ----
 ====
 
-.LBSolrServer using Namespace
+.LBSolrClient using Namespace
 ====
 [source,xml]
 ----
@@ -64,7 +64,7 @@ Using the `solr-server` or `embedded-solr-server` element registers an instance
     http://www.springframework.org/schema/data/solr
     http://www.springframework.org/schema/data/solr/spring-solr.xsd">
 
-  <solr:solr-server id="solrServer" url="http://locahost:8983/solr,http://localhost:8984/solr" />
+  <solr:solr-client id="solrClient" url="http://locahost:8983/solr,http://localhost:8984/solr" />
 </beans> 
 ----
 ====
@@ -82,7 +82,7 @@ Using the `solr-server` or `embedded-solr-server` element registers an instance
     http://www.springframework.org/schema/data/solr
     http://www.springframework.org/schema/data/solr/spring-solr.xsd">
 
-  <solr:embedded-solr-server id="solrServer" solrHome="classpath:com/acme/solr" />
+  <solr:embedded-solr-server id="solrClient" solrHome="classpath:com/acme/solr" />
 </beans> 
 ----
 ====
@@ -101,14 +101,14 @@ The Spring Data Solr repositories support cannot only be activated through an XM
 class ApplicationConfig {
   
   @Bean
-  public SolrServer solrServer() {
+  public SolrClient solrClient() {
     EmbeddedSolrServerFactory factory = new EmbeddedSolrServerFactory("classpath:com/acme/solr");
     return factory.getSolrServer();
   }
   
   @Bean
   public SolrOperations solrTemplate() {
-    return new SolrTemplate(solrServer());
+    return new SolrTemplate(solrClient());
   }
 }
 ----
@@ -119,7 +119,7 @@ The configuration above sets up an `EmbeddedSolrServer` which is used by the `So
 [[solr.multicore]]
 === Multicore Support
 
-Solr handles different collections within one core. Use `MulticoreSolrServerFactory` to create separate `SolrServer` for each core.
+Solr handles different collections within one core. Use `MulticoreSolrClientFactory` to create separate `SolrClient` for each core.
 
 .Multicore Configuration
 ====
@@ -135,8 +135,8 @@ class ApplicationConfig {
   private Environment environment;
   
   @Bean
-  public SolrServer solrServer() {
-    return new HttpSolrServer(environment.getRequiredProperty(PROPERTY_NAME_SOLR_SERVER_URL));
+  public SolrClient solrClient() {
+    return new HttpSolrClient(environment.getRequiredProperty(PROPERTY_NAME_SOLR_SERVER_URL));
   }
   
 }
@@ -488,7 +488,7 @@ To register a custom converter one must add `CustomConversions` to `SolrTemplate
 </bean>
 
 <bean id="solrTemplate" class="org.springframework.data.solr.core.SolrTemplate">
-	<constructor-arg ref="solrServer" />
+	<constructor-arg ref="solrClient" />
 	<property name="solrConverter" ref="solrConverter" />
 </bean>
 ----

src/main/asciidoc/reference/misc.adoc

@@ -6,9 +6,7 @@ This chapter covers additional support for Solr operations (such as faceting) th
 [[solr.misc.partialUpdates]]
 == Partial Updates
 
-PartialUpdates can be done using `PartialUpdate` which implements `Update` . NOTE: Partial updates require Solr 4.x. With Solr 4.0.0 it is not possible to update mulitvalue fields.
-
-NOTE: With Solr 4.1.0 you have to take care on parameter order when setting null values. Order parameters with nulls last.
+PartialUpdates can be done using `PartialUpdate` which implements `Update`.
 
 ====
 [source,java]

src/main/java/org/springframework/data/solr/SolrRealtimeGetRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014 - 2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.concurrent.TimeUnit;
 
+import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.ContentStream;
@@ -36,7 +33,7 @@
  * @author Christoph Strobl
  * @since 1.4
  */
-public class SolrRealtimeGetRequest extends SolrRequest {
+public class SolrRealtimeGetRequest extends SolrRequest<QueryResponse> {
 
 	private static final long serialVersionUID = 1500782684874146272L;
 	private Collection<String> ids;
@@ -73,20 +70,7 @@ public Collection<ContentStream> getContentStreams() throws IOException {
 	}
 
 	@Override
-	public QueryResponse process(SolrServer server) throws SolrServerException, IOException {
-
-		try {
-			long startTime = TimeUnit.MILLISECONDS.convert(System.nanoTime(), TimeUnit.NANOSECONDS);
-			QueryResponse res = new QueryResponse(server.request(this), server);
-			long endTime = TimeUnit.MILLISECONDS.convert(System.nanoTime(), TimeUnit.NANOSECONDS);
-			res.setElapsedTime(endTime - startTime);
-			return res;
-		} catch (SolrServerException e) {
-			throw e;
-		} catch (SolrException s) {
-			throw s;
-		} catch (Exception e) {
-			throw new SolrServerException("Error executing query", e);
-		}
+	protected QueryResponse createResponse(SolrClient client) {
+		return new QueryResponse();
 	}
 }

src/main/java/org/springframework/data/solr/UncategorizedSolrException.java

@@ -18,10 +18,9 @@
 import org.springframework.dao.UncategorizedDataAccessException;
 
 /**
- * SolrServer threw an exception that could not be mapped. UncategorizedSolrException wraps the original Exception
+ * SolrClient threw an exception that could not be mapped. UncategorizedSolrException wraps the original Exception
  * 
  * @author Christoph Strobl
- * 
  */
 public class UncategorizedSolrException extends UncategorizedDataAccessException {
 

src/main/java/org/springframework/data/solr/config/SolrNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012 - 2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 import org.springframework.data.solr.repository.config.SolrRepositoryConfigExtension;
 import org.springframework.data.solr.server.config.EmbeddedSolrServerBeanDefinitionParser;
-import org.springframework.data.solr.server.config.HttpSolrServerBeanDefinitionParser;
+import org.springframework.data.solr.server.config.HttpSolrClientBeanDefinitionParser;
 
 /**
  * {@link NamespaceHandler} implementation to register parser for {@code <solr:repositories />},
@@ -44,6 +44,6 @@ public void init() {
 
 		registerBeanDefinitionParser("repositories", parser);
 		registerBeanDefinitionParser("embedded-solr-server", new EmbeddedSolrServerBeanDefinitionParser());
-		registerBeanDefinitionParser("solr-server", new HttpSolrServerBeanDefinitionParser());
+		registerBeanDefinitionParser("solr-client", new HttpSolrClientBeanDefinitionParser());
 	}
 }

src/main/java/org/springframework/data/solr/config/package-info.java

@@ -1,4 +1,4 @@
 /**
- * Spring XML namespace configuration for Solr specific repositories and SolrServer
+ * Spring XML namespace configuration for Solr specific repositories and SolrClient
  */
 package org.springframework.data.solr.config;

src/main/java/org/springframework/data/solr/core/DefaultQueryParser.java

@@ -71,7 +71,7 @@
 public class DefaultQueryParser extends QueryParserBase<SolrDataQuery> {
 
 	/**
-	 * Convert given Query into a SolrQuery executable via {@link org.apache.solr.client.solrj.SolrServer}
+	 * Convert given Query into a SolrQuery executable via {@link org.apache.solr.client.solrj.SolrClient}
 	 * 
 	 * @param query
 	 * @return
@@ -421,19 +421,13 @@ protected void appendFilterQuery(SolrQuery solrQuery, List<FilterQuery> filterQu
 	 * @param solrQuery
 	 * @param sort
 	 */
-	@SuppressWarnings("deprecation")
 	protected void appendSort(SolrQuery solrQuery, Sort sort) {
 		if (sort == null) {
 			return;
 		}
 
 		for (Order order : sort) {
-			// addSort which is to be used instead of addSortField is not available in versions below 4.2.0
-			if (VersionUtil.isSolr420Available()) {
-				solrQuery.addSort(order.getProperty(), order.isAscending() ? ORDER.asc : ORDER.desc);
-			} else {
-				solrQuery.addSortField(order.getProperty(), order.isAscending() ? ORDER.asc : ORDER.desc);
-			}
+			solrQuery.addSort(order.getProperty(), order.isAscending() ? ORDER.asc : ORDER.desc);
 		}
 	}