Skip to content

Commit

Permalink
Default normalizer deserialization to custom type when unspecified
Browse files Browse the repository at this point in the history
Signed-off-by: beniamin.jedrychowsk <[email protected]>
  • Loading branch information
Blomex committed Jul 25, 2024
1 parent c098d8b commit 10f2928
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
### Removed

### Fixed

- Fixed error when deserializing a normalizer without 'type' [#1111](https://github.com/opensearch-project/opensearch-java/pull/1111)
### Security

## [2.12.0] - 07/22/2024
Expand Down Expand Up @@ -512,4 +512,4 @@ This section is for maintaining a changelog for all breaking changes for the cli
[2.5.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.4.0...v2.5.0
[2.4.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.3.0...v2.4.0
[2.3.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.2.0...v2.3.0
[2.2.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.1.0...v2.2.0
[2.2.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.1.0...v2.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ protected static void setupNormalizerDeserializer(ObjectDeserializer<Builder> op
op.add(Builder::custom, CustomNormalizer._DESERIALIZER, "custom");
op.add(Builder::lowercase, LowercaseNormalizer._DESERIALIZER, "lowercase");

op.setTypeProperty("type", null);
op.setTypeProperty("type", Kind.Custom.jsonValue());

}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* 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.
*/

package org.opensearch.client.opensearch._types.analysis;

import org.junit.Test;
import org.opensearch.client.opensearch.model.ModelTestCase;

public class NormalizerDeserializerTest extends ModelTestCase {
@Test
public void deserializesTypelessCustomAnalyzer() {
String json = "{\n" +
" \"filter\": \"lowercase\"\n" +
" }";

Normalizer normalizer = fromJson(json, Normalizer._DESERIALIZER);
assertTrue(normalizer.isCustom());
assertEquals("lowercase", normalizer.custom().filter().get(0));
}
}

0 comments on commit 10f2928

Please sign in to comment.