Move Benchmarks from performance module into spring-data-jpa.

Closes #3655

Author: mp911de

pom.xml

@@ -58,12 +58,6 @@
 
 
 	<profiles>
-		<profile>
-			<id>benchmark</id>
-			<modules>
-				<module>spring-data-jpa-performance</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>hibernate-62</id>
 			<properties>

spring-data-jpa-performance/pom.xml

@@ -351,6 +351,16 @@
 							<artifactId>hibernate-jpamodelgen</artifactId>
 							<version>${hibernate}</version>
 						</path>
+						<path>
+							<groupId>org.hibernate.orm</groupId>
+							<artifactId>hibernate-core</artifactId>
+							<version>${hibernate}</version>
+						</path>
+						<path>
+							<groupId>org.openjdk.jmh</groupId>
+							<artifactId>jmh-generator-annprocess</artifactId>
+							<version>${jmh}</version>
+						</path>
 						<path>
 							<groupId>jakarta.persistence</groupId>
 							<artifactId>jakarta.persistence-api</artifactId>

spring-data-jpa-performance/src/main/resources/META-INF/persistence.xml

@@ -13,23 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.repository;
+package org.springframework.data.jpa.benchmark;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Persistence;
 import jakarta.persistence.Query;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
-import jmh.mbr.junit5.Microbenchmark;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
+import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.junit.platform.commons.annotation.Testable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Level;
@@ -42,21 +41,24 @@
 import org.openjdk.jmh.annotations.Warmup;
 
 import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.model.IPersonProjection;
-import org.springframework.data.jpa.model.Person;
-import org.springframework.data.jpa.model.Profile;
+import org.springframework.data.jpa.benchmark.model.IPersonProjection;
+import org.springframework.data.jpa.benchmark.model.Person;
+import org.springframework.data.jpa.benchmark.model.Profile;
+import org.springframework.data.jpa.benchmark.repository.PersonRepository;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.util.ObjectUtils;
 
 /**
  * @author Christoph Strobl
  */
-@Microbenchmark
+@Testable
 @Fork(1)
 @Warmup(time = 2, iterations = 3)
 @Measurement(time = 2)
 @Timeout(time = 2)
-public class RepositoryFinderTests {
+public class RepositoryFinderBenchmarks {
 
 	private static final String PERSON_FIRSTNAME = "first";
 	private static final String COLUMN_PERSON_FIRSTNAME = "firstname";
@@ -103,12 +105,23 @@ public void doTearDown() {
 
 		private void createEntityManager() {
 
-			Map<String, String> properties = new HashMap<>();
+			LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
+			factoryBean.setPersistenceUnitName("benchmark");
+			factoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+			factoryBean.setPersistenceProviderClass(HibernatePersistenceProvider.class);
+			factoryBean.setPersistenceXmlLocation("classpath*:META-INF/persistence-jmh.xml");
+			factoryBean.setMappingResources("classpath*:META-INF/orm-jmh.xml");
+
+			Properties properties = new Properties();
 			properties.put("jakarta.persistence.jdbc.url", "jdbc:h2:mem:test");
 			properties.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
 			properties.put("hibernate.hbm2ddl.auto", "update");
-			EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("benchmark", properties);
+			properties.put("hibernate.xml_mapping_enabled", "false");
+
+			factoryBean.setJpaProperties(properties);
+			factoryBean.afterPropertiesSet();
 
+			EntityManagerFactory entityManagerFactory = factoryBean.getObject();
 			entityManager = entityManagerFactory.createEntityManager();
 		}
 
@@ -139,7 +152,7 @@ public List<Person> baselineEntityManagerCriteriaQuery(BenchmarkParameters param
 	public List<Person> baselineEntityManagerHQLQuery(BenchmarkParameters parameters) {
 
 		Query query = parameters.entityManager
-				.createQuery("SELECT p FROM org.springframework.data.jpa.model.Person p WHERE p.firstname = ?1");
+				.createQuery("SELECT p FROM org.springframework.data.jpa.benchmark.model.Person p WHERE p.firstname = ?1");
 		query.setParameter(1, PERSON_FIRSTNAME);
 
 		return query.getResultList();
@@ -148,7 +161,8 @@ public List<Person> baselineEntityManagerHQLQuery(BenchmarkParameters parameters
 	@Benchmark
 	public Long baselineEntityManagerCount(BenchmarkParameters parameters) {
 
-		Query query = parameters.entityManager.createQuery("SELECT COUNT(*) FROM org.springframework.data.jpa.model.Person p WHERE p.firstname = ?1");
+		Query query = parameters.entityManager.createQuery(
+				"SELECT COUNT(*) FROM org.springframework.data.jpa.benchmark.model.Person p WHERE p.firstname = ?1");
 		query.setParameter(1, PERSON_FIRSTNAME);
 
 		return (Long) query.getSingleResult();

spring-data-jpa-performance/src/main/resources/logback.xml

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.model;
+package org.springframework.data.jpa.benchmark.model;
 
 /**
  * @author Christoph Strobl

spring-data-jpa/pom.xml

@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.model;
-
-import java.util.Set;
+package org.springframework.data.jpa.benchmark.model;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -25,6 +23,8 @@
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.Table;
 
+import java.util.Set;
+
 /**
  * @author Christoph Strobl
  */

…pa/repository/RepositoryFinderTests.java …enchmark/RepositoryFinderBenchmarks.javaspring-data-jpa-performance/src/test/java/org/springframework/data/jpa/repository/RepositoryFinderTests.java renamed to spring-data-jpa/src/jmh/java/org/springframework/data/jpa/benchmark/RepositoryFinderBenchmarks.java spring-data-jpa-performance/src/test/java/org/springframework/data/jpa/repository/RepositoryFinderTests.java renamed to spring-data-jpa/src/jmh/java/org/springframework/data/jpa/benchmark/RepositoryFinderBenchmarks.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.model;
+package org.springframework.data.jpa.benchmark.model;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

…rk/data/jpa/model/IPersonProjection.java …a/benchmark/model/IPersonProjection.javaspring-data-jpa-performance/src/main/java/org/springframework/data/jpa/model/IPersonProjection.java renamed to spring-data-jpa/src/jmh/java/org/springframework/data/jpa/benchmark/model/IPersonProjection.java spring-data-jpa-performance/src/main/java/org/springframework/data/jpa/model/IPersonProjection.java renamed to spring-data-jpa/src/jmh/java/org/springframework/data/jpa/benchmark/model/IPersonProjection.java

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.repository;
+package org.springframework.data.jpa.benchmark.repository;
 
 import java.util.List;
 
 import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.model.IPersonProjection;
-import org.springframework.data.jpa.model.Person;
+import org.springframework.data.jpa.benchmark.model.IPersonProjection;
+import org.springframework.data.jpa.benchmark.model.Person;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.ListCrudRepository;
 
 /**
@@ -31,17 +32,17 @@ public interface PersonRepository extends ListCrudRepository<Person, Integer> {
 
 	List<IPersonProjection> findAllAndProjectToInterfaceByFirstname(String firstname);
 
-	@Query("SELECT p FROM org.springframework.data.jpa.model.Person p WHERE p.firstname = ?1")
+	@Query("SELECT p FROM org.springframework.data.jpa.benchmark.model.Person p WHERE p.firstname = ?1")
 	List<Person> findAllWithAnnotatedQueryByFirstname(String firstname);
 
-	@Query("SELECT p FROM org.springframework.data.jpa.model.Person p WHERE p.firstname = ?1")
+	@Query("SELECT p FROM org.springframework.data.jpa.benchmark.model.Person p WHERE p.firstname = ?1")
 	List<Person> findAllWithAnnotatedQueryByFirstname(String firstname, Sort sort);
 
 	@Query(value = "SELECT * FROM person WHERE firstname = ?1", nativeQuery = true)
 	List<Person> findAllWithNativeQueryByFirstname(String firstname);
 
 	Long countByFirstname(String firstname);
 
-	@Query("SELECT COUNT(*) FROM org.springframework.data.jpa.model.Person p WHERE p.firstname = ?1")
+	@Query("SELECT COUNT(*) FROM org.springframework.data.jpa.benchmark.model.Person p WHERE p.firstname = ?1")
 	Long countWithAnnotatedQueryByFirstname(String firstname);
 }