Polish Spring Data Solr integration

Author: wilkinsona

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/SolrRepositoriesAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -36,13 +36,14 @@
  * If active auto configuration does the same as
  * {@link org.springframework.data.solr.repository.config.EnableSolrRepositories} would
  * do.
- * 
+ *
  * @author Christoph Strobl
+ * @since 1.1.0
  */
 @Configuration
 @ConditionalOnClass({ SolrServer.class, SolrRepository.class })
 @ConditionalOnMissingBean(SolrRepositoryFactoryBean.class)
-@Import(SolrRepositoriesAutoConfigureRegstrar.class)
+@Import(SolrRepositoriesAutoConfigureRegistrar.class)
 public class SolrRepositoriesAutoConfiguration {
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/SolrRepositoriesAutoConfigureRegstrar.java renamed to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/SolrRepositoriesAutoConfigureRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -26,40 +26,23 @@
 /**
  * {@link ImportBeanDefinitionRegistrar} used to auto-configure Spring Data Solr
  * repositories.
- * 
+ *
  * @author Christoph Strobl
+ * @since 1.1.0
  */
-public class SolrRepositoriesAutoConfigureRegstrar extends
+public class SolrRepositoriesAutoConfigureRegistrar extends
 		AbstractRepositoryConfigurationSourceSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.boot.autoconfigure.data.
-	 * AbstractRepositoryConfigurationSourceSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableSolrRepositories.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.boot.autoconfigure.data.
-	 * AbstractRepositoryConfigurationSourceSupport#getConfiguration()
-	 */
 	@Override
 	protected Class<?> getConfiguration() {
 		return EnableSolrRepositoriesConfiguration.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.boot.autoconfigure.data.
-	 * AbstractRepositoryConfigurationSourceSupport#getRepositoryConfigurationExtension()
-	 */
 	@Override
 	protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() {
 		return new SolrRepositoryConfigExtension();

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -22,6 +22,7 @@
 import org.apache.solr.client.solrj.impl.CloudSolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -30,16 +31,18 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Enables auto configuration for Solr.
- * 
+ * {@link EnableAutoConfiguration Auto-configuration} for Solr
+ *
  * @author Christoph Strobl
+ * @since 1.1.0
  */
 @Configuration
 @ConditionalOnClass(SolrServer.class)
 @EnableConfigurationProperties(SolrProperties.class)
 public class SolrAutoConfiguration {
 
-	private @Autowired SolrProperties properties;
+	@Autowired
+	private SolrProperties properties;
 
 	private SolrServer solrServer;
 
@@ -53,13 +56,11 @@ public void close() {
 	@Bean
 	@ConditionalOnMissingBean
 	public SolrServer solrServer() {
-
 		this.solrServer = createSolrServer();
 		return this.solrServer;
 	}
 
 	private SolrServer createSolrServer() {
-
 		if (StringUtils.hasText(this.properties.getZkHost())) {
 			return new CloudSolrServer(this.properties.getZkHost());
 		}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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,8 +20,9 @@
 
 /**
  * Configuration properties for Solr.
- * 
+ *
  * @author Christoph Strobl
+ * @since 1.1.0
  */
 @ConfigurationProperties(prefix = "spring.data.solr")
 public class SolrProperties {
@@ -31,15 +32,15 @@ public class SolrProperties {
 	private String zkHost;
 
 	public String getHost() {
-		return host;
+		return this.host;
 	}
 
 	public void setHost(String host) {
 		this.host = host;
 	}
 
 	public String getZkHost() {
-		return zkHost;
+		return this.zkHost;
 	}
 
 	public void setZkHost(String zkHost) {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java

@@ -38,7 +38,7 @@
 
 /**
  * Tests for {@link JpaRepositoriesAutoConfiguration}.
- * 
+ *
  * @author Dave Syer
  * @author Oliver Gierke
  */
@@ -83,9 +83,9 @@ protected static class TestConfiguration {
 
 	@Configuration
 	@EnableJpaRepositories(basePackageClasses = org.springframework.boot.autoconfigure.data.alt.CityJpaRepository.class, excludeFilters = {
-        @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityMongoDbRepository.class),
-        @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CitySolrRepository.class) })
-    @TestAutoConfigurationPackage(City.class)
+			@Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityMongoDbRepository.class),
+			@Filter(type = FilterType.ASSIGNABLE_TYPE, value = CitySolrRepository.class) })
+	@TestAutoConfigurationPackage(City.class)
 	protected static class CustomConfiguration {
 
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/SolrRepositoriesAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -15,10 +15,6 @@
  */
 package org.springframework.boot.autoconfigure.data;
 
-import static org.hamcrest.core.IsInstanceOf.*;
-import static org.hamcrest.core.IsNull.*;
-import static org.junit.Assert.*;
-
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.junit.Test;
@@ -32,7 +28,13 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.solr.repository.config.EnableSolrRepositories;
 
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+
 /**
+ * Tests for {@link SolrRepositoriesAutoConfiguration}
+ *
  * @author Christoph Strobl
  */
 public class SolrRepositoriesAutoConfigurationTests {
@@ -41,31 +43,31 @@ public class SolrRepositoriesAutoConfigurationTests {
 
 	@Test
 	public void testDefaultRepositoryConfiguration() {
-
 		initContext(TestConfiguration.class);
 
 		assertThat(this.context.getBean(CityRepository.class), notNullValue());
-		assertThat(this.context.getBean(SolrServer.class), instanceOf(HttpSolrServer.class));
+		assertThat(this.context.getBean(SolrServer.class),
+				instanceOf(HttpSolrServer.class));
 	}
 
 	@Test
 	public void testNoRepositoryConfiguration() {
-
 		initContext(EmptyConfiguration.class);
-		assertThat(this.context.getBean(SolrServer.class), instanceOf(HttpSolrServer.class));
+		assertThat(this.context.getBean(SolrServer.class),
+				instanceOf(HttpSolrServer.class));
 	}
 
 	@Test
 	public void doesNotTriggerDefaultRepositoryDetectionIfCustomized() {
-
 		initContext(CustomizedConfiguration.class);
 		assertThat(this.context.getBean(CitySolrRepository.class), notNullValue());
 	}
 
 	private void initContext(Class<?> configClass) {
 
 		this.context = new AnnotationConfigApplicationContext();
-		this.context.register(configClass, SolrAutoConfiguration.class, SolrRepositoriesAutoConfiguration.class,
+		this.context.register(configClass, SolrAutoConfiguration.class,
+				SolrRepositoriesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
 		this.context.refresh();
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/City.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.boot.autoconfigure.data.solr;
 
 import org.springframework.data.annotation.Id;
@@ -29,15 +30,15 @@ public class City {
 	private @Indexed String name;
 
 	public String getId() {
-		return id;
+		return this.id;
 	}
 
 	public void setId(String id) {
 		this.id = id;
 	}
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	public void setName(String name) {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/CityRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.boot.autoconfigure.data.solr;
 
 import org.springframework.data.domain.Page;

spring-boot-dependencies/pom.xml

@@ -192,6 +192,11 @@
 				<artifactId>spring-boot-starter-data-rest</artifactId>
 				<version>1.1.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-data-solr</artifactId>
+				<version>1.1.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-freemarker</artifactId>

spring-boot-samples/spring-boot-sample-data-solr/src/main/java/sample/data/solr/Product.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2012-2014 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.
@@ -23,9 +23,6 @@
 import org.springframework.data.solr.core.geo.Point;
 import org.springframework.data.solr.core.mapping.SolrDocument;
 
-/**
- * @author Christoph Strobl
- */
 @SolrDocument(solrCoreName = "collection1")
 public class Product {
 
@@ -55,39 +52,39 @@ public Product(String id, String name) {
 	}
 
 	public String getId() {
-		return id;
+		return this.id;
 	}
 
 	public void setId(String id) {
 		this.id = id;
 	}
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	public void setName(String name) {
 		this.name = name;
 	}
 
 	public Double getPrice() {
-		return price;
+		return this.price;
 	}
 
 	public void setPrice(Double price) {
 		this.price = price;
 	}
 
 	public List<String> getCategory() {
-		return category;
+		return this.category;
 	}
 
 	public void setCategory(List<String> category) {
 		this.category = category;
 	}
 
 	public Point getLocation() {
-		return location;
+		return this.location;
 	}
 
 	public void setLocation(Point location) {
@@ -96,8 +93,8 @@ public void setLocation(Point location) {
 
 	@Override
 	public String toString() {
-		return "Product [id=" + id + ", name=" + name + ", price=" + price
-				+ ", category=" + category + ", location=" + location + "]";
+		return "Product [id=" + this.id + ", name=" + this.name + ", price=" + this.price
+				+ ", category=" + this.category + ", location=" + this.location + "]";
 	}
 
 }