Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-08 13:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-325 - Replace references to GenericCollectionTypeResolver with ResolvableType.

Browse Source 
Using ResolvableType instead of GenericCollectionTypeResolver that is removed with Spring 5.

Related ticket: SPR-15160.
This commit is contained in:
Mark Paluch 2017-01-26 14:01:51 +01:00
parent f55e2e33f5
commit 85a95219a1
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang.math.NumberUtils;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.springframework.core.GenericCollectionTypeResolver; import org.springframework.core.ResolvableType;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import org.springframework.data.elasticsearch.annotations.*; import org.springframework.data.elasticsearch.annotations.*;
@ -45,8 +45,8 @@ import org.springframework.data.util.TypeInformation;
* @author Kevin Leturc * @author Kevin Leturc
* @author Alexander Volz * @author Alexander Volz
* @author Dennis Maaß * @author Dennis Maaß
* @author Mark Paluch
*/ */
class MappingBuilder { class MappingBuilder {
public static final String FIELD_STORE = "store"; public static final String FIELD_STORE = "store";
@ -313,12 +313,20 @@ class MappingBuilder {
} }
protected static Class<?> getFieldType(java.lang.reflect.Field field) { protected static Class<?> getFieldType(java.lang.reflect.Field field) {
Class<?> clazz = field.getType();
TypeInformation typeInformation = ClassTypeInformation.from(clazz); ResolvableType resolvableType = ResolvableType.forField(field);
if (typeInformation.isCollectionLike()) {
clazz = GenericCollectionTypeResolver.getCollectionFieldType(field) != null ? GenericCollectionTypeResolver.getCollectionFieldType(field) : typeInformation.getComponentType().getType(); if (resolvableType.isArray()) {
return resolvableType.getComponentType().getRawClass();
} }
return clazz;
ResolvableType componentType = resolvableType.getGeneric(0);
if (Iterable.class.isAssignableFrom(field.getType())
&& componentType != ResolvableType.NONE) {
return componentType.getRawClass();
}
return resolvableType.getRawClass();
} }
private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) { private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {