DATAES-352 - Adapt to API changes in repository interfaces.

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(…)

Please see DATACMNS-944 for details.

Author: christophstrobl

src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java

@@ -30,9 +30,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.data.elasticsearch.core.query.DeleteQuery;
+import org.springframework.data.elasticsearch.core.query.GetQuery;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.util.Assert;
 
@@ -45,6 +54,7 @@
  * @author Ryan Henszey
  * @author Kevin Leturc
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public abstract class AbstractElasticsearchRepository<T, ID extends Serializable>
 		implements ElasticsearchRepository<T, ID> {
@@ -57,18 +67,18 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	public AbstractElasticsearchRepository() {}
 
 	public AbstractElasticsearchRepository(ElasticsearchOperations elasticsearchOperations) {
-		
+
 		Assert.notNull(elasticsearchOperations, "ElasticsearchOperations must not be null!");
-		
+
 		this.setElasticsearchOperations(elasticsearchOperations);
 	}
 
 	public AbstractElasticsearchRepository(ElasticsearchEntityInformation<T, ID> metadata,
 			ElasticsearchOperations elasticsearchOperations) {
 		this(elasticsearchOperations);
-		
+
 		Assert.notNull(metadata, "ElasticsearchEntityInformation must not be null!");
-		
+
 		this.entityInformation = metadata;
 		setEntityClass(this.entityInformation.getJavaType());
 		try {
@@ -94,7 +104,7 @@ private boolean createIndexAndMapping() {
 	}
 
 	@Override
-	public Optional<T> findOne(ID id) {
+	public Optional<T> findById(ID id) {
 		GetQuery query = new GetQuery();
 		query.setId(stringIdRepresentation(id));
 		return Optional.ofNullable(elasticsearchOperations.queryForObject(query, getEntityClass()));
@@ -104,7 +114,7 @@ public Optional<T> findOne(ID id) {
 	public Iterable<T> findAll() {
 		int itemCount = (int) this.count();
 		if (itemCount == 0) {
-			return new PageImpl<>(Collections.<T>emptyList());
+			return new PageImpl<>(Collections.<T> emptyList());
 		}
 		return this.findAll(PageRequest.of(0, Math.max(1, itemCount)));
 	}
@@ -119,15 +129,15 @@ public Page<T> findAll(Pageable pageable) {
 	public Iterable<T> findAll(Sort sort) {
 		int itemCount = (int) this.count();
 		if (itemCount == 0) {
-			return new PageImpl<>(Collections.<T>emptyList());
+			return new PageImpl<>(Collections.<T> emptyList());
 		}
 		SearchQuery query = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
 				.withPageable(PageRequest.of(0, itemCount, sort)).build();
 		return elasticsearchOperations.queryForPage(query, getEntityClass());
 	}
 
 	@Override
-	public Iterable<T> findAll(Iterable<ID> ids) {
+	public Iterable<T> findAllById(Iterable<ID> ids) {
 		Assert.notNull(ids, "ids can't be null.");
 		SearchQuery query = new NativeSearchQueryBuilder().withIds(stringIdsRepresentation(ids)).build();
 		return elasticsearchOperations.multiGet(query, getEntityClass());
@@ -165,7 +175,7 @@ public <S extends T> S index(S entity) {
 	}
 
 	@Override
-	public <S extends T> Iterable<S> save(Iterable<S> entities) {
+	public <S extends T> Iterable<S> saveAll(Iterable<S> entities) {
 		Assert.notNull(entities, "Cannot insert 'null' as a List.");
 		List<IndexQuery> queries = new ArrayList<>();
 		for (S s : entities) {
@@ -177,16 +187,16 @@ public <S extends T> Iterable<S> save(Iterable<S> entities) {
 	}
 
 	@Override
-	public boolean exists(ID id) {
-		return findOne(id) != null;
+	public boolean existsById(ID id) {
+		return findById(id) != null;
 	}
 
 	@Override
 	public Iterable<T> search(QueryBuilder query) {
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(query).build();
 		int count = (int) elasticsearchOperations.count(searchQuery, getEntityClass());
 		if (count == 0) {
-			return new PageImpl<>(Collections.<T>emptyList());
+			return new PageImpl<>(Collections.<T> emptyList());
 		}
 		searchQuery.setPageable(PageRequest.of(0, count));
 		return elasticsearchOperations.queryForPage(searchQuery, getEntityClass());
@@ -217,7 +227,7 @@ public Page<T> searchSimilar(T entity, String[] fields, Pageable pageable) {
 	}
 
 	@Override
-	public void delete(ID id) {
+	public void deleteById(ID id) {
 		Assert.notNull(id, "Cannot delete entity with id 'null'.");
 		elasticsearchOperations.delete(entityInformation.getIndexName(), entityInformation.getType(),
 				stringIdRepresentation(id));
@@ -227,12 +237,12 @@ public void delete(ID id) {
 	@Override
 	public void delete(T entity) {
 		Assert.notNull(entity, "Cannot delete 'null' entity.");
-		delete(extractIdFromBean(entity));
+		deleteById(extractIdFromBean(entity));
 		elasticsearchOperations.refresh(entityInformation.getIndexName());
 	}
 
 	@Override
-	public void delete(Iterable<? extends T> entities) {
+	public void deleteAll(Iterable<? extends T> entities) {
 		Assert.notNull(entities, "Cannot delete 'null' list.");
 		for (T entity : entities) {
 			delete(entity);

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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,17 +15,16 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
-
 import org.springframework.data.repository.core.EntityInformation;
 
 /**
  * @param <T>
  * @param <ID>
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Christoph Strobl
  */
-public interface ElasticsearchEntityInformation<T, ID extends Serializable> extends EntityInformation<T, ID> {
+public interface ElasticsearchEntityInformation<T, ID> extends EntityInformation<T, ID> {
 
 	String getIdAttribute();
 

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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,15 +15,14 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
-
 /**
  * ElasticsearchEntityInformationCreator
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Christoph Strobl
  */
 public interface ElasticsearchEntityInformationCreator {
 
-	<T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
+	<T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
 }

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImpl.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
-
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
@@ -29,22 +27,23 @@
  * @author Mohsin Husen
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public class ElasticsearchEntityInformationCreatorImpl implements ElasticsearchEntityInformationCreator {
 
 	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
 
 	public ElasticsearchEntityInformationCreatorImpl(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		
+
 		Assert.notNull(mappingContext, "MappingContext must not be null!");
-		
+
 		this.mappingContext = mappingContext;
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public <T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
+	public <T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 
 		ElasticsearchPersistentEntity<T> persistentEntity = (ElasticsearchPersistentEntity<T>) mappingContext
 				.getRequiredPersistentEntity(domainClass);

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactory.java

@@ -17,7 +17,6 @@
 
 import static org.springframework.data.querydsl.QuerydslUtils.*;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.UUID;
@@ -47,23 +46,24 @@
  * @author Ryan Henszey
  * @author Gad Akuka
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public class ElasticsearchRepositoryFactory extends RepositoryFactorySupport {
 
 	private final ElasticsearchOperations elasticsearchOperations;
 	private final ElasticsearchEntityInformationCreator entityInformationCreator;
 
 	public ElasticsearchRepositoryFactory(ElasticsearchOperations elasticsearchOperations) {
-		
+
 		Assert.notNull(elasticsearchOperations, "ElasticsearchOperations must not be null!");
-		
+
 		this.elasticsearchOperations = elasticsearchOperations;
 		this.entityInformationCreator = new ElasticsearchEntityInformationCreatorImpl(
 				elasticsearchOperations.getElasticsearchConverter().getMappingContext());
 	}
 
 	@Override
-	public <T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
+	public <T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 		return entityInformationCreator.getEntityInformation(domainClass);
 	}
 

src/main/java/org/springframework/data/elasticsearch/repository/support/MappingElasticsearchEntityInformation.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
 import java.util.Optional;
 
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
@@ -34,9 +33,10 @@
  * @author Ryan Henszey
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
-public class MappingElasticsearchEntityInformation<T, ID extends Serializable>
-		extends PersistentEntityInformation<T, ID> implements ElasticsearchEntityInformation<T, ID> {
+public class MappingElasticsearchEntityInformation<T, ID> extends PersistentEntityInformation<T, ID>
+		implements ElasticsearchEntityInformation<T, ID> {
 
 	private final ElasticsearchPersistentEntity<T> entityMetadata;
 	private final String indexName;

src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-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.
@@ -33,17 +33,16 @@
 
 /**
  * @author Mohsin Husen
+ * @author Christoph Strobl
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:/repository-test-nested-object.xml")
 public class InnerObjectTests {
 
-	@Autowired
-	private SampleElasticSearchBookRepository bookRepository;
+	@Autowired private SampleElasticSearchBookRepository bookRepository;
 
-	@Autowired
-	private ElasticsearchTemplate elasticsearchTemplate;
+	@Autowired private ElasticsearchTemplate elasticsearchTemplate;
 
 	@Before
 	public void before() {
@@ -67,6 +66,6 @@ public void shouldIndexInnerObject() {
 		// when
 		bookRepository.save(book);
 		// then
-		assertThat(bookRepository.findOne(id), is(notNullValue()));
+		assertThat(bookRepository.findById(id), is(notNullValue()));
 	}
 }

src/test/java/org/springframework/data/elasticsearch/immutable/ImmutableElasticsearchRepositoryTests.java

@@ -32,6 +32,7 @@
  * @author Young Gu
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:immutable-repository-test.xml")
@@ -59,7 +60,7 @@ public void shouldSaveAndFindImmutableDocument() {
 		assertThat(entity.getId(), is(notNullValue()));
 
 		// then
-		Optional<ImmutableEntity> entityFromElasticSearch = repository.findOne(entity.getId());
+		Optional<ImmutableEntity> entityFromElasticSearch = repository.findById(entity.getId());
 
 		assertThat(entityFromElasticSearch.isPresent(), is(true));