DATAES-521 - Remove id-type specific repository implementations.

Author: xhaggi

src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchCrudRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2018 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,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository;
 
-import java.io.Serializable;
-
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
@@ -26,8 +24,9 @@
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Oliver Gierke
+ * @author Sascha Woo
  */
 @NoRepositoryBean
-public interface ElasticsearchCrudRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
+public interface ElasticsearchCrudRepository<T, ID> extends PagingAndSortingRepository<T, ID> {
 
 }

src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2018 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,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository;
 
-import java.io.Serializable;
-
 import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -28,9 +26,10 @@
  * @param <ID>
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Sascha Woo
  */
 @NoRepositoryBean
-public interface ElasticsearchRepository<T, ID extends Serializable> extends ElasticsearchCrudRepository<T, ID> {
+public interface ElasticsearchRepository<T, ID> extends ElasticsearchCrudRepository<T, ID> {
 
 	<S extends T> S index(S entity);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -17,7 +17,6 @@
 
 import static org.elasticsearch.index.query.QueryBuilders.*;
 
-import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -56,8 +55,9 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  * @author Michael Wirth
+ * @author Sascha Woo
  */
-public abstract class AbstractElasticsearchRepository<T, ID extends Serializable>
+public abstract class AbstractElasticsearchRepository<T, ID>
 		implements ElasticsearchRepository<T, ID> {
 
 	static final Logger LOGGER = LoggerFactory.getLogger(AbstractElasticsearchRepository.class);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -19,7 +19,6 @@
 
 import java.lang.reflect.Method;
 import java.util.Optional;
-import java.util.UUID;
 
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
@@ -36,7 +35,6 @@
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.util.Assert;
 
 /**
@@ -48,6 +46,7 @@
  * @author Gad Akuka
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Sascha Woo
  */
 public class ElasticsearchRepositoryFactory extends RepositoryFactorySupport {
 
@@ -69,7 +68,6 @@ public <T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<
 	}
 
 	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	protected Object getTargetRepository(RepositoryInformation metadata) {
 		return getTargetRepositoryViaReflection(metadata, getEntityInformation(metadata.getDomainType()),
 				elasticsearchOperations);
@@ -80,16 +78,8 @@ protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 		if (isQueryDslRepository(metadata.getRepositoryInterface())) {
 			throw new IllegalArgumentException("QueryDsl Support has not been implemented yet.");
 		}
-		if (Integer.class.isAssignableFrom(metadata.getIdType()) || Long.class.isAssignableFrom(metadata.getIdType())
-				|| Double.class.isAssignableFrom(metadata.getIdType())) {
-			return NumberKeyedRepository.class;
-		} else if (metadata.getIdType() == String.class) {
-			return SimpleElasticsearchRepository.class;
-		} else if (metadata.getIdType() == UUID.class) {
-			return UUIDElasticsearchRepository.class;
-		} else {
-			throw new IllegalArgumentException("Unsupported ID type " + metadata.getIdType());
-		}
+
+		return SimpleElasticsearchRepository.class;
 	}
 
 	private static boolean isQueryDslRepository(Class<?> repositoryInterface) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2018 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,6 +15,8 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
+import java.util.Objects;
+
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 
 /**
@@ -24,15 +26,16 @@
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Ryan Henszey
+ * @author Sascha Woo
  */
-public class SimpleElasticsearchRepository<T> extends AbstractElasticsearchRepository<T, String> {
+public class SimpleElasticsearchRepository<T, ID> extends AbstractElasticsearchRepository<T, ID> {
 
 	public SimpleElasticsearchRepository() {
 		super();
 	}
 
-	public SimpleElasticsearchRepository(ElasticsearchEntityInformation<T, String> metadata,
-										 ElasticsearchOperations elasticsearchOperations) {
+	public SimpleElasticsearchRepository(ElasticsearchEntityInformation<T, ID> metadata,
+			ElasticsearchOperations elasticsearchOperations) {
 		super(metadata, elasticsearchOperations);
 	}
 
@@ -41,7 +44,7 @@ public SimpleElasticsearchRepository(ElasticsearchOperations elasticsearchOperat
 	}
 
 	@Override
-	protected String stringIdRepresentation(String id) {
-		return id;
+	protected String stringIdRepresentation(ID id) {
+		return Objects.toString(id, null);
 	}
 }