-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
166 additions
and
83 deletions.
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
java-client/src/main/java/org/opensearch/client/json/PlainDeserializable.java
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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
|
|
||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| /* | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
|
|
||
| package org.opensearch.client.json; | ||
|
|
||
| import jakarta.json.stream.JsonParser; | ||
|
|
||
| import java.io.InputStream; | ||
| import java.io.Reader; | ||
|
|
||
| /** Base interface to set JSON properties **/ | ||
|
|
||
| public interface PlainDeserializable<B> { | ||
|
|
||
| B get(); | ||
|
|
||
| /** Updates object with newly provided JSON properties | ||
| @param parser the JsonParser parser | ||
| @param mapper the JsonpMapper mapper used to deserialize values | ||
| @return object | ||
| **/ | ||
|
|
||
| default B withJson(JsonParser parser, JsonpMapper mapper) { | ||
| JsonpDeserializer<?> deserializer = JsonpMapperBase.findDeserializer(this.getClass().getEnclosingClass()); | ||
| @SuppressWarnings("unchecked") | ||
| ObjectDeserializer<B> objectDeserializer = (ObjectDeserializer<B>) DelegatingDeserializer.unwrap(deserializer); | ||
| assert objectDeserializer != null; | ||
| return objectDeserializer.deserialize(get(), parser, mapper, parser.next()); | ||
| } | ||
|
|
||
| /** Updates object with newly provided JSON properties | ||
| @param inputStream the stream to read from | ||
| @return this object | ||
| * **/ | ||
| default B withJson(InputStream inputStream) { | ||
|
|
||
| //JsonbJsonpMapper mapper = new JsonbJsonpMapper(); | ||
| JsonpMapper defaultMapper = JsonpUtils.DEFAULT_JSONP_MAPPER; | ||
| return withJson(defaultMapper.jsonProvider().createParser(inputStream), defaultMapper); | ||
| } | ||
|
|
||
| /** Updates object with newly provided JSON properties | ||
| @param reader the stream to read from | ||
| @return this object | ||
| * **/ | ||
| default B withJson(Reader reader) { | ||
| JsonpMapper defaultMapper = JsonpUtils.DEFAULT_JSONP_MAPPER; | ||
| // JsonbJsonpMapper mapper = new JsonbJsonpMapper(); | ||
| JsonParser parser = defaultMapper.jsonProvider().createParser(reader); | ||
| return withJson(parser, defaultMapper); | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
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
33 changes: 33 additions & 0 deletions
33
java-client/src/test/java/org/opensearch/client/opensearch/json/PlainDeserializableTest.java
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package org.opensearch.client.opensearch.json; | ||
|
|
||
| import org.junit.Test; | ||
| import org.opensearch.client.opensearch.indices.PutIndexTemplateRequest; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.InputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.List; | ||
|
|
||
| public class PlainDeserializableTest { | ||
|
|
||
| @Test | ||
| public void testWithJsonPutIndexTemplateRequest() { | ||
|
|
||
| String stringTemplate = "{\"name\":\"My index\",\"composed_of\":[\"component1\",\"component2\"],\"index_patterns\":[\"index_pattern1\"]}"; | ||
| InputStream inputStream = new ByteArrayInputStream(stringTemplate.getBytes(StandardCharsets.UTF_8)); | ||
|
|
||
| PutIndexTemplateRequest indexTemplateRequest = new PutIndexTemplateRequest.Builder() | ||
| .name("Invalid") | ||
| .indexPatterns("index_pattern3") | ||
| .withJson(inputStream).build(); | ||
|
|
||
| String expectedName = "My index"; // Invalid will be replaced by My index from inputStream | ||
| List<String> expectedIndexPatterns = List.of("index_pattern3","index_pattern1"); | ||
| List<String> expectedComponents = List.of("component1","component2"); | ||
|
|
||
| assert expectedName.equals(indexTemplateRequest.name()); | ||
| assert expectedIndexPatterns.equals(indexTemplateRequest.indexPatterns()); | ||
| assert expectedComponents.equals(indexTemplateRequest.composedOf()); | ||
|
|
||
| } | ||
| } |