Skip to content

Commit d129e69

Browse files
altro3altro3
committed
Merge remote-tracking branch 'origin/actualization' into actualization
# Conflicts: # gradlew
2 parents b3a91fd + e918e16 commit d129e69

File tree

85 files changed

+522
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+522
-41
lines changed

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919

2020
distributionBase=GRADLE_USER_HOME
2121
distributionPath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
2323
zipStoreBase=GRADLE_USER_HOME
2424
zipStorePath=wrapper/dists

‎gradlew.bat

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

8772

8873
@rem Execute Gradle
89-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
9075

9176
:end
9277
@rem End local scope for the variables with windows NT shell

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoBounds.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -167,6 +168,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
167168

168169
}
169170

171+
@Override
172+
public String toString() {
173+
return JsonpUtils.toString(this);
174+
}
175+
170176
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoBounds> {
171177
private Kind _kind;
172178
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoHashPrecision.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -153,6 +154,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
153154

154155
}
155156

157+
@Override
158+
public String toString() {
159+
return JsonpUtils.toString(this);
160+
}
161+
156162
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoHashPrecision> {
157163
private Kind _kind;
158164
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoLocation.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -188,6 +189,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
188189

189190
}
190191

192+
@Override
193+
public String toString() {
194+
return JsonpUtils.toString(this);
195+
}
196+
191197
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLocation> {
192198
private Kind _kind;
193199
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public RequestBase() {
5353
@Override
5454
public String toString() {
5555

56-
StringBuilder sb = new StringBuilder();
56+
StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()).append(": ");
5757

5858
try {
5959
@SuppressWarnings("unchecked")

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Script.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -125,6 +126,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
125126

126127
}
127128

129+
@Override
130+
public String toString() {
131+
return JsonpUtils.toString(this);
132+
}
133+
128134
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Script> {
129135
private Kind _kind;
130136
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Slices.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -146,6 +147,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
146147

147148
}
148149

150+
@Override
151+
public String toString() {
152+
return JsonpUtils.toString(this);
153+
}
154+
149155
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Slices> {
150156
private Kind _kind;
151157
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/SortOptions.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
225225
}
226226
}
227227

228+
@Override
229+
public String toString() {
230+
return JsonpUtils.toString(this);
231+
}
232+
228233
public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<SortOptions> {
229234
private Kind _kind;
230235
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Time.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -155,6 +156,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
155156

156157
}
157158

159+
@Override
160+
public String toString() {
161+
return JsonpUtils.toString(this);
162+
}
163+
158164
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Time> {
159165
private Kind _kind;
160166
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Transform.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import co.elastic.clients.json.JsonpDeserializer;
2929
import co.elastic.clients.json.JsonpMapper;
3030
import co.elastic.clients.json.JsonpSerializable;
31+
import co.elastic.clients.json.JsonpUtils;
3132
import co.elastic.clients.json.ObjectBuilderDeserializer;
3233
import co.elastic.clients.json.ObjectDeserializer;
3334
import co.elastic.clients.util.ApiTypeHelper;
@@ -192,6 +193,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
192193

193194
}
194195

196+
@Override
197+
public String toString() {
198+
return JsonpUtils.toString(this);
199+
}
200+
195201
public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<Transform> {
196202
private Kind _kind;
197203
private Object _value;

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/WaitForActiveShards.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -146,6 +147,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
146147

147148
}
148149

150+
@Override
151+
public String toString() {
152+
return JsonpUtils.toString(this);
153+
}
154+
149155
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WaitForActiveShards> {
150156
private Kind _kind;
151157
private Object _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import co.elastic.clients.json.JsonpDeserializer;
3030
import co.elastic.clients.json.JsonpMapper;
3131
import co.elastic.clients.json.JsonpSerializable;
32+
import co.elastic.clients.json.JsonpUtils;
3233
import co.elastic.clients.json.ObjectDeserializer;
3334
import co.elastic.clients.util.ApiTypeHelper;
3435
import co.elastic.clients.util.ObjectBuilder;
@@ -1385,6 +1386,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
13851386

13861387
}
13871388

1389+
@Override
1390+
public String toString() {
1391+
return JsonpUtils.toString(this);
1392+
}
1393+
13881394
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Aggregate> {
13891395
private Kind _kind;
13901396
private AggregateVariant _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import co.elastic.clients.json.JsonpDeserializer;
3131
import co.elastic.clients.json.JsonpMapper;
3232
import co.elastic.clients.json.JsonpSerializable;
33+
import co.elastic.clients.json.JsonpUtils;
3334
import co.elastic.clients.json.ObjectBuilderDeserializer;
3435
import co.elastic.clients.json.ObjectDeserializer;
3536
import co.elastic.clients.util.ApiTypeHelper;
@@ -1581,6 +1582,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
15811582

15821583
}
15831584

1585+
@Override
1586+
public String toString() {
1587+
return JsonpUtils.toString(this);
1588+
}
1589+
15841590
public static class Builder extends WithJsonObjectBuilderBase<Builder> {
15851591
private Kind _kind;
15861592
private Object _value;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
158158

159159
}
160160

161+
@Override
162+
public String toString() {
163+
return JsonpUtils.toString(this);
164+
}
165+
161166
public static class Builder<TBucket> extends ObjectBuilderBase implements ObjectBuilder<Buckets<TBucket>> {
162167
private Kind _kind;
163168
private Object _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -176,6 +177,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
176177

177178
}
178179

180+
@Override
181+
public String toString() {
182+
return JsonpUtils.toString(this);
183+
}
184+
179185
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BucketsPath> {
180186
private Kind _kind;
181187
private Object _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -135,6 +136,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
135136

136137
}
137138

139+
@Override
140+
public String toString() {
141+
return JsonpUtils.toString(this);
142+
}
143+
138144
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CategorizeTextAnalyzer> {
139145
private Kind _kind;
140146
private Object _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import co.elastic.clients.json.JsonpDeserializer;
2828
import co.elastic.clients.json.JsonpMapper;
2929
import co.elastic.clients.json.JsonpSerializable;
30+
import co.elastic.clients.json.JsonpUtils;
3031
import co.elastic.clients.json.ObjectDeserializer;
3132
import co.elastic.clients.json.UnionDeserializer;
3233
import co.elastic.clients.util.ApiTypeHelper;
@@ -154,6 +155,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
154155

155156
}
156157

158+
@Override
159+
public String toString() {
160+
return JsonpUtils.toString(this);
161+
}
162+
157163
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldDateMath> {
158164
private Kind _kind;
159165
private Object _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import co.elastic.clients.json.JsonpDeserializer;
3131
import co.elastic.clients.json.JsonpMapper;
3232
import co.elastic.clients.json.JsonpSerializable;
33+
import co.elastic.clients.json.JsonpUtils;
3334
import co.elastic.clients.json.ObjectBuilderDeserializer;
3435
import co.elastic.clients.json.ObjectDeserializer;
3536
import co.elastic.clients.util.ApiTypeHelper;
@@ -164,6 +165,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
164165

165166
}
166167

168+
@Override
169+
public String toString() {
170+
return JsonpUtils.toString(this);
171+
}
172+
167173
public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<InferenceConfig> {
168174
private Kind _kind;
169175
private Object _value;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import co.elastic.clients.json.JsonpDeserializer;
2929
import co.elastic.clients.json.JsonpMapper;
3030
import co.elastic.clients.json.JsonpSerializable;
31+
import co.elastic.clients.json.JsonpUtils;
3132
import co.elastic.clients.json.ObjectBuilderDeserializer;
3233
import co.elastic.clients.json.ObjectDeserializer;
3334
import co.elastic.clients.util.ApiTypeHelper;
@@ -213,6 +214,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
213214

214215
}
215216

217+
@Override
218+
public String toString() {
219+
return JsonpUtils.toString(this);
220+
}
221+
216222
public static class Builder extends WithJsonObjectBuilderBase<Builder>
217223
implements
218224
ObjectBuilder<MovingAverageAggregation> {

0 commit comments

Comments
 (0)