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

Jump to bottom

Fixing string format change #334

Merged
merged 6 commits into from
Aug 8, 2023
Merged

Fixing string format change #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c070edf
Fixing strings change from main OS repo.
MitchellGale Aug 8, 2023
4275d88
Fixing issues.
MitchellGale Aug 8, 2023
ef5746c
Fixing changed syntax to toStirng.
MitchellGale Aug 8, 2023
47abe6e
Fixing changed syntax to toStirng.
MitchellGale Aug 8, 2023
62d3522
add tosttring fix to RestSQLQueryActionCursorFallbackTest
MitchellGale Aug 8, 2023
8c8afea
added unused function
MitchellGale Aug 8, 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
3 changes: 1 addition & 2 deletions integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import org.junit.Before;
import org.opensearch.client.Request;
import org.opensearch.client.Response;
import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.core.rest.RestStatus;
import org.opensearch.core.xcontent.XContentBuilder;
Expand Down Expand Up @@ -164,7 +163,7 @@ protected static void updateClusterSetting(String settingKey, Object value, bool
.endObject()
.endObject();
Request request = new Request("PUT", "_cluster/settings");
request.setJsonEntity(Strings.toString(builder));
request.setJsonEntity(builder.toString());
Response response = client().performRequest(request);
Assert
.assertEquals(RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/BlockHashJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.common.Strings;
import org.opensearch.index.query.BoolQueryBuilder;
import org.opensearch.sql.legacy.query.planner.core.ExecuteParams;
import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
Expand Down
2 changes: 1 addition & 1 deletion ...cy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/Scroll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import org.opensearch.action.search.ClearScrollResponse;
import org.opensearch.action.search.SearchResponse;
import org.opensearch.client.Client;
import org.opensearch.common.Strings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.common.Strings;
import org.opensearch.index.query.BoolQueryBuilder;
import org.opensearch.index.query.QueryBuilder;
import org.opensearch.search.SearchHit;
Expand Down
3 changes: 1 addition & 2 deletions legacy/src/main/java/org/opensearch/sql/legacy/utils/JsonPrettyFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import com.fasterxml.jackson.core.JsonFactory;
import java.io.IOException;
import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.json.JsonXContentParser;
Expand Down Expand Up @@ -37,7 +36,7 @@ public static String format(String jsonString) throws IOException {
){
contentBuilder.copyCurrentStructure(contentParser);
}
return Strings.toString(contentBuilder);
return contentBuilder.toString();
}

private JsonPrettyFormatter() {
Expand Down
3 changes: 1 addition & 2 deletions .../src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.opensearch.client.node.NodeClient;
import org.opensearch.common.Strings;
import org.opensearch.common.inject.Injector;
import org.opensearch.common.inject.ModulesBuilder;
import org.opensearch.common.util.concurrent.ThreadContext;
Expand Down Expand Up @@ -93,7 +92,7 @@ private static SQLQueryRequest createSqlQueryRequest(String query, Optional<Stri
builder.field("fetch_size").value(fetchSize.get());
}
builder.endObject();
JSONObject jsonContent = new JSONObject(Strings.toString(builder));
JSONObject jsonContent = new JSONObject(builder.toString());

return new SQLQueryRequest(jsonContent, query, QUERY_API_ENDPOINT,
Map.of("format", "jdbc"), cursorId.orElse(""));
Expand Down
2 changes: 1 addition & 1 deletion legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.junit.Test;
import org.mockito.Mockito;
import org.opensearch.client.Client;
import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.common.Strings;
import org.opensearch.index.query.AbstractQueryBuilder;
import org.opensearch.index.query.MultiMatchQueryBuilder;
import org.opensearch.search.builder.SearchSourceBuilder.ScriptField;
Expand Down
3 changes: 1 addition & 2 deletions plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.opensearch.client.Requests;
import org.opensearch.client.node.NodeClient;
import org.opensearch.common.Strings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.core.xcontent.XContentBuilder;
Expand Down Expand Up @@ -109,7 +108,7 @@ private Settings getAndFilterSettings(Map<String, ?> source) {
XContentBuilder builder = XContentFactory.jsonBuilder();
builder.map(source);
Settings.Builder settingsBuilder = Settings.builder()
.loadFromSource(Strings.toString(builder), builder.contentType());
.loadFromSource(builder.toString(), builder.contentType());
settingsBuilder.keys().removeIf(key -> {
for (String prefix : SETTINGS_PREFIX) {
if (key.startsWith(prefix)) {
Expand Down
Loading