Consolidated configuration classes.

Moved all of the into src/main/java. Got rid off the common superclass as it now adds more noise than clarity.

Author: odrotbohm

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditingConfiguration.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.example.repository.auditing;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.example.InfrastructureConfig;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+/**
+ * @author Oliver Gierke
+ */
+@Configuration
+@EnableAutoConfiguration
+@EnableJpaAuditing
+class AuditingConfiguration extends InfrastructureConfig {
+
+	@Bean
+	AuditorAwareImpl auditorAware() {
+		return new AuditorAwareImpl();
+	}
+}

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/caching/CachingConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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.
@@ -17,15 +17,14 @@
 
 import java.util.Arrays;
 
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
  * Java config to use Spring Data JPA alongside the Spring caching support.
@@ -34,10 +33,9 @@
  * @author Thomas Darimont
  */
 @Configuration
-@EnableJpaRepositories
-@ImportResource("classpath:infrastructure.xml")
 @EnableCaching
-public class CachingConfiguration {
+@EnableAutoConfiguration
+class CachingConfiguration {
 
 	@Bean
 	public CacheManager cacheManager() {

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/caching/package-info.java

@@ -1,5 +1,5 @@
 /**
- * Sample for the integration of the Spring Caching abstraction with Spring Data repositories.
+ * Sample for the integration of the Spring caching abstraction with Spring Data repositories.
  */
 package org.springframework.data.jpa.example.repository.caching;
 

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/custom/CustomRepositoryConfig.java renamed to spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/custom/CustomRepositoryConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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,11 +15,8 @@
  */
 package org.springframework.data.jpa.example.repository.custom;
 
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.jpa.example.repository.InfrastructureConfig;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
  * Sample configuration to bootstrap Spring Data JPA through JavaConfig
@@ -28,7 +25,5 @@
  * @author Oliver Gierke
  */
 @Configuration
-@ComponentScan
-@Import(InfrastructureConfig.class)
-@EnableJpaRepositories
+@EnableAutoConfiguration
 public class CustomRepositoryConfig {}

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/custom/package-info.java

@@ -1,5 +1,5 @@
 /**
- * Package showing a repository interface to use basic finder method execution functionality as well as <em>customized</em> repository functionality.
+ * Package showing a repository interface to use basic query method execution functionality as well as <em>customized</em> repository functionality.
  */
 package org.springframework.data.jpa.example.repository.custom;
 

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/simple/package-info.java

@@ -1,5 +1,5 @@
 /**
- * Package showing a simple repository interface to use basic finder method execution functionality.
+ * Package showing a simple repository interface to use basic query method execution functionality.
  */
 package org.springframework.data.jpa.example.repository.simple;
 

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/InfrastructureConfig.java

@@ -15,29 +15,14 @@
  */
 package org.springframework.data.jpa.example.repository.auditing;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.example.repository.InfrastructureConfig;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
  * Test case to show Spring Data JPA auditing with JavaConfig
  * 
  * @author Oliver Gierke
  */
-@ContextConfiguration
+@ContextConfiguration(classes = AuditingConfiguration.class)
 public class JavaConfigAuditableUserSample extends AbstractAuditableUserSample {
 
-	@Configuration
-	@EnableJpaRepositories
-	@EnableJpaAuditing
-	static class Config extends InfrastructureConfig {
-
-		@Bean
-		AuditorAwareImpl auditorAware() {
-			return new AuditorAwareImpl();
-		}
-	}
 }

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/auditing/JavaConfigAuditableUserSample.java

@@ -17,7 +17,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jpa.example.repository.InfrastructureConfig;
+import org.springframework.data.jpa.example.InfrastructureConfig;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.ContextConfiguration;