Skip to content

ObjectsEsqlAdapter refactor #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2024
Merged

ObjectsEsqlAdapter refactor #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nt/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public interface EsqlAdapter<Result> {
String format();

/**
* For JSON results, whether the result should be organized in rows or columns
* For JSON like results, whether the result should be organized in rows or columns
*/
boolean columnar();

Expand Down
9 changes: 6 additions & 3 deletions ...rch/_helpers/esql/ObjectsEsqlAdapter.java → ...pers/esql/objects/ObjectsEsqlAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
* under the License.
*/

package co.elastic.clients.elasticsearch._helpers.esql;
package co.elastic.clients.elasticsearch._helpers.esql.objects;

import co.elastic.clients.ApiClient;
import co.elastic.clients.elasticsearch._helpers.esql.EsqlAdapter;
import co.elastic.clients.elasticsearch._helpers.esql.EsqlAdapterBase;
import co.elastic.clients.elasticsearch._helpers.esql.EsqlMetadata;
import co.elastic.clients.elasticsearch.esql.QueryRequest;
import co.elastic.clients.json.BufferingJsonGenerator;
import co.elastic.clients.json.BufferingJsonpMapper;
Expand All @@ -37,7 +40,7 @@
/**
* And ES|QL adapter that returns an iterable of domain objects
*/
class ObjectsEsqlAdapter<T> implements EsqlAdapter<Iterable<T>> {
public class ObjectsEsqlAdapter<T> implements EsqlAdapter<Iterable<T>> {

public static <T> ObjectsEsqlAdapter<T> of(Class<T> clazz) {
return new ObjectsEsqlAdapter<>(clazz);
Expand All @@ -49,7 +52,7 @@ public static <T> ObjectsEsqlAdapter<T> of(Type type) {

private final Type type;

ObjectsEsqlAdapter(Type type) {
public ObjectsEsqlAdapter(Type type) {
this.type = type;
}

Expand Down
1 change: 1 addition & 0 deletions ...src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch.ElasticsearchTestServer;
import co.elastic.clients.elasticsearch._helpers.esql.jdbc.ResultSetEsqlAdapter;
import co.elastic.clients.elasticsearch._helpers.esql.objects.ObjectsEsqlAdapter;
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
import co.elastic.clients.transport.rest_client.RestClientTransport;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
Expand Down
1 change: 1 addition & 0 deletions ...-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch._helpers.esql.jdbc.ResultSetEsqlAdapter;
import co.elastic.clients.elasticsearch._helpers.esql.objects.ObjectsEsqlAdapter;
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
import co.elastic.clients.testkit.MockHttpClient;
import co.elastic.clients.transport.endpoints.BinaryResponse;
Expand Down