Merge branch 'main' into 5.0.x

This commit is contained in:
Peter-Josef Meisch 2022-03-20 11:10:23 +01:00
commit 57920d4e27
No known key found for this signature in database
GPG Key ID: DE108246970C7708

View File

@ -172,7 +172,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
@Override @Override
public boolean writeTypeHints() { public boolean writeTypeHints() {
boolean writeTypeHints = contextConfiguration.writeTypeHints; boolean writeTypeHints = contextConfiguration.getWriteTypeHints();
if (document != null) { if (document != null) {
switch (document.writeTypeHint()) { switch (document.writeTypeHint()) {
@ -548,7 +548,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
/** /**
* Configuration settings passed in from the creating {@link SimpleElasticsearchMappingContext}. * Configuration settings passed in from the creating {@link SimpleElasticsearchMappingContext}.
*/ */
static class ContextConfiguration { public static class ContextConfiguration {
private final FieldNamingStrategy fieldNamingStrategy; private final FieldNamingStrategy fieldNamingStrategy;
private final boolean writeTypeHints; private final boolean writeTypeHints;
@ -561,6 +561,10 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
public FieldNamingStrategy getFieldNamingStrategy() { public FieldNamingStrategy getFieldNamingStrategy() {
return fieldNamingStrategy; return fieldNamingStrategy;
} }
public boolean getWriteTypeHints() {
return writeTypeHints;
}
} }
@Override @Override