Merge branch 'main' into add.es.repo

Author: swallez

config/checkstyle/checkstyle.xml

@@ -39,12 +39,14 @@
     <!-- Checks Java files and forbids empty Javadoc comments. -->
     <!-- Although you can use the "JavadocStyle" rule for this, it considers Javadoc -->
     <!-- that only contains a "@return" line to be empty. -->
+    <!--
     <module name="RegexpMultiline">
         <property name="id" value="EmptyJavadoc" />
         <property name="format" value="\/\*[\s\*]*\*\/" />
         <property name="fileExtensions" value="java" />
         <property name="message" value="Empty javadoc comments are forbidden" />
     </module>
+    -->
 
     <!-- Its our official line length! See checkstyle_suppressions.xml for the files that don't pass this. For now we
       suppress the check there but enforce it everywhere else. This prevents the list from getting longer even if it is

java-client/build.gradle.kts

@@ -107,13 +107,15 @@ publishing {
 }
 
 dependencies {
-    val elasticsearchVersion = "7.12.0"
+    val elasticsearchVersion = "7.15.0"
     val jacksonVersion = "2.12.0"
 
     // Apache 2.0
+    // https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html
     implementation("org.elasticsearch.client", "elasticsearch-rest-client", elasticsearchVersion)
 
     // Apache 2.0
+    // https://search.maven.org/artifact/com.google.code.findbugs/jsr305
     implementation("com.google.code.findbugs:jsr305:3.0.2")
 
     // EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
@@ -131,6 +133,7 @@ dependencies {
     testImplementation("jakarta.json.bind", "jakarta.json.bind-api", "2.0.0")
 
     // Apache 2.0
+    // https://github.com/FasterXML/jackson
     compileOnly("com.fasterxml.jackson.core", "jackson-core", jacksonVersion)
     compileOnly("com.fasterxml.jackson.core", "jackson-databind", jacksonVersion)
     testImplementation("com.fasterxml.jackson.core", "jackson-core", jacksonVersion)
@@ -140,10 +143,16 @@ dependencies {
     // https://eclipse-ee4j.github.io/yasson/
     testImplementation("org.eclipse", "yasson", "2.0.2")
 
-    // Eclipse 1.0
+    // EPL-1.0
+    // https://junit.org/junit4/
     testImplementation("junit", "junit" , "4.12")
 
     // MIT
+    // https://github.com/classgraph/classgraph
+    testImplementation("io.github.classgraph:classgraph:4.8.116")
+
+    // MIT
+    // https://www.testcontainers.org/
     testImplementation("org.testcontainers", "testcontainers", "1.15.3")
     testImplementation("org.testcontainers", "elasticsearch", "1.15.3")
 }

java-client/src/main/java/co/elastic/clients/base/AdditionalProperties.java

@@ -20,33 +20,27 @@
 package co.elastic.clients.base;
 
 import co.elastic.clients.json.JsonpDeserializer;
-import org.elasticsearch.client.RequestOptions;
+import co.elastic.clients.json.JsonpMapperBase;
 
-import javax.annotation.Nullable;
-
-public abstract class ApiClient<Self extends ApiClient<Self>> {
+public abstract class ApiClient {
 
     protected final Transport transport;
 
-    @Nullable
-    protected final RequestOptions requestOptions;
-
-    protected ApiClient(Transport transport, @Nullable RequestOptions requestOptions) {
+    protected ApiClient(Transport transport) {
         this.transport = transport;
-        this.requestOptions = requestOptions;
     }
 
-    /**
-     * Creates a new client with some request options
-     */
-    public abstract Self withRequestOptions(@Nullable RequestOptions requestOptions);
+    protected <T> JsonpDeserializer<T> getDeserializer(Class<T> clazz) {
+        // Try the built-in deserializers first to avoid repeated lookups in the Jsonp mapper for client-defined classes
+        JsonpDeserializer<T> result = JsonpMapperBase.findDeserializer(clazz);
+        if (result != null) {
+            return result;
+        }
 
-    @Nullable
-    public final RequestOptions requestOptions() {
-        return this.requestOptions;
+        return JsonpDeserializer.of(clazz);
     }
 
-    protected <T> JsonpDeserializer<T> getDeserializer(Class<T> clazz) {
-        return transport.jsonpMapper().getDeserializer(clazz);
+    public Transport _transport() {
+        return this.transport;
     }
 }

java-client/src/main/java/co/elastic/clients/base/ApiClient.java

@@ -0,0 +1,49 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.base;
+
+import co.elastic.clients.json.JsonpDeserializer;
+
+import java.util.Map;
+import java.util.function.Function;
+
+public class BooleanEndpoint<RequestT> extends SimpleEndpoint<RequestT, BooleanResponse> {
+
+    public BooleanEndpoint(
+        Function<RequestT, String> method,
+        Function<RequestT, String> requestUrl,
+        Function<RequestT,
+            Map<String, String>> queryParameters,
+        Function<RequestT, Map<String, String>> headers,
+        boolean hasRequestBody, // always true
+        JsonpDeserializer<BooleanResponse> responseParser // always null
+    ) {
+        super(method, requestUrl, queryParameters, headers, hasRequestBody, responseParser);
+    }
+
+    @Override
+    public boolean isError(int statusCode) {
+        return statusCode >= 500;
+    }
+
+    public boolean getResult(int statusCode) {
+        return statusCode < 400;
+    }
+}