fixup! Move dynamic mapping parameter configuration to @document and @field

Co-authored-by: Peter-Josef Meisch <[email protected]>

Author: xhaggi

src/main/java/org/springframework/data/elasticsearch/annotations/DynamicMapping.java

@@ -28,7 +28,7 @@
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @since 4.0
- * @deprecated use {@link Document#dynamic()} or {@link Field#dynamic()} instead.
+ * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.FIELD })

src/main/java/org/springframework/data/elasticsearch/annotations/DynamicMappingValue.java

@@ -21,7 +21,7 @@
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @since 4.0
- * @deprecated use {@link Document#dynamic()} or {@link Field#dynamic()} instead. 
+ * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead. 
  */
 @Deprecated
 public enum DynamicMappingValue {

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java

@@ -74,7 +74,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 	private @Nullable ElasticsearchPersistentProperty joinFieldProperty;
 	private @Nullable VersionType versionType;
 	private boolean createIndexAndMapping;
-	private Dynamic dynamic = Dynamic.INHERIT;
+	private final Dynamic dynamic = Dynamic;
 	private final Map<String, ElasticsearchPersistentProperty> fieldNamePropertyCache = new ConcurrentHashMap<>();
 	private final ConcurrentHashMap<String, Expression> routingExpressions = new ConcurrentHashMap<>();
 	private @Nullable String routing;
@@ -105,8 +105,9 @@ public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation,
 			this.versionType = document.versionType();
 			this.createIndexAndMapping = document.createIndex();
 			this.dynamic = document.dynamic();
-		}
-
+		} else {
+                       this.dynamic = Dynamic.INHERIT;
+               }
 		Routing routingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Routing.class);
 
 		if (routingAnnotation != null) {