DATACMNS-944 - Moved to more consistent naming scheme for CrudRepository methods.

We now follow a more consistent naming scheme for the methods in repository that are driven by the following guidelines:

* Methods referring to an identifier now all end on …ById(…).
* Methods taking or returning a collection are named …All(…)

That results in the following renames:

* findOne(…) -> findById(…)
* save(Iterable) -> saveAll(Iterable)
* findAll(Iterable<ID>) -> findAllById(…)
* delete(ID) -> deleteById(ID)
* delete(Iterable<T>) -> deleteAll(Iterable<T>)
* exists() -> existsById(…)

As a side-effect of that, we can now drop the Serializable requirement for identifiers.

Updated CRUD method detection to use the new naming scheme and moved the code to Java 8 streams and Optional. Adapted RepositoryInvoker API to reflect method name changes as well.

Author: odrotbohm

src/main/java/org/springframework/data/domain/Auditable.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.domain;
 
-import java.io.Serializable;
 import java.time.temporal.TemporalAccessor;
 import java.util.Optional;
 
@@ -27,7 +26,7 @@
  * @param <ID> the type of the audited type's identifier
  * @author Oliver Gierke
  */
-public interface Auditable<U, ID extends Serializable, T extends TemporalAccessor> extends Persistable<ID> {
+public interface Auditable<U, ID, T extends TemporalAccessor> extends Persistable<ID> {
 
 	/**
 	 * Returns the user who created this entity.

src/main/java/org/springframework/data/domain/Persistable.java

@@ -15,15 +15,13 @@
  */
 package org.springframework.data.domain;
 
-import java.io.Serializable;
-
 /**
  * Simple interface for entities.
  * 
  * @param <ID> the type of the identifier
  * @author Oliver Gierke
  */
-public interface Persistable<ID extends Serializable> extends Serializable {
+public interface Persistable<ID> {
 
 	/**
 	 * Returns the id of the entity.

src/main/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapter.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.querydsl;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Optional;
 
@@ -112,22 +111,22 @@ public boolean hasSaveMethod() {
 		return delegate.hasSaveMethod();
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.support.RepositoryInvoker#invokeDelete(java.io.Serializable)
+	 * @see org.springframework.data.repository.support.RepositoryInvoker#invokeDeleteById(java.lang.Object)
 	 */
 	@Override
-	public void invokeDelete(Serializable id) {
-		delegate.invokeDelete(id);
+	public void invokeDeleteById(Object id) {
+		delegate.invokeDeleteById(id);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.support.RepositoryInvoker#invokeFindOne(java.io.Serializable)
+	 * @see org.springframework.data.repository.support.RepositoryInvoker#invokeFindById(java.lang.Object)
 	 */
 	@Override
-	public <T> Optional<T> invokeFindOne(Serializable id) {
-		return delegate.invokeFindOne(id);
+	public <T> Optional<T> invokeFindById(Object id) {
+		return delegate.invokeFindById(id);
 	}
 
 	/*

src/main/java/org/springframework/data/repository/CrudRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2011 the original author or authors.
+ * Copyright 2008-2017 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.
@@ -15,7 +15,6 @@
  */
 package org.springframework.data.repository;
 
-import java.io.Serializable;
 import java.util.Optional;
 
 /**
@@ -25,43 +24,43 @@
  * @author Eberhard Wolff
  */
 @NoRepositoryBean
-public interface CrudRepository<T, ID extends Serializable> extends Repository<T, ID> {
+public interface CrudRepository<T, ID> extends Repository<T, ID> {
 
 	/**
 	 * Saves a given entity. Use the returned instance for further operations as the save operation might have changed the
 	 * entity instance completely.
 	 * 
-	 * @param entity
-	 * @return the saved entity
+	 * @param entity must not be {@literal null}.
+	 * @return the saved entity will never be {@literal null}.
 	 */
 	<S extends T> S save(S entity);
 
 	/**
 	 * Saves all given entities.
 	 * 
-	 * @param entities
-	 * @return the saved entities
+	 * @param entities must not be {@literal null}.
+	 * @return the saved entities will never be {@literal null}.
 	 * @throws IllegalArgumentException in case the given entity is {@literal null}.
 	 */
-	<S extends T> Iterable<S> save(Iterable<S> entities);
+	<S extends T> Iterable<S> saveAll(Iterable<S> entities);
 
 	/**
 	 * Retrieves an entity by its id.
 	 * 
 	 * @param id must not be {@literal null}.
-	 * @return the entity with the given id or {@literal null} if none found
-	 * @throws IllegalArgumentException if {@code id} is {@literal null}
+	 * @return the entity with the given id or {@literal Optional#empty()} if none found
+	 * @throws IllegalArgumentException if {@code id} is {@literal null}.
 	 */
-	Optional<T> findOne(ID id);
+	Optional<T> findById(ID id);
 
 	/**
 	 * Returns whether an entity with the given id exists.
 	 * 
 	 * @param id must not be {@literal null}.
-	 * @return true if an entity with the given id exists, {@literal false} otherwise
-	 * @throws IllegalArgumentException if {@code id} is {@literal null}
+	 * @return {@literal true} if an entity with the given id exists, {@literal false} otherwise.
+	 * @throws IllegalArgumentException if {@code id} is {@literal null}.
 	 */
-	boolean exists(ID id);
+	boolean existsById(ID id);
 
 	/**
 	 * Returns all instances of the type.
@@ -76,7 +75,7 @@ public interface CrudRepository<T, ID extends Serializable> extends Repository<T
 	 * @param ids
 	 * @return
 	 */
-	Iterable<T> findAll(Iterable<ID> ids);
+	Iterable<T> findAllById(Iterable<ID> ids);
 
 	/**
 	 * Returns the number of entities available.
@@ -91,7 +90,7 @@ public interface CrudRepository<T, ID extends Serializable> extends Repository<T
 	 * @param id must not be {@literal null}.
 	 * @throws IllegalArgumentException in case the given {@code id} is {@literal null}
 	 */
-	void delete(ID id);
+	void deleteById(ID id);
 
 	/**
 	 * Deletes a given entity.
@@ -107,7 +106,7 @@ public interface CrudRepository<T, ID extends Serializable> extends Repository<T
 	 * @param entities
 	 * @throws IllegalArgumentException in case the given {@link Iterable} is {@literal null}.
 	 */
-	void delete(Iterable<? extends T> entities);
+	void deleteAll(Iterable<? extends T> entities);
 
 	/**
 	 * Deletes all entities managed by the repository.

src/main/java/org/springframework/data/repository/PagingAndSortingRepository.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.repository;
 
-import java.io.Serializable;
-
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -31,7 +29,7 @@
  * @see Page
  */
 @NoRepositoryBean
-public interface PagingAndSortingRepository<T, ID extends Serializable> extends CrudRepository<T, ID> {
+public interface PagingAndSortingRepository<T, ID> extends CrudRepository<T, ID> {
 
 	/**
 	 * Returns all entities sorted by the given options.

src/main/java/org/springframework/data/repository/Repository.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.repository;
 
-import java.io.Serializable;
-
 import org.springframework.stereotype.Indexed;
 
 /**
@@ -33,6 +31,6 @@
  * @author Oliver Gierke
  */
 @Indexed
-public interface Repository<T, ID extends Serializable> {
+public interface Repository<T, ID> {
 
 }

src/main/java/org/springframework/data/repository/RepositoryDefinition.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.repository;
 
-import java.io.Serializable;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -53,5 +52,5 @@
 	 * @see Repository
 	 * @return
 	 */
-	Class<? extends Serializable> idClass();
+	Class<?> idClass();
 }

src/main/java/org/springframework/data/repository/core/CrudMethods.java

@@ -65,7 +65,7 @@ public interface CrudMethods {
 
 	/**
 	 * Returns the find one method of the repository. Usually signature compatible to
-	 * {@link CrudRepository#findOne(java.io.Serializable)}
+	 * {@link CrudRepository#findById(Object)}
 	 * 
 	 * @return the find one method of the repository or {@literal null} if not available.
 	 * @see #hasFindOneMethod()

src/main/java/org/springframework/data/repository/core/EntityInformation.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.repository.core;
 
-import java.io.Serializable;
 import java.util.Optional;
 
 import org.springframework.util.Assert;
@@ -25,7 +24,7 @@
  * 
  * @author Oliver Gierke
  */
-public interface EntityInformation<T, ID extends Serializable> extends EntityMetadata<T> {
+public interface EntityInformation<T, ID> extends EntityMetadata<T> {
 
 	/**
 	 * Returns whether the given entity is considered to be new.
@@ -49,6 +48,7 @@ public interface EntityInformation<T, ID extends Serializable> extends EntityMet
 	 * @param entity must not be {@literal null}.
 	 * @return the identifier of the given entity
 	 * @throws IllegalArgumentException in case no id could be obtained from the given entity
+	 * @since 2.0
 	 */
 	default ID getRequiredId(T entity) throws IllegalArgumentException {
 

src/main/java/org/springframework/data/repository/core/RepositoryMetadata.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.repository.core;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Set;
@@ -34,7 +33,7 @@ public interface RepositoryMetadata {
 	 * 
 	 * @return the id class of the entity managed by the repository for or {@code null} if none found.
 	 */
-	Class<? extends Serializable> getIdType();
+	Class<?> getIdType();
 
 	/**
 	 * Returns the domain class the repository is declared for.

src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java

@@ -15,11 +15,12 @@
  */
 package org.springframework.data.repository.core.support;
 
-import java.io.Serializable;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
 import java.util.Optional;
 
 import org.springframework.data.repository.core.EntityInformation;
-import org.springframework.util.Assert;
 
 /**
  * Base class for implementations of {@link EntityInformation}. Considers an entity to be new whenever
@@ -28,20 +29,10 @@
  * @author Oliver Gierke
  * @author Nick Williams
  */
-public abstract class AbstractEntityInformation<T, ID extends Serializable> implements EntityInformation<T, ID> {
-
-	private final Class<T> domainClass;
+@RequiredArgsConstructor
+public abstract class AbstractEntityInformation<T, ID> implements EntityInformation<T, ID> {
 
-	/**
-	 * Creates a new {@link AbstractEntityInformation} from the given domain class.
-	 * 
-	 * @param domainClass must not be {@literal null}.
-	 */
-	public AbstractEntityInformation(Class<T> domainClass) {
-
-		Assert.notNull(domainClass, "DomainClass must not be null!");
-		this.domainClass = domainClass;
-	}
+	private final @NonNull Class<T> domainClass;
 
 	/*
 	 * (non-Javadoc)

src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.repository.core.support;
 
-import java.io.Serializable;
-
 import org.springframework.data.repository.RepositoryDefinition;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.util.Assert;
@@ -33,7 +31,7 @@ public class AnnotationRepositoryMetadata extends AbstractRepositoryMetadata {
 	private static final String NO_ANNOTATION_FOUND = String.format("Interface must be annotated with @%s!",
 			RepositoryDefinition.class.getName());
 
-	private final Class<? extends Serializable> idType;
+	private final Class<?> idType;
 	private final Class<?> domainType;
 
 	/**
@@ -56,7 +54,7 @@ public AnnotationRepositoryMetadata(Class<?> repositoryInterface) {
 	 * @see org.springframework.data.repository.core.RepositoryMetadata#getIdType()
 	 */
 	@Override
-	public Class<? extends Serializable> getIdType() {
+	public Class<?> getIdType() {
 		return this.idType;
 	}
 
@@ -69,7 +67,7 @@ public Class<?> getDomainType() {
 		return this.domainType;
 	}
 
-	private Class<? extends Serializable> resolveIdType(Class<?> repositoryInterface) {
+	private Class<?> resolveIdType(Class<?> repositoryInterface) {
 
 		RepositoryDefinition annotation = repositoryInterface.getAnnotation(RepositoryDefinition.class);