Fixes from pr 2549 partial 7.17 backport

Author: l-trotta

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/AdjacencyMatrixAggregation.java

@@ -61,12 +61,16 @@
 public class AdjacencyMatrixAggregation extends BucketAggregationBase implements AggregationVariant {
 	private final Map<String, Query> filters;
 
+	@Nullable
+	private final String separator;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private AdjacencyMatrixAggregation(Builder builder) {
 		super(builder);
 
 		this.filters = ApiTypeHelper.unmodifiable(builder.filters);
+		this.separator = builder.separator;
 
 	}
 
@@ -89,6 +93,16 @@ public final Map<String, Query> filters() {
 		return this.filters;
 	}
 
+	/**
+	 * Separator used to concatenate filter names. Defaults to &amp;.
+	 * <p>
+	 * API name: {@code separator}
+	 */
+	@Nullable
+	public final String separator() {
+		return this.separator;
+	}
+
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		super.serializeInternal(generator, mapper);
@@ -103,6 +117,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.writeEnd();
 
 		}
+		if (this.separator != null) {
+			generator.writeKey("separator");
+			generator.write(this.separator);
+
+		}
 
 	}
 
@@ -118,6 +137,9 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder<Builde
 		@Nullable
 		private Map<String, Query> filters;
 
+		@Nullable
+		private String separator;
+
 		/**
 		 * API name: {@code filters}
 		 * <p>
@@ -147,6 +169,16 @@ public final Builder filters(String key, Function<Query.Builder, ObjectBuilder<Q
 			return filters(key, fn.apply(new Query.Builder()).build());
 		}
 
+		/**
+		 * Separator used to concatenate filter names. Defaults to &amp;.
+		 * <p>
+		 * API name: {@code separator}
+		 */
+		public final Builder separator(@Nullable String value) {
+			this.separator = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -177,6 +209,7 @@ protected static void setupAdjacencyMatrixAggregationDeserializer(
 			ObjectDeserializer<AdjacencyMatrixAggregation.Builder> op) {
 		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
 		op.add(Builder::filters, JsonpDeserializer.stringMapDeserializer(Query._DESERIALIZER), "filters");
+		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
 
 	}
 

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorProperty.java

@@ -58,6 +58,9 @@
  */
 @JsonpDeserializable
 public class DenseVectorProperty extends PropertyBase implements PropertyVariant {
+	@Nullable
+	private final String elementType;
+
 	@Nullable
 	private final Integer dims;
 
@@ -75,6 +78,7 @@ public class DenseVectorProperty extends PropertyBase implements PropertyVariant
 	private DenseVectorProperty(Builder builder) {
 		super(builder);
 
+		this.elementType = builder.elementType;
 		this.dims = builder.dims;
 		this.similarity = builder.similarity;
 		this.index = builder.index;
@@ -94,6 +98,14 @@ public Property.Kind _propertyKind() {
 		return Property.Kind.DenseVector;
 	}
 
+	/**
+	 * API name: {@code element_type}
+	 */
+	@Nullable
+	public final String elementType() {
+		return this.elementType;
+	}
+
 	/**
 	 * API name: {@code dims}
 	 */
@@ -130,6 +142,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		generator.write("type", "dense_vector");
 		super.serializeInternal(generator, mapper);
+		if (this.elementType != null) {
+			generator.writeKey("element_type");
+			generator.write(this.elementType);
+
+		}
 		if (this.dims != null) {
 			generator.writeKey("dims");
 			generator.write(this.dims);
@@ -162,6 +179,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
 			implements
 				ObjectBuilder<DenseVectorProperty> {
+		@Nullable
+		private String elementType;
+
 		@Nullable
 		private Integer dims;
 
@@ -174,6 +194,14 @@ public static class Builder extends PropertyBase.AbstractBuilder<Builder>
 		@Nullable
 		private DenseVectorIndexOptions indexOptions;
 
+		/**
+		 * API name: {@code element_type}
+		 */
+		public final Builder elementType(@Nullable String value) {
+			this.elementType = value;
+			return this;
+		}
+
 		/**
 		 * API name: {@code dims}
 		 */
@@ -242,6 +270,7 @@ public DenseVectorProperty build() {
 
 	protected static void setupDenseVectorPropertyDeserializer(ObjectDeserializer<DenseVectorProperty.Builder> op) {
 		PropertyBase.setupPropertyBaseDeserializer(op);
+		op.add(Builder::elementType, JsonpDeserializer.stringDeserializer(), "element_type");
 		op.add(Builder::dims, JsonpDeserializer.integerDeserializer(), "dims");
 		op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
 		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");