From 312df33c3130c71df891ef21a4eb45fc6a1722f4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 24 Apr 2017 10:33:45 +0200 Subject: [PATCH] DATAES-350 - Adapt to SimpleTypeHolder changes in Spring Data Commons. Replace constructor usage with singleton instance. Related Ticket: DATAES-350. --- .../springframework/data/elasticsearch/core/MappingBuilder.java | 2 +- .../core/mapping/SimpleElasticsearchPersistentEntityTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java index 3111dbe5c..0f37add0a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java @@ -72,7 +72,7 @@ class MappingBuilder { public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix"; public static final String TYPE_VALUE_GEO_HASH_PRECISION = "geohash_precision"; - private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder(); + private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = SimpleTypeHolder.DEFAULT; static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException { diff --git a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java index 9039dc0f2..288ae2275 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java @@ -67,7 +67,7 @@ public class SimpleElasticsearchPersistentEntityTests { String field) { Property property = Property.of(ReflectionUtils.findField(entity.getTypeInformation().getType(), field)); - return new SimpleElasticsearchPersistentProperty(property, entity, new SimpleTypeHolder()); + return new SimpleElasticsearchPersistentProperty(property, entity, SimpleTypeHolder.DEFAULT); }