Polishing.

Signed-off-by: Youssef Aouichaoui <[email protected]>

Author: youssef3wi

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java

@@ -16,7 +16,6 @@
 package org.springframework.data.elasticsearch.client.elc;
 
 import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.json;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.Time;
@@ -667,8 +666,6 @@ public boolean deleteScript(String name) {
 	@Override
 	public SqlResponse search(SqlQuery query) {
 		Assert.notNull(query, "Query must not be null.");
-		Assert.isTrue(query.getFormat() == null || json.equals(query.getFormat()),
-				"The Elasticsearch Java Client only supports JSON format.");
 
 		try {
 			QueryResponse response = sqlClient.query(requestConverter.sqlQueryRequest(query));

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java

@@ -17,7 +17,6 @@
 
 import static co.elastic.clients.util.ApiTypeHelper.*;
 import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.json;
 
 import co.elastic.clients.elasticsearch._types.Result;
 import co.elastic.clients.elasticsearch.core.*;
@@ -654,8 +653,6 @@ public BaseQueryBuilder queryBuilderWithIds(List<String> ids) {
 	@Override
 	public Mono<SqlResponse> search(SqlQuery query) {
 		Assert.notNull(query, "Query must not be null.");
-		Assert.isTrue(query.getFormat() == null || json.equals(query.getFormat()),
-				"The Elasticsearch Java Client only supports JSON format.");
 
 		co.elastic.clients.elasticsearch.sql.QueryRequest request = requestConverter.sqlQueryRequest(query);
 		return sqlClient.query(request).onErrorMap(this::translateException).map(responseConverter::sqlResponse);

src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

@@ -541,7 +541,7 @@ public co.elastic.clients.elasticsearch.sql.QueryRequest sqlQueryRequest(SqlQuer
 					.keepOnCompletion(query.getKeepOnCompletion()).pageTimeout(time(query.getPageTimeout()))
 					.requestTimeout(time(query.getRequestTimeout()))
 					.waitForCompletionTimeout(time(query.getWaitForCompletionTimeout())).filter(getQuery(query.getFilter(), null))
-					.timeZone(Objects.toString(query.getTimeZone(), null)).format(Objects.toString(query.getFormat(), null));
+					.timeZone(Objects.toString(query.getTimeZone(), null)).format("json");
 
 			return sqb;
 		});

src/main/java/org/springframework/data/elasticsearch/core/query/SqlQuery.java

@@ -15,18 +15,11 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.cbor;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.csv;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.json;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.smile;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.yaml;
-
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.springframework.data.elasticsearch.core.sql.types.ResponseFormat;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -38,20 +31,6 @@
  * @since 5.4
  */
 public class SqlQuery {
-	/**
-	 * Separator for CSV results.
-	 * <p>
-	 * Default, this is set to {@code ,}.
-	 */
-	@Nullable private final String delimiter;
-
-	/**
-	 * The format for the response, such as csv, json, txt, can be viewed at the {@link ResponseFormat}. The java client
-	 * of Elasticsearch only supports JSON. See {@link co.elastic.clients.transport.JsonEndpoint}
-	 * <p>
-	 * Default, this is set to {@code json}.
-	 */
-	@Nullable private final ResponseFormat format;
 
 	/**
 	 * If true, returns partial results if there are shard request timeouts or shard failures.
@@ -157,9 +136,6 @@ public class SqlQuery {
 	@Nullable private final Duration waitForCompletionTimeout;
 
 	private SqlQuery(Builder builder) {
-		this.delimiter = builder.delimiter;
-		this.format = builder.format;
-
 		this.allowPartialSearchResults = builder.allowPartialSearchResults;
 
 		this.catalog = builder.catalog;
@@ -185,16 +161,6 @@ private SqlQuery(Builder builder) {
 		this.waitForCompletionTimeout = builder.waitForCompletionTimeout;
 	}
 
-	@Nullable
-	public String getDelimiter() {
-		return delimiter;
-	}
-
-	@Nullable
-	public ResponseFormat getFormat() {
-		return format;
-	}
-
 	@Nullable
 	public Boolean getAllowPartialSearchResults() {
 		return allowPartialSearchResults;
@@ -279,9 +245,6 @@ public static Builder builder(String query) {
 	}
 
 	public static class Builder {
-		@Nullable private String delimiter;
-		@Nullable private ResponseFormat format;
-
 		@Nullable private Boolean allowPartialSearchResults;
 
 		@Nullable private String catalog;
@@ -313,24 +276,6 @@ private Builder(String query) {
 			this.query = query;
 		}
 
-		/**
-		 * Separator for CSV results.
-		 */
-		public Builder withDelimiter(String delimiter) {
-			this.delimiter = delimiter;
-
-			return this;
-		}
-
-		/**
-		 * The format for the response, such as csv, json, txt, can be viewed at the {@link ResponseFormat}.
-		 */
-		public Builder withFormat(ResponseFormat format) {
-			this.format = format;
-
-			return this;
-		}
-
 		/**
 		 * If true, returns partial results if there are shard request timeouts or shard failures.
 		 */
@@ -482,16 +427,6 @@ public Builder withWaitForCompletionTimeout(Duration waitForCompletionTimeout) {
 		}
 
 		public SqlQuery build() {
-			if (Boolean.TRUE.equals(columnar)) {
-				if (!(cbor.equals(format) || json.equals(format) || smile.equals(format) || yaml.equals(format))) {
-					throw new IllegalArgumentException("Columnar format support only YAML, CBOR, JSON and SMILE.");
-				}
-			}
-
-			if (delimiter != null && !csv.equals(format)) {
-				throw new IllegalArgumentException("Delimiter support is only available for CSV responses.");
-			}
-
 			return new SqlQuery(this);
 		}
 	}

src/main/java/org/springframework/data/elasticsearch/core/sql/ReactiveSqlOperations.java

@@ -28,7 +28,7 @@
  */
 public interface ReactiveSqlOperations {
 	/**
-	 * Execute the criteria {@code query} against elasticsearch and return result as {@link SqlResponse}
+	 * Execute the sql {@code query} against elasticsearch and return result as {@link SqlResponse}
 	 *
 	 * @param query the query to execute
 	 * @return {@link SqlResponse} containing the list of found objects

src/main/java/org/springframework/data/elasticsearch/core/sql/SqlOperations.java

@@ -26,7 +26,7 @@
  */
 public interface SqlOperations {
 	/**
-	 * Execute the criteria {@code query} against elasticsearch and return result as {@link SqlResponse}
+	 * Execute the sql {@code query} against elasticsearch and return result as {@link SqlResponse}
 	 *
 	 * @param query the query to execute
 	 * @return {@link SqlResponse} containing the list of found objects

src/main/java/org/springframework/data/elasticsearch/core/sql/SqlResponse.java

@@ -121,18 +121,6 @@ public JsonValue get(Column column) {
 			return row.get(column);
 		}
 
-		/**
-		 * This method should attempt to convert the SQL response into a document if the columns selected in an SQL query
-		 * correspond to the fields in the document.
-		 * 
-		 * @param documentClass The class that represents the document.
-		 * @return an instance of Document {@link T}.
-		 * @param <T> Document type.
-		 */
-		public <T> T toDocument(Class<T> documentClass) {
-			throw new UnsupportedOperationException("Not implemented yet.");
-		}
-
 		public static class Builder {
 			private final Map<Column, JsonValue> row = new HashMap<>();
 

src/main/java/org/springframework/data/elasticsearch/core/sql/types/ResponseFormat.java

@@ -72,7 +72,7 @@ void tearDown() {
 	static class Config {}
 	// end region
 
-	@Test
+	@Test // #2683
 	void when_search_with_an_sql_query() {
 		// Given
 		SqlQuery query = SqlQuery.builder("SELECT * FROM entity_for_sql WHERE views = 0").build();

src/main/java/org/springframework/data/elasticsearch/core/sql/types/package-info.java

@@ -19,8 +19,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.springframework.data.elasticsearch.core.sql.types.ResponseFormat.yaml;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -75,7 +73,7 @@ void tearDown() {
 	static class Config {}
 	// end region
 
-	@Test
+	@Test // #2683
 	void when_search_with_an_sql_query() {
 		// Given
 		SqlQuery query = SqlQuery.builder("SELECT * FROM entity_for_sql WHERE views = 0").build();
@@ -89,19 +87,7 @@ void when_search_with_an_sql_query() {
 		assertEquals(1, response.getRows().size());
 	}
 
-	@Test
-	void when_search_with_an_sql_query_and_txt_format() {
-		// Given
-		SqlQuery query = SqlQuery.builder("SELECT * FROM entity_for_sql WHERE views = 0").withFormat(yaml).build();
-
-		// When
-
-		// Then
-		assertThrows(IllegalArgumentException.class, () -> operations.search(query),
-				"The Elasticsearch Java Client only supports JSON format.");
-	}
-
-	@Test
+	@Test // #2683
 	void when_search_with_an_sql_query_that_has_aggregated_column() {
 		// Given
 		SqlQuery query = SqlQuery.builder("SELECT SUM(views) AS TOTAL FROM entity_for_sql").build();