From d9a08871dbca22ade575929d7254ff7047b22a0e Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 3 May 2017 18:19:07 +0200 Subject: [PATCH] DATAJPA-1104 - Further removals of Serializable requirements for identifiers. --- .../data/jpa/repository/JpaRepository.java | 11 +++++------ .../jpa/repository/support/JpaEntityInformation.java | 4 +--- .../support/JpaMetamodelEntityInformation.java | 5 ++--- .../repository/support/JpaRepositoryFactoryBean.java | 4 +--- .../jpa/repository/support/SimpleJpaRepository.java | 4 +--- .../support/JpaEntityInformationSupportUnitTests.java | 2 +- 6 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java index 975bc006f..b5bcba873 100644 --- a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java @@ -15,7 +15,6 @@ */ package org.springframework.data.jpa.repository; -import java.io.Serializable; import java.util.List; import javax.persistence.EntityManager; @@ -34,8 +33,7 @@ import org.springframework.data.repository.query.QueryByExampleExecutor; * @author Mark Paluch */ @NoRepositoryBean -public interface JpaRepository - extends PagingAndSortingRepository, QueryByExampleExecutor { +public interface JpaRepository extends PagingAndSortingRepository, QueryByExampleExecutor { /* * (non-Javadoc) @@ -96,16 +94,17 @@ public interface JpaRepository */ T getOne(ID id); - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example) */ @Override List findAll(Example example); - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort) */ @Override List findAll(Example example, Sort sort); - } diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java index d3697ed5a..c29fed745 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java @@ -15,8 +15,6 @@ */ package org.springframework.data.jpa.repository.support; -import java.io.Serializable; - import javax.persistence.metamodel.SingularAttribute; import org.springframework.data.jpa.repository.query.JpaEntityMetadata; @@ -59,5 +57,5 @@ public interface JpaEntityInformation extends EntityInformation, J * @param idAttribute * @return */ - Object getCompositeIdAttributeValue(Serializable id, String idAttribute); + Object getCompositeIdAttributeValue(Object id, String idAttribute); } diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java index 967d0e7e5..62f7a2cbe 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java @@ -15,7 +15,6 @@ */ package org.springframework.data.jpa.repository.support; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -208,9 +207,9 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu /* * (non-Javadoc) - * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getCompositeIdAttributeValue(java.io.Serializable, java.lang.String) + * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getCompositeIdAttributeValue(java.lang.Object, java.lang.String) */ - public Object getCompositeIdAttributeValue(Serializable id, String idAttribute) { + public Object getCompositeIdAttributeValue(Object id, String idAttribute) { Assert.isTrue(hasCompositeId(), "Model must have a composite Id!"); diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java index e4bb8f3cf..615c01693 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java @@ -15,8 +15,6 @@ */ package org.springframework.data.jpa.repository.support; -import java.io.Serializable; - import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; @@ -34,7 +32,7 @@ import org.springframework.util.Assert; * @author Eberhard Wolff * @param the type of the repository */ -public class JpaRepositoryFactoryBean, S, ID extends Serializable> +public class JpaRepositoryFactoryBean, S, ID> extends TransactionalRepositoryFactoryBeanSupport { private EntityManager entityManager; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java index 8aea969ed..8b73be075 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java @@ -17,7 +17,6 @@ package org.springframework.data.jpa.repository.support; import static org.springframework.data.jpa.repository.query.QueryUtils.*; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -73,8 +72,7 @@ import org.springframework.util.ObjectUtils; */ @Repository @Transactional(readOnly = true) -public class SimpleJpaRepository - implements JpaRepository, JpaSpecificationExecutor { +public class SimpleJpaRepository implements JpaRepository, JpaSpecificationExecutor { private static final String ID_MUST_NOT_BE_NULL = "The given id must not be null!"; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java index bde03015b..0e1ce2607 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java @@ -95,7 +95,7 @@ public class JpaEntityInformationSupportUnitTests { return false; } - public Object getCompositeIdAttributeValue(Serializable id, String idAttribute) { + public Object getCompositeIdAttributeValue(Object id, String idAttribute) { return null; } }