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

[Backport 2.x] Backport breaking changes #1920

Merged
merged 4 commits into from
Aug 3, 2023
Merged

[Backport 2.x] Backport breaking changes #1920

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0dda05
Fix create_index/create_index_with_IOException issue caused by OpenSe…
github-actions[bot] Aug 1, 2023
b303acf
Fix renamed imports (#1911)
Yury-Fridlyand Jul 28, 2023
05d3392
Merge pull request #1914 from Bit-Quill/fix-breaking-changes-Nth-time
GumpacG Jul 31, 2023
1f259ca
Fixed imports (#1919)
GumpacG Aug 1, 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
8 changes: 7 additions & 1 deletion opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.opensearch.core.xcontent.MediaTypeParserRegistry.setDefaultMediaType;
import static org.opensearch.sql.opensearch.client.OpenSearchClient.META_CLUSTER_NAME;
import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.MappingType;

Expand All @@ -34,6 +35,7 @@
import lombok.SneakyThrows;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.lucene.search.TotalHits;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;
Expand Down Expand Up @@ -101,6 +103,11 @@ void setUp() {
client = new OpenSearchRestClient(restClient);
}

@BeforeAll
static void setUpJSON() {
setDefaultMediaType(XContentType.JSON);
}

@Test
void is_index_exist() throws IOException {
when(restClient.indices()
Expand Down Expand Up @@ -142,7 +149,6 @@ void create_index() throws IOException {
@Test
void create_index_with_IOException() throws IOException {
when(restClient.indices().create(any(), any())).thenThrow(IOException.class);

assertThrows(IllegalStateException.class,
() -> client.createIndex("test", ImmutableMap.of()));
}
Expand Down