From 149535e0d34068d053d524118a47a7ce2cc16dbf Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 19 Mar 2022 20:50:18 +0100 Subject: [PATCH 1/2] Fix javadoc formatting (cherry picked from commit 6f6cedf6dff2c7f7ef886d65a857b345013db628) --- .../core/AbstractReactiveElasticsearchTemplate.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java index 3e083b0a1..1d21f5b79 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java @@ -149,9 +149,7 @@ abstract public class AbstractReactiveElasticsearchTemplate /** * Set the {@link ReactiveEntityCallbacks} instance to use when invoking {@link ReactiveEntityCallbacks callbacks} - * like the {@link ReactiveBeforeConvertCallback}. - *

- * Overrides potentially existing {@link ReactiveEntityCallbacks}. + * like the {@link ReactiveBeforeConvertCallback}. Overrides potentially existing {@link ReactiveEntityCallbacks}. * * @param entityCallbacks must not be {@literal null}. * @throws IllegalArgumentException if the given instance is {@literal null}. From 709b4c615e0e8ce5ac9f8b8fc43fef43569d2ddc Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sun, 20 Mar 2022 11:00:06 +0100 Subject: [PATCH 2/2] Set visibility SimpleElasticsearchPersistentEntity.ContextConfiguration to public. Original Pull Request #2116 Closes #2114 --- .../core/mapping/SimpleElasticsearchPersistentEntity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java index 161a0d55f..e63f24ded 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java @@ -172,7 +172,7 @@ public class SimpleElasticsearchPersistentEntity extends BasicPersistentEntit @Override public boolean writeTypeHints() { - boolean writeTypeHints = contextConfiguration.writeTypeHints; + boolean writeTypeHints = contextConfiguration.getWriteTypeHints(); if (document != null) { switch (document.writeTypeHint()) { @@ -548,7 +548,7 @@ public class SimpleElasticsearchPersistentEntity extends BasicPersistentEntit /** * Configuration settings passed in from the creating {@link SimpleElasticsearchMappingContext}. */ - static class ContextConfiguration { + public static class ContextConfiguration { private final FieldNamingStrategy fieldNamingStrategy; private final boolean writeTypeHints; @@ -561,6 +561,10 @@ public class SimpleElasticsearchPersistentEntity extends BasicPersistentEntit public FieldNamingStrategy getFieldNamingStrategy() { return fieldNamingStrategy; } + + public boolean getWriteTypeHints() { + return writeTypeHints; + } } @Override