Skip to content

Commit cb0bb35

Browse files
authored
Fixes from spec 2552 (#815)
1 parent 9b719ae commit cb0bb35

File tree

13 files changed

+701
-175
lines changed

13 files changed

+701
-175
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1668,7 +1668,7 @@ public String toString() {
16681668
return JsonpUtils.toString(this);
16691669
}
16701670

1671-
public static class Builder extends WithJsonObjectBuilderBase<Builder> {
1671+
public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<Aggregation> {
16721672
private Kind _kind;
16731673
private Object _value;
16741674
private String _customKind;
@@ -2557,7 +2557,7 @@ public ContainerBuilder _custom(String name, Object data) {
25572557
return new ContainerBuilder();
25582558
}
25592559

2560-
protected Aggregation build() {
2560+
public Aggregation build() {
25612561
_checkSingleUse();
25622562
return new Aggregation(this);
25632563
}

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

+11-10
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import co.elastic.clients.util.ObjectBuilder;
3030
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3131
import jakarta.json.stream.JsonGenerator;
32+
import java.lang.Double;
3233
import java.lang.String;
3334
import java.util.Objects;
3435
import java.util.function.Function;
@@ -60,13 +61,13 @@
6061
@JsonpDeserializable
6162
public class AggregationRange implements JsonpSerializable {
6263
@Nullable
63-
private final String from;
64+
private final Double from;
6465

6566
@Nullable
6667
private final String key;
6768

6869
@Nullable
69-
private final String to;
70+
private final Double to;
7071

7172
// ---------------------------------------------------------------------------------------------
7273

@@ -88,7 +89,7 @@ public static AggregationRange of(Function<Builder, ObjectBuilder<AggregationRan
8889
* API name: {@code from}
8990
*/
9091
@Nullable
91-
public final String from() {
92+
public final Double from() {
9293
return this.from;
9394
}
9495

@@ -108,7 +109,7 @@ public final String key() {
108109
* API name: {@code to}
109110
*/
110111
@Nullable
111-
public final String to() {
112+
public final Double to() {
112113
return this.to;
113114
}
114115

@@ -154,20 +155,20 @@ public String toString() {
154155

155156
public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<AggregationRange> {
156157
@Nullable
157-
private String from;
158+
private Double from;
158159

159160
@Nullable
160161
private String key;
161162

162163
@Nullable
163-
private String to;
164+
private Double to;
164165

165166
/**
166167
* Start of the range (inclusive).
167168
* <p>
168169
* API name: {@code from}
169170
*/
170-
public final Builder from(@Nullable String value) {
171+
public final Builder from(@Nullable Double value) {
171172
this.from = value;
172173
return this;
173174
}
@@ -187,7 +188,7 @@ public final Builder key(@Nullable String value) {
187188
* <p>
188189
* API name: {@code to}
189190
*/
190-
public final Builder to(@Nullable String value) {
191+
public final Builder to(@Nullable Double value) {
191192
this.to = value;
192193
return this;
193194
}
@@ -220,9 +221,9 @@ public AggregationRange build() {
220221

221222
protected static void setupAggregationRangeDeserializer(ObjectDeserializer<AggregationRange.Builder> op) {
222223

223-
op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
224+
op.add(Builder::from, JsonpDeserializer.doubleDeserializer(), "from");
224225
op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
225-
op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
226+
op.add(Builder::to, JsonpDeserializer.doubleDeserializer(), "to");
226227

227228
}
228229

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ protected static void setupNormalizerDeserializer(ObjectDeserializer<Builder> op
210210
op.add(Builder::custom, CustomNormalizer._DESERIALIZER, "custom");
211211
op.add(Builder::lowercase, LowercaseNormalizer._DESERIALIZER, "lowercase");
212212

213-
op.setTypeProperty("type", null);
213+
op.setTypeProperty("type", "custom");
214214

215215
}
216216

0 commit comments

Comments
 (0)