Backport 4580 to 8.18 (#4613)

* backporting code

* generated java examples

* rereapply manual fixes

* fix tabs

* pretty

Author: l-trotta

Makefile

@@ -74,6 +74,10 @@ generate-language-examples:
 	@node docs/examples/generate-language-examples.js
 	@npm run format:fix-examples --prefix compiler
 
+generate-language-examples-with-java:
+	@node docs/examples/generate-language-examples.js java
+	@npm run format:fix-examples --prefix compiler
+
 lint-docs: ## Lint the OpenAPI documents after overlays
 	@npx @redocly/cli lint "output/openapi/elasticsearch-*.json" --config "docs/linters/redocly.yaml" --format stylish --max-problems 500
 

docs/examples/generate-language-examples.js

@@ -21,6 +21,8 @@ const fs = require('fs');
 const path = require('path');
 const { parseDocument: yamlParseDocument } = require('yaml');
 const { convertRequests, loadSchema } = require('@elastic/request-converter');
+const {parseRequest} = require("@elastic/request-converter/dist/parse");
+const {JavaCaller} = require("java-caller");
 
 const LANGUAGES = ['Python', 'JavaScript', 'Ruby', 'PHP', 'curl'];
 
@@ -44,6 +46,50 @@ async function generateLanguages(example) {
     });
   }
   data.alternatives = alternatives.concat((data.alternatives ?? []).filter(pair => !LANGUAGES.includes(pair.language)));
+
+  // specific java example generator
+  if (process.argv[2] === "java") {
+    const partialRequest = await parseRequest(request);
+    const java = new JavaCaller({
+      minimumJavaVersion: 21,
+      jar: "path/to/converter/jar/java-es-request-converter-1.0-SNAPSHOT.jar",
+    });
+
+    let correctParams = getCodeGenParamNames(partialRequest.params, partialRequest.request);
+    let body = partialRequest.body;
+    if (!body) {
+      body = {}
+    }
+
+    let javaReqs = [];
+    const javaParsedRequest = {
+      api: partialRequest.api,
+      params: correctParams,
+      query: partialRequest.query,
+      body: body,
+    };
+    javaReqs.push(javaParsedRequest)
+
+    let args = [];
+    args.push(JSON.stringify(javaReqs));
+
+    const {status, stdout, stderr} = await java.run(args);
+    if (status) {
+      console.log(stderr);
+      console.log(JSON.stringify(javaReqs));
+    }
+    else {
+      const alternative_java = [];
+      alternative_java.push({
+        language: "Java",
+        code: stdout,
+      });
+      // replace old java examples
+      data.alternatives = data.alternatives.filter(pair => pair.language !== "Java");
+      data.alternatives = data.alternatives.concat(alternative_java);
+    }
+  }
+
   doc.delete('alternatives');
   doc.add(doc.createPair('alternatives', data.alternatives));
   await fs.promises.writeFile(example, doc.toString({lineWidth: 132}));
@@ -61,6 +107,23 @@ async function* walkExamples(dir) {
   }
 }
 
+function getCodeGenParamNames(
+    params,
+    request,
+){
+  for (const [key, value] of Object.entries(params)) {
+    if (request?.path) {
+      for (const prop of request.path) {
+        if (prop.name === key && prop.codegenName !== undefined) {
+          delete params[key];
+          params[prop.codegenName] = value;
+        }
+      }
+    }
+  }
+  return params;
+}
+
 async function main() {
   let count = 0;
   let errors = 0;

docs/examples/package.json

@@ -6,6 +6,7 @@
     "@elastic/request-converter": "^9.1.1",
     "@redocly/cli": "^1.34.3",
     "@stoplight/spectral-cli": "^6.14.2",
-    "yaml": "^2.8.0"
+    "yaml": "^2.8.0",
+    "java-caller": "^4.1.1"
   }
 }

specification/_global/clear_scroll/examples/request/ClearScrollRequestExample1.yaml

@@ -35,3 +35,8 @@ alternatives:
     code:
       'curl -X DELETE -H "Authorization: ApiKey $ELASTIC_API_KEY" -H "Content-Type: application/json" -d
       ''{"scroll_id":"DXF1ZXJ5QW5kRmV0Y2gBAAAAAAAAAD4WYm9laVYtZndUQlNsdDcwakFMNjU1QQ=="}'' "$ELASTICSEARCH_URL/_search/scroll"'
+  - language: Java
+    code: |
+      client.clearScroll(c -> c
+          .scrollId("DXF1ZXJ5QW5kRmV0Y2gBAAAAAAAAAD4WYm9laVYtZndUQlNsdDcwakFMNjU1QQ==")
+      );

specification/_global/close_point_in_time/examples/request/ClosePointInTimeRequestExample1.yaml

@@ -36,3 +36,8 @@ alternatives:
       "curl -X DELETE -H \"Authorization: ApiKey $ELASTIC_API_KEY\" -H \"Content-Type: application/json\" -d
       '{\"id\":\"46ToAwMDaWR5BXV1aWQyKwZub2RlXzMAAAAAAAAAACoBYwADaWR4BXV1aWQxAgZub2RlXzEAAAAAAAAAAAEBYQADaWR5BXV1aWQyKgZub2RlXzIAAA\
       AAAAAAAAwBYgACBXV1aWQyAAAFdXVpZDEAAQltYXRjaF9hbGw_gAAAAA==\"}' \"$ELASTICSEARCH_URL/_pit\""
+  - language: Java
+    code: >
+      client.closePointInTime(c -> c
+          .id("46ToAwMDaWR5BXV1aWQyKwZub2RlXzMAAAAAAAAAACoBYwADaWR4BXV1aWQxAgZub2RlXzEAAAAAAAAAAAEBYQADaWR5BXV1aWQyKgZub2RlXzIAAAAAAAAAAAwBYgACBXV1aWQyAAAFdXVpZDEAAQltYXRjaF9hbGw_gAAAAA==")
+      );

specification/_global/count/examples/request/CountRequestExample1.yaml

@@ -59,3 +59,14 @@ alternatives:
     code:
       'curl -X GET -H "Authorization: ApiKey $ELASTIC_API_KEY" -H "Content-Type: application/json" -d
       ''{"query":{"term":{"user.id":"kimchy"}}}'' "$ELASTICSEARCH_URL/my-index-000001/_count"'
+  - language: Java
+    code: |
+      client.count(c -> c
+          .index("my-index-000001")
+          .query(q -> q
+              .term(t -> t
+                  .field("user.id")
+                  .value(FieldValue.of("kimchy"))
+              )
+          )
+      );

specification/_global/create/examples/request/CreateRequestExample1.yaml

@@ -69,3 +69,10 @@ alternatives:
       'curl -X PUT -H "Authorization: ApiKey $ELASTIC_API_KEY" -H "Content-Type: application/json" -d
       ''{"@timestamp":"2099-11-15T13:12:00","message":"GET /search HTTP/1.1 200 1070000","user":{"id":"kimchy"}}''
       "$ELASTICSEARCH_URL/my-index-000001/_create/1"'
+  - language: Java
+    code: >
+      client.create(c -> c
+          .id("1")
+          .index("my-index-000001")
+          .document(JsonData.fromJson("{\"@timestamp\":\"2099-11-15T13:12:00\",\"message\":\"GET /search HTTP/1.1 200 1070000\",\"user\":{\"id\":\"kimchy\"}}"))
+      );

specification/_global/delete_by_query/examples/request/DeleteByQueryRequestExample1.yaml

@@ -49,3 +49,11 @@ alternatives:
     code:
       'curl -X POST -H "Authorization: ApiKey $ELASTIC_API_KEY" -H "Content-Type: application/json" -d
       ''{"query":{"match_all":{}}}'' "$ELASTICSEARCH_URL/my-index-000001,my-index-000002/_delete_by_query"'
+  - language: Java
+    code: |
+      client.deleteByQuery(d -> d
+          .index(List.of("my-index-000001","my-index-000002"))
+          .query(q -> q
+              .matchAll(m -> m)
+          )
+      );

specification/_global/delete_by_query/examples/request/DeleteByQueryRequestExample2.yaml

@@ -64,3 +64,15 @@ alternatives:
     code:
       'curl -X POST -H "Authorization: ApiKey $ELASTIC_API_KEY" -H "Content-Type: application/json" -d
       ''{"query":{"term":{"user.id":"kimchy"}},"max_docs":1}'' "$ELASTICSEARCH_URL/my-index-000001/_delete_by_query"'
+  - language: Java
+    code: |
+      client.deleteByQuery(d -> d
+          .index("my-index-000001")
+          .maxDocs(1L)
+          .query(q -> q
+              .term(t -> t
+                  .field("user.id")
+                  .value(FieldValue.of("kimchy"))
+              )
+          )
+      );

specification/_global/delete_by_query/examples/request/DeleteByQueryRequestExample3.yaml

@@ -91,3 +91,20 @@ alternatives:
       'curl -X POST -H "Authorization: ApiKey $ELASTIC_API_KEY" -H "Content-Type: application/json" -d
       ''{"slice":{"id":0,"max":2},"query":{"range":{"http.response.bytes":{"lt":2000000}}}}''
       "$ELASTICSEARCH_URL/my-index-000001/_delete_by_query"'
+  - language: Java
+    code: |
+      client.deleteByQuery(d -> d
+          .index("my-index-000001")
+          .query(q -> q
+              .range(r -> r
+                  .untyped(u -> u
+                      .field("http.response.bytes")
+                      .lt(JsonData.fromJson("2000000"))
+                  )
+              )
+          )
+          .slice(s -> s
+              .id("0")
+              .max(2)
+          )
+      );