Skip to content
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

Manually Backporting 1779 to 2.x #1796

Merged
merged 5 commits into from
Jun 28, 2023
Merged

Manually Backporting 1779 to 2.x #1796

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d764285
Fix CSV/RAW output header being application/json rather than plain/te…
matthewryanwells Jun 27, 2023
7de27e1
updated tests
matthewryanwells Jun 27, 2023
3e7d814
updated tests to return name
matthewryanwells Jun 28, 2023
0804542
changed tests to return value
matthewryanwells Jun 28, 2023
093dc43
removed unneeded imports
matthewryanwells Jun 28, 2023
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
5 changes: 4 additions & 1 deletion integ-test/src/test/java/org/opensearch/sql/sql/CsvFormatIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import java.io.IOException;
import java.util.Locale;

import org.apache.http.Header;
import org.apache.http.HeaderElement;
import org.apache.http.ParseException;
matthewryanwells marked this conversation as resolved.
Show resolved Hide resolved
import org.junit.Test;
import org.opensearch.client.Request;
import org.opensearch.client.Response;
Expand Down Expand Up @@ -64,6 +67,6 @@ public void contentHeaderTest() throws IOException {

Response response = client().performRequest(sqlRequest);

assertEquals(response.getEntity().getContentType(), "content-type: " + CONTENT_TYPE);
assertEquals(response.getEntity().getContentType().getName(), CONTENT_TYPE);
}
}
2 changes: 1 addition & 1 deletion integ-test/src/test/java/org/opensearch/sql/sql/RawFormatIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ public void contentHeaderTest() throws IOException {

Response response = client().performRequest(sqlRequest);

assertEquals(response.getEntity().getContentType(), "content-type: " + CONTENT_TYPE);
assertEquals(response.getEntity().getContentType().getName(), CONTENT_TYPE);
}
}
2 changes: 1 addition & 1 deletion integ-test/src/test/java/org/opensearch/sql/sql/SimpleQueryStringIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ public void contentHeaderTest() throws IOException {

Response response = client().performRequest(sqlRequest);

assertEquals(response.getEntity().getContentType(), "content-type: " + CONTENT_TYPE);
assertEquals(response.getEntity().getContentType().getName(), CONTENT_TYPE);
}
}