[Refactor] StreamInput, StreamOutput, Writeable to core library #7783
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,8 +39,9 @@ | |
| import org.opensearch.client.TimedRequest; | ||
| import org.opensearch.client.Validatable; | ||
| import org.opensearch.common.Strings; | ||
| import org.opensearch.common.util.BytesReferenceUtil; | ||
| import org.opensearch.core.common.bytes.BytesArray; | ||
| import org.opensearch.core.common.bytes.BytesReference; | ||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.common.xcontent.XContentFactory; | ||
| import org.opensearch.common.xcontent.XContentHelper; | ||
|
|
@@ -201,7 +202,7 @@ public CreateIndexRequest mapping(String source, MediaType mediaType) { | |
| * @param source The mapping source | ||
| */ | ||
| public CreateIndexRequest mapping(XContentBuilder source) { | ||
| return mapping(BytesReferenceUtil.bytes(source), source.contentType()); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -215,7 +216,7 @@ public CreateIndexRequest mapping(Map<String, ?> source) { | |
| try { | ||
| XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON); | ||
| builder.map(source); | ||
| return mapping(BytesReferenceUtil.bytes(builder), builder.contentType()); | ||
| } catch (IOException e) { | ||
| throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e); | ||
| } | ||
|
|
@@ -265,7 +266,7 @@ public CreateIndexRequest aliases(Map<String, ?> source) { | |
| try { | ||
| XContentBuilder builder = XContentFactory.jsonBuilder(); | ||
| builder.map(source); | ||
| return aliases(BytesReferenceUtil.bytes(builder), builder.contentType()); | ||
| } catch (IOException e) { | ||
| throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e); | ||
| } | ||
|
|
@@ -275,7 +276,7 @@ public CreateIndexRequest aliases(Map<String, ?> source) { | |
| * Sets the aliases that will be associated with the index when it gets created | ||
| */ | ||
| public CreateIndexRequest aliases(XContentBuilder source) { | ||
| return aliases(BytesReferenceUtil.bytes(source), source.contentType()); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -372,7 +373,7 @@ public CreateIndexRequest source(String source, MediaType mediaType) { | |
| * Note that the mapping definition should *not* be nested under a type name. | ||
| */ | ||
| public CreateIndexRequest source(XContentBuilder source) { | ||
| return source(BytesReferenceUtil.bytes(source), source.contentType()); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,8 +32,9 @@ | |
|
|
||
| package org.opensearch.client.indices; | ||
|
|
||
| import org.opensearch.common.util.BytesReferenceUtil; | ||
| import org.opensearch.core.ParseField; | ||
| import org.opensearch.core.common.bytes.BytesReference; | ||
| import org.opensearch.core.xcontent.ConstructingObjectParser; | ||
| import org.opensearch.core.xcontent.ObjectParser; | ||
| import org.opensearch.core.xcontent.XContentBuilder; | ||
|
|
@@ -49,7 +50,7 @@ | |
|
|
||
| import static org.opensearch.core.xcontent.ConstructingObjectParser.optionalConstructorArg; | ||
| import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; | ||
| import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; | ||
|
|
||
| /** Response object for {@link GetFieldMappingsRequest} API */ | ||
| public class GetFieldMappingsResponse { | ||
|
|
@@ -129,7 +130,7 @@ public static class FieldMappingMetadata { | |
| PARSER.declareField(optionalConstructorArg(), (p, c) -> p.text(), FULL_NAME, ObjectParser.ValueType.STRING); | ||
| PARSER.declareField(optionalConstructorArg(), (p, c) -> { | ||
| final XContentBuilder jsonBuilder = jsonBuilder().copyCurrentStructure(p); | ||
| final BytesReference bytes = BytesReferenceUtil.bytes(jsonBuilder); | ||
| return bytes; | ||
| }, MAPPING, ObjectParser.ValueType.OBJECT); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,7 +49,7 @@ | |
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; | ||
|
|
||
| /** | ||
| * A client side response for a get index action. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,7 +35,7 @@ | |
| import org.opensearch.cluster.metadata.MappingMetadata; | ||
| import org.opensearch.core.ParseField; | ||
| import org.opensearch.core.xcontent.XContentParser; | ||
| import org.opensearch.core.xcontent.XContentParserUtils; | ||
| import org.opensearch.index.mapper.MapperService; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like the full import is there already: