diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java index dd98f192e..e43754cb0 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java @@ -161,7 +161,7 @@ public class JpaSort extends Sort { 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 class JpaSort extends Sort { 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 class JpaSort extends Sort { 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 @@ public class JpaSort extends Sort { * @return */ public , U> Path dot(A attribute) { - return new Path(add(attribute)); + return new Path<>(add(attribute)); } /** diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java index def06c3e7..46d72642e 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java +++ b/spring-data-jpa/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); @@ -150,7 +150,7 @@ class JpaPersistentPropertyImpl extends AnnotationBasedPersistentProperty createAssociation() { - return new Association(this, null); + return new Association<>(this, null); } @Override diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java index cff97cfa9..b8e7a561b 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java @@ -144,7 +144,7 @@ public class Jpa21Utils { */ 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/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java index 64914eafc..1672f0ee4 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java @@ -47,7 +47,7 @@ public class DefaultJpaContext implements JpaContext { 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/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java index afec2277e..29a694881 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java +++ b/spring-data-jpa/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/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java index 479337f34..772b8ec5c 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java @@ -80,12 +80,12 @@ public class Querydsl { switch (provider) { case ECLIPSELINK: - return new JPAQuery(em, EclipseLinkTemplates.DEFAULT); + return new JPAQuery<>(em, EclipseLinkTemplates.DEFAULT); case HIBERNATE: - return new JPAQuery(em, HQLTemplates.DEFAULT); + return new JPAQuery<>(em, HQLTemplates.DEFAULT); case GENERIC_JPA: default: - return new JPAQuery(em); + return new JPAQuery<>(em); } } diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java index 51b6fafd4..9f093211d 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java @@ -92,7 +92,7 @@ public class QuerydslJpaRepository extends SimpleJpa 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/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java index aef4bc5ac..dfa6ca525 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java @@ -53,7 +53,7 @@ public final class BeanDefinitionUtils { static { - List> types = new ArrayList>(); + List> types = new ArrayList<>(); types.add(EntityManagerFactory.class); types.add(AbstractEntityManagerFactoryBean.class); @@ -96,7 +96,7 @@ public final class BeanDefinitionUtils { public static Collection getEntityManagerFactoryBeanDefinitions( ConfigurableListableBeanFactory beanFactory) { - Set definitions = new HashSet(); + Set definitions = new HashSet<>(); for (Class type : EMF_TYPES) { diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Child.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Child.java index 94ce575d8..8e3b002dd 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Child.java +++ b/spring-data-jpa/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/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java index 00be47652..baa2e9784 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java +++ b/spring-data-jpa/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/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java index 13202e433..350724bf8 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java @@ -135,9 +135,9 @@ public class User { 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/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java index 0d3999d48..0a5018adc 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java @@ -75,7 +75,7 @@ class JavaConfigUserRepositoryTests extends UserRepositoryTests { QueryMethodEvaluationContextProvider evaluationContextProvider = new ExtensionAwareQueryMethodEvaluationContextProvider( applicationContext); - JpaRepositoryFactoryBean factory = new JpaRepositoryFactoryBean( + JpaRepositoryFactoryBean factory = new JpaRepositoryFactoryBean<>( UserRepository.class); factory.setEntityManager(entityManager); factory.setBeanFactory(applicationContext); diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java index 52dc7c730..f25713650 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java @@ -298,7 +298,7 @@ public class UserRepositoryTests { @Test void deleteEmptyCollectionDoesNotDeleteAnything() { - assertDeleteCallDoesNotDeleteAnything(new ArrayList()); + assertDeleteCallDoesNotDeleteAnything(new ArrayList<>()); } @Test diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java index 0ac035f66..0d9671113 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java @@ -48,7 +48,7 @@ public class CustomGenericJpaRepositoryFactory extends JpaRepositoryFactory { JpaEntityInformation entityMetadata = mock(JpaEntityInformation.class); when(entityMetadata.getJavaType()).thenReturn((Class) information.getDomainType()); - return new CustomGenericJpaRepository(entityMetadata, em); + return new CustomGenericJpaRepository<>(entityMetadata, em); } @Override diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java index d93dea147..ebe084f09 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java @@ -91,7 +91,7 @@ public class DefaultJpaContextIntegrationTests { 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 diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java index ead477af5..28b8b9b78 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java @@ -44,28 +44,28 @@ public class DefaultJpaEntityMetadataUnitTest { @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 @@ public class DefaultJpaEntityMetadataUnitTest { 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/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java index e3820d10b..9b509bf5a 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java @@ -35,7 +35,6 @@ import org.mockito.Mock; 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; @@ -62,8 +61,7 @@ class JpaMetamodelEntityInformationUnitTests { 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 +75,7 @@ class JpaMetamodelEntityInformationUnitTests { @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/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java index cfcde4816..13d7e78ab 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java @@ -29,7 +29,6 @@ import org.mockito.Mock; 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; @@ -61,8 +60,7 @@ class JpaPersistableEntityInformationUnitTests { @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/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java index 97fcd9cd4..9d21f3e38 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java +++ b/spring-data-jpa/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; @@ -80,10 +76,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/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java index ab9b5b67b..cc69535d3 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java @@ -84,7 +84,7 @@ class SimpleJpaRepositoryUnitTests { when(metadata.getQueryHints()).thenReturn(hints); when(metadata.getQueryHintsForCount()).thenReturn(hints); - repo = new SimpleJpaRepository(information, em); + repo = new SimpleJpaRepository<>(information, em); repo.setRepositoryMethodMetadata(metadata); }