Got rid of XML based samples.

Author: odrotbohm

spring-data-jpa-example/pom.xml

@@ -19,7 +19,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 
 	</dependencies>

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

@@ -15,10 +15,15 @@
  */
 package org.springframework.data.jpa.example.repository.auditing;
 
+import javax.sql.DataSource;
+
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.Database;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 
 /**
  * @author Oliver Gierke
@@ -28,6 +33,31 @@
 @EnableJpaAuditing
 class AuditingConfiguration {
 
+	/**
+	 * We need to configure a {@link LocalContainerEntityManagerFactoryBean} manually here as Spring does <em>not</em>
+	 * automatically add the {@code orm.xml} <em>if</em> a {@code persistence.xml} is located right beside it. This is
+	 * necessary to get the {@link org.springframework.data.jpa.example.repository.basics.BasicFactorySetup} sample
+	 * working. However, in a {code persistence.xml}-less codebase you can rely on Spring Boot on setting the correct
+	 * defaults.
+	 * 
+	 * @return
+	 */
+	@Bean
+	LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
+
+		HibernateJpaVendorAdapter adapter = new HibernateJpaVendorAdapter();
+		adapter.setDatabase(Database.HSQL);
+		adapter.setGenerateDdl(true);
+
+		LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
+		factoryBean.setPackagesToScan(getClass().getPackage().getName());
+		factoryBean.setMappingResources("META-INF/orm.xml");
+		factoryBean.setJpaVendorAdapter(adapter);
+		factoryBean.setDataSource(dataSource);
+
+		return factoryBean;
+	}
+
 	@Bean
 	AuditorAwareImpl auditorAware() {
 		return new AuditorAwareImpl();

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/caching/CachingUserRepository.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,7 +17,6 @@
 
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.jpa.example.domain.User;
 import org.springframework.data.repository.CrudRepository;
 
 /**

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

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2013 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.caching;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+
+import org.springframework.data.jpa.domain.AbstractPersistable;
+
+/**
+ * Sample user class.
+ * 
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+@Entity
+@NamedQuery(name = "User.findByTheUsersName", query = "from User u where u.username = ?1")
+public class User extends AbstractPersistable<Long> {
+
+	private static final long serialVersionUID = -2952735933715107252L;
+
+	@Column(unique = true) private String username;
+
+	private String firstname;
+	private String lastname;
+
+	public User() {
+		this(null);
+	}
+
+	/**
+	 * Creates a new user instance.
+	 */
+	public User(Long id) {
+		this.setId(id);
+	}
+
+	/**
+	 * Returns the username.
+	 * 
+	 * @return
+	 */
+	public String getUsername() {
+
+		return username;
+	}
+
+	/**
+	 * @param username the username to set
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * @return the firstname
+	 */
+	public String getFirstname() {
+		return firstname;
+	}
+
+	/**
+	 * @param firstname the firstname to set
+	 */
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	/**
+	 * @return the lastname
+	 */
+	public String getLastname() {
+		return lastname;
+	}
+
+	/**
+	 * @param lastname the lastname to set
+	 */
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
+}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.example.domain;
+package org.springframework.data.jpa.example.repository.custom;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/custom/UserRepository.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,7 +17,6 @@
 
 import java.util.List;
 
-import org.springframework.data.jpa.example.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/custom/UserRepositoryCustom.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,8 +17,6 @@
 
 import java.util.List;
 
-import org.springframework.data.jpa.example.domain.User;
-
 /**
  * Interface for repository functionality that ought to be implemented manually.
  * 

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/custom/UserRepositoryImpl.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.
@@ -21,8 +21,6 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.criteria.CriteriaQuery;
 
-import org.springframework.data.jpa.example.domain.User;
-
 /**
  * Implementation fo the custom repository functionality declared in {@link UserRepositoryCustom} based on JPA. To use
  * this implementation in combination with Spring Data JPA you can either register it programatically:

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/custom/UserRepositoryImplJdbc.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.
@@ -23,7 +23,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.jpa.example.domain.User;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.stereotype.Component;

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

@@ -15,10 +15,12 @@
  */
 package org.springframework.data.jpa.example.repository.simple;
 
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
 /**
- *
  * @author Oliver Gierke
  */
-public class SimpleConfiguration {
-
-}
+@Configuration
+@EnableAutoConfiguration
+class SimpleConfiguration {}

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/simple/SimpleUserRepository.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,7 +17,6 @@
 
 import java.util.List;
 
-import org.springframework.data.jpa.example.domain.User;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;

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

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2013 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.simple;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+
+import org.springframework.data.jpa.domain.AbstractPersistable;
+
+/**
+ * Sample user class.
+ * 
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+@Entity
+@NamedQuery(name = "User.findByTheUsersName", query = "from User u where u.username = ?1")
+public class User extends AbstractPersistable<Long> {
+
+	private static final long serialVersionUID = -2952735933715107252L;
+
+	@Column(unique = true) private String username;
+
+	private String firstname;
+	private String lastname;
+
+	public User() {
+		this(null);
+	}
+
+	/**
+	 * Creates a new user instance.
+	 */
+	public User(Long id) {
+		this.setId(id);
+	}
+
+	/**
+	 * Returns the username.
+	 * 
+	 * @return
+	 */
+	public String getUsername() {
+
+		return username;
+	}
+
+	/**
+	 * @param username the username to set
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * @return the firstname
+	 */
+	public String getFirstname() {
+		return firstname;
+	}
+
+	/**
+	 * @param firstname the firstname to set
+	 */
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	/**
+	 * @return the lastname
+	 */
+	public String getLastname() {
+		return lastname;
+	}
+
+	/**
+	 * @param lastname the lastname to set
+	 */
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
+}

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/auditing/AbstractAuditableUserSample.java renamed to spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/auditing/AuditableUserSample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * 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.
@@ -22,9 +22,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import org.springframework.data.jpa.example.repository.auditing.AuditableUser;
-import org.springframework.data.jpa.example.repository.auditing.AuditableUserRepository;
-import org.springframework.data.jpa.example.repository.auditing.AuditorAwareImpl;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,7 +33,8 @@
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @Transactional
-public abstract class AbstractAuditableUserSample {
+@ContextConfiguration(classes = AuditingConfiguration.class)
+public class AuditableUserSample {
 
 	@Autowired AuditableUserRepository repository;
 	@Autowired AuditorAwareImpl auditorAware;