From dade22a57779fe5b0599e8fc0c0d1ab7e0b42f84 Mon Sep 17 00:00:00 2001 From: Diego Krupitza Date: Mon, 28 Feb 2022 12:37:35 +0100 Subject: [PATCH] Explicit type replaced with diamond operator. In modern java you do not need to add the explicit type if it can be inferred. To make the code more readable, we removed the explicit type and replaced it with the diamond operator (<>). --- .../data/jpa/domain/JpaSort.java | 8 +++--- .../mapping/JpaPersistentPropertyImpl.java | 8 +++--- .../data/jpa/repository/query/Jpa21Utils.java | 2 +- .../repository/support/DefaultJpaContext.java | 2 +- .../support/JpaEntityInformationSupport.java | 2 +- .../data/jpa/repository/support/Querydsl.java | 28 +++++++++---------- .../support/QuerydslJpaRepository.java | 2 +- .../data/jpa/util/BeanDefinitionUtils.java | 7 +++-- .../data/jpa/domain/sample/Child.java | 2 +- .../data/jpa/domain/sample/Parent.java | 2 +- .../data/jpa/domain/sample/User.java | 6 ++-- .../JavaConfigUserRepositoryTests.java | 11 +++++--- .../jpa/repository/UserRepositoryTests.java | 8 ++++-- .../CustomGenericJpaRepositoryFactory.java | 2 +- .../DefaultJpaContextIntegrationTests.java | 7 ++--- .../DefaultJpaEntityMetadataUnitTest.java | 17 ++++++----- ...paMetamodelEntityInformationUnitTests.java | 19 +++++++------ ...PersistableEntityInformationUnitTests.java | 14 ++++++---- .../support/QuerydslJpaRepositoryTests.java | 11 +++----- .../support/SimpleJpaRepositoryUnitTests.java | 2 +- 20 files changed, 84 insertions(+), 76 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/domain/JpaSort.java b/src/main/java/org/springframework/data/jpa/domain/JpaSort.java index 89b73ed0c6..82699ada7f 100644 --- a/src/main/java/org/springframework/data/jpa/domain/JpaSort.java +++ b/src/main/java/org/springframework/data/jpa/domain/JpaSort.java @@ -161,7 +161,7 @@ public JpaSort and(@Nullable Direction direction, Path... paths) { Assert.notNull(paths, "Paths must not be null!"); - List existing = new ArrayList(); + List existing = new ArrayList<>(); for (Order order : this) { existing.add(order); @@ -181,7 +181,7 @@ public JpaSort andUnsafe(@Nullable Direction direction, String... properties) { Assert.notEmpty(properties, "Properties must not be empty!"); - List orders = new ArrayList(); + List orders = new ArrayList<>(); for (Order order : this) { orders.add(order); @@ -216,7 +216,7 @@ public JpaSort andUnsafe(@Nullable Direction direction, String... properties) { private static List combine(List orders, @Nullable Direction direction, List> paths) { - List result = new ArrayList(orders); + List result = new ArrayList<>(orders); for (Path path : paths) { result.add(new Order(direction, path.toString())); @@ -315,7 +315,7 @@ private Path(List> attributes) { * @return */ public , U> Path dot(A attribute) { - return new Path(add(attribute)); + return new Path<>(add(attribute)); } /** diff --git a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java index 8cd0457a7b..fd43b208d6 100644 --- a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java +++ b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java @@ -57,7 +57,7 @@ class JpaPersistentPropertyImpl extends AnnotationBasedPersistentProperty> annotations = new HashSet>(); + Set> annotations = new HashSet<>(); annotations.add(OneToMany.class); annotations.add(OneToOne.class); annotations.add(ManyToMany.class); @@ -65,13 +65,13 @@ class JpaPersistentPropertyImpl extends AnnotationBasedPersistentProperty>(); + annotations = new HashSet<>(); annotations.add(Id.class); annotations.add(EmbeddedId.class); ID_ANNOTATIONS = Collections.unmodifiableSet(annotations); - annotations = new HashSet>(); + annotations = new HashSet<>(); annotations.add(Column.class); annotations.add(OrderColumn.class); @@ -187,7 +187,7 @@ public boolean isTransient() { */ @Override protected Association createAssociation() { - return new Association(this, null); + return new Association<>(this, null); } /* diff --git a/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java b/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java index 87da0b2772..36b952a470 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java @@ -144,7 +144,7 @@ private static EntityGraph createDynamicEntityGraph(EntityManager em, JpaEnti */ static void configureFetchGraphFrom(JpaEntityGraph jpaEntityGraph, EntityGraph entityGraph) { - List attributePaths = new ArrayList(jpaEntityGraph.getAttributePaths()); + List attributePaths = new ArrayList<>(jpaEntityGraph.getAttributePaths()); // Sort to ensure that the intermediate entity subgraphs are created accordingly. Collections.sort(attributePaths); diff --git a/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java b/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java index cebc0f4129..7887834191 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java @@ -47,7 +47,7 @@ public DefaultJpaContext(Set entityManagers) { Assert.notNull(entityManagers, "EntityManagers must not be null!"); Assert.notEmpty(entityManagers, "EntityManagers must not be empty!"); - this.entityManagers = new LinkedMultiValueMap, EntityManager>(); + this.entityManagers = new LinkedMultiValueMap<>(); for (EntityManager em : entityManagers) { for (ManagedType managedType : em.getMetamodel().getManagedTypes()) { diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java index 026b6d5094..ffc1a33432 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java @@ -42,7 +42,7 @@ public abstract class JpaEntityInformationSupport extends AbstractEntityI */ public JpaEntityInformationSupport(Class domainClass) { super(domainClass); - this.metadata = new DefaultJpaEntityMetadata(domainClass); + this.metadata = new DefaultJpaEntityMetadata<>(domainClass); } /** diff --git a/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java b/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java index 797b9c6167..db6ad1bf1c 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java @@ -79,13 +79,13 @@ public Querydsl(EntityManager em, PathBuilder builder) { public AbstractJPAQuery> createQuery() { switch (provider) { - case ECLIPSELINK: - return new JPAQuery(em, EclipseLinkTemplates.DEFAULT); - case HIBERNATE: - return new JPAQuery(em, HQLTemplates.DEFAULT); - case GENERIC_JPA: - default: - return new JPAQuery(em); + case ECLIPSELINK: + return new JPAQuery<>(em, EclipseLinkTemplates.DEFAULT); + case HIBERNATE: + return new JPAQuery<>(em, HQLTemplates.DEFAULT); + case GENERIC_JPA: + default: + return new JPAQuery<>(em); } } @@ -209,15 +209,15 @@ private NullHandling toQueryDslNullHandling(org.springframework.data.domain.Sort switch (nullHandling) { - case NULLS_FIRST: - return NullHandling.NullsFirst; + case NULLS_FIRST: + return NullHandling.NullsFirst; - case NULLS_LAST: - return NullHandling.NullsLast; + case NULLS_LAST: + return NullHandling.NullsLast; - case NATIVE: - default: - return NullHandling.Default; + case NATIVE: + default: + return NullHandling.Default; } } diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java index 5d0d359a78..946f9ed4b7 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java @@ -92,7 +92,7 @@ public QuerydslJpaRepository(JpaEntityInformation entityInformation, Enti super(entityInformation, entityManager); this.path = resolver.createPath(entityInformation.getJavaType()); - this.builder = new PathBuilder(path.getType(), path.getMetadata()); + this.builder = new PathBuilder<>(path.getType(), path.getMetadata()); this.querydsl = new Querydsl(entityManager, builder); this.entityManager = entityManager; } diff --git a/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java b/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java index 66d347da07..bb94591c0c 100644 --- a/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java +++ b/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java @@ -49,11 +49,12 @@ public final class BeanDefinitionUtils { private static final String JNDI_OBJECT_FACTORY_BEAN = "org.springframework.jndi.JndiObjectFactoryBean"; private static final List> EMF_TYPES; - private BeanDefinitionUtils() {} + private BeanDefinitionUtils() { + } static { - List> types = new ArrayList>(); + List> types = new ArrayList<>(); types.add(EntityManagerFactory.class); types.add(AbstractEntityManagerFactoryBean.class); @@ -96,7 +97,7 @@ public static Iterable getEntityManagerFactoryBeanNames(ListableBeanFact public static Collection getEntityManagerFactoryBeanDefinitions( ConfigurableListableBeanFactory beanFactory) { - Set definitions = new HashSet(); + Set definitions = new HashSet<>(); for (Class type : EMF_TYPES) { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Child.java b/src/test/java/org/springframework/data/jpa/domain/sample/Child.java index 73d6656635..d087283783 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Child.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Child.java @@ -31,7 +31,7 @@ public class Child { Long id; @ManyToMany(mappedBy = "children") - Set parents = new HashSet(); + Set parents = new HashSet<>(); /** * @param parent diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java b/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java index 0532abf617..331798ea31 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java @@ -34,7 +34,7 @@ public class Parent { static final long serialVersionUID = -89717120680485957L; @ManyToMany(cascade = CascadeType.ALL) - Set children = new HashSet(); + Set children = new HashSet<>(); public Parent add(Child child) { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/User.java b/src/test/java/org/springframework/data/jpa/domain/sample/User.java index 0a635af6c7..f02a1510d3 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/User.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/User.java @@ -135,9 +135,9 @@ public User(String firstname, String lastname, String emailAddress, Role... role this.lastname = lastname; this.emailAddress = emailAddress; this.active = true; - this.roles = new HashSet(Arrays.asList(roles)); - this.colleagues = new HashSet(); - this.attributes = new HashSet(); + this.roles = new HashSet<>(Arrays.asList(roles)); + this.colleagues = new HashSet<>(); + this.attributes = new HashSet<>(); this.createdAt = new Date(); } diff --git a/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java index a1045daa81..6fb8fbd6f2 100644 --- a/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java @@ -61,8 +61,10 @@ class JavaConfigUserRepositoryTests extends UserRepositoryTests { @ImportResource("classpath:infrastructure.xml") static class Config { - @PersistenceContext EntityManager entityManager; - @Autowired ApplicationContext applicationContext; + @PersistenceContext + EntityManager entityManager; + @Autowired + ApplicationContext applicationContext; @Bean public EvaluationContextExtension sampleEvaluationContextExtension() { @@ -75,7 +77,7 @@ public UserRepository userRepository() throws Exception { QueryMethodEvaluationContextProvider evaluationContextProvider = new ExtensionAwareQueryMethodEvaluationContextProvider( applicationContext); - JpaRepositoryFactoryBean factory = new JpaRepositoryFactoryBean( + JpaRepositoryFactoryBean factory = new JpaRepositoryFactoryBean<>( UserRepository.class); factory.setEntityManager(entityManager); factory.setBeanFactory(applicationContext); @@ -111,5 +113,6 @@ void doesNotPickUpJpaRepository() { @Configuration @EnableJpaRepositories(basePackageClasses = UserRepository.class) @ImportResource("classpath:infrastructure.xml") - static class JpaRepositoryConfig {} + static class JpaRepositoryConfig { + } } diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java index 0a4b33ef94..0544b1fe67 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java @@ -101,10 +101,12 @@ @Transactional public class UserRepositoryTests { - @PersistenceContext EntityManager em; + @PersistenceContext + EntityManager em; // CUT - @Autowired UserRepository repository; + @Autowired + UserRepository repository; // Test fixture private User firstUser; @@ -298,7 +300,7 @@ void deleteCollectionOfEntitiesById() { @Test void deleteEmptyCollectionDoesNotDeleteAnything() { - assertDeleteCallDoesNotDeleteAnything(new ArrayList()); + assertDeleteCallDoesNotDeleteAnything(new ArrayList<>()); } @Test diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java index 13d32fe901..32974ab26d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java +++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java @@ -52,7 +52,7 @@ public CustomGenericJpaRepositoryFactory(EntityManager entityManager) { JpaEntityInformation entityMetadata = mock(JpaEntityInformation.class); when(entityMetadata.getJavaType()).thenReturn((Class) information.getDomainType()); - return new CustomGenericJpaRepository(entityMetadata, em); + return new CustomGenericJpaRepository<>(entityMetadata, em); } /* diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java index f000d251c7..1a9ec43830 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.HashSet; -import javax.naming.NamingException; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; @@ -29,7 +28,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -99,7 +97,7 @@ void createEntityManagers() { this.firstEm = firstEmf.createEntityManager(); this.secondEm = secondEmf.createEntityManager(); - this.jpaContext = new DefaultJpaContext(new HashSet(Arrays.asList(firstEm, secondEm))); + this.jpaContext = new DefaultJpaContext(new HashSet<>(Arrays.asList(firstEm, secondEm))); } @Test // DATAJPA-669 @@ -148,8 +146,7 @@ void bootstrapsDefaultJpaContextInSpringContainerWithEntityManagerFromJndi() thr } @EnableJpaRepositories - @ComponentScan(includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = ApplicationComponent.class), - useDefaultFilters = false) + @ComponentScan(includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = ApplicationComponent.class), useDefaultFilters = false) static class Config { @Bean diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java index 7a6b2f0627..5ccd7599e5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java @@ -44,28 +44,28 @@ void rejectsNullDomainType() { @Test void returnsConfiguredType() { - DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata(Foo.class); + DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata<>(Foo.class); assertThat(metadata.getJavaType()).isEqualTo(Foo.class); } @Test void returnsSimpleClassNameAsEntityNameByDefault() { - DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata(Foo.class); + DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata<>(Foo.class); assertThat(metadata.getEntityName()).isEqualTo(Foo.class.getSimpleName()); } @Test void returnsCustomizedEntityNameIfConfigured() { - DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata(Bar.class); + DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata<>(Bar.class); assertThat(metadata.getEntityName()).isEqualTo("Entity"); } @Test // DATAJPA-871 void returnsCustomizedEntityNameIfConfiguredViaComposedAnnotation() { - DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata( + DefaultJpaEntityMetadata metadata = new DefaultJpaEntityMetadata<>( BarWithComposedAnnotation.class); assertThat(metadata.getEntityName()).isEqualTo("Entity"); } @@ -78,11 +78,14 @@ void returnsCustomizedEntityNameIfConfiguredViaComposedAnnotation() { String entityName(); } - private static class Foo {} + private static class Foo { + } @Entity(name = "Entity") - static class Bar {} + static class Bar { + } @CustomEntityAnnotationUsingAliasFor(entityName = "Entity") - private static class BarWithComposedAnnotation {} + private static class BarWithComposedAnnotation { + } } diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java index ba5cd39a5b..e0977eacaa 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java @@ -35,7 +35,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; - import org.springframework.data.jpa.domain.sample.PersistableWithIdClass; import org.springframework.data.jpa.domain.sample.PersistableWithIdClassPK; @@ -49,12 +48,17 @@ @MockitoSettings(strictness = Strictness.LENIENT) class JpaMetamodelEntityInformationUnitTests { - @Mock Metamodel metamodel; + @Mock + Metamodel metamodel; - @Mock IdentifiableType type; - @Mock SingularAttribute first, second; + @Mock + IdentifiableType type; + @Mock + SingularAttribute first, second; - @Mock @SuppressWarnings("rawtypes") Type idType; + @Mock + @SuppressWarnings("rawtypes") + Type idType; @BeforeEach @SuppressWarnings("unchecked") @@ -62,8 +66,7 @@ void setUp() { when(first.getName()).thenReturn("first"); when(second.getName()).thenReturn("second"); - Set> attributes = new HashSet>( - asList(first, second)); + Set> attributes = new HashSet<>(asList(first, second)); when(type.getIdClassAttributes()).thenReturn(attributes); @@ -77,7 +80,7 @@ void setUp() { @Test // DATAJPA-50 void doesNotCreateIdIfAllPartialAttributesAreNull() { - JpaMetamodelEntityInformation information = new JpaMetamodelEntityInformation( + JpaMetamodelEntityInformation information = new JpaMetamodelEntityInformation<>( PersistableWithIdClass.class, metamodel); PersistableWithIdClass entity = new PersistableWithIdClass(null, null); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java index 8722d74329..35e97e5d03 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java @@ -29,7 +29,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; - import org.springframework.data.domain.Persistable; import org.springframework.data.repository.core.EntityInformation; @@ -43,11 +42,15 @@ @MockitoSettings(strictness = Strictness.LENIENT) class JpaPersistableEntityInformationUnitTests { - @Mock Metamodel metamodel; + @Mock + Metamodel metamodel; - @Mock EntityType type; + @Mock + EntityType type; - @Mock @SuppressWarnings("rawtypes") Type idType; + @Mock + @SuppressWarnings("rawtypes") + Type idType; @BeforeEach @SuppressWarnings("unchecked") @@ -61,8 +64,7 @@ void setUp() { @Test void usesPersistableMethodsForIsNewAndGetId() { - EntityInformation entityInformation = new JpaPersistableEntityInformation(Foo.class, - metamodel); + EntityInformation entityInformation = new JpaPersistableEntityInformation<>(Foo.class, metamodel); Foo foo = new Foo(); assertThat(entityInformation.isNew(foo)).isFalse(); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java index 83285252dc..9c5ba4e14e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java @@ -16,10 +16,6 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.domain.Example.*; -import static org.springframework.data.domain.ExampleMatcher.*; - -import lombok.Data; import java.sql.Date; import java.time.LocalDate; @@ -68,7 +64,8 @@ @Transactional class QuerydslJpaRepositoryTests { - @PersistenceContext EntityManager em; + @PersistenceContext + EntityManager em; private QuerydslJpaRepository repository; private QUser user = new QUser("user"); @@ -80,10 +77,10 @@ class QuerydslJpaRepositoryTests { @BeforeEach void setUp() { - JpaEntityInformation information = new JpaMetamodelEntityInformation(User.class, + JpaEntityInformation information = new JpaMetamodelEntityInformation<>(User.class, em.getMetamodel()); - repository = new QuerydslJpaRepository(information, em); + repository = new QuerydslJpaRepository<>(information, em); dave = repository.save(new User("Dave", "Matthews", "dave@matthews.com")); carter = repository.save(new User("Carter", "Beauford", "carter@beauford.com")); oliver = repository.save(new User("Oliver", "matthews", "oliver@matthews.com")); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java index 42a7cdabe9..404e1698a5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java @@ -84,7 +84,7 @@ void setUp() { when(metadata.getQueryHints()).thenReturn(hints); when(metadata.getQueryHintsForCount()).thenReturn(hints); - repo = new SimpleJpaRepository(information, em); + repo = new SimpleJpaRepository<>(information, em); repo.setRepositoryMethodMetadata(metadata); }