From 734b92b64b4840c8d14e3937774d80d42052a0ee Mon Sep 17 00:00:00 2001 From: Dmytro Koval Date: Wed, 15 Nov 2023 12:11:45 +0200 Subject: [PATCH] Add default variant for Normalizer --- .../_types/analysis/Normalizer.java | 2 +- .../elasticsearch/model/VariantsTest.java | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java index 3216902c6..c7a04f5ed 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java @@ -199,7 +199,7 @@ protected static void setupNormalizerDeserializer(ObjectDeserializer op op.add(Builder::custom, CustomNormalizer._DESERIALIZER, "custom"); op.add(Builder::lowercase, LowercaseNormalizer._DESERIALIZER, "lowercase"); - op.setTypeProperty("type", null); + op.setTypeProperty("type", "custom"); } diff --git a/java-client/src/test/java/co/elastic/clients/elasticsearch/model/VariantsTest.java b/java-client/src/test/java/co/elastic/clients/elasticsearch/model/VariantsTest.java index 47bd82c8d..69672db80 100644 --- a/java-client/src/test/java/co/elastic/clients/elasticsearch/model/VariantsTest.java +++ b/java-client/src/test/java/co/elastic/clients/elasticsearch/model/VariantsTest.java @@ -20,6 +20,7 @@ package co.elastic.clients.elasticsearch.model; import co.elastic.clients.elasticsearch._types.analysis.Analyzer; +import co.elastic.clients.elasticsearch._types.analysis.Normalizer; import co.elastic.clients.elasticsearch._types.mapping.Property; import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch._types.query_dsl.FunctionScore; @@ -107,7 +108,7 @@ public void testInternalTag() { } @Test - public void testDefaultInternalTag() { + public void testDefaultInternalTagForAnalyzer() { Consumer test = s -> { Analyzer a = fromJson(s, Analyzer.class); @@ -124,6 +125,23 @@ public void testDefaultInternalTag() { test.accept("{\"filter\":[\"some-filter\"],\"tokenizer\":\"some-tokenizer\"}"); } + @Test + public void testDefaultInternalTagForNormalizer() { + + Consumer test = s -> { + Normalizer normalizer = fromJson(s, Normalizer.class); + assertEquals(Normalizer.Kind.Custom, normalizer._kind()); + assertEquals("some-filter", normalizer.custom().filter().get(0)); + assertEquals("some-char-filter", normalizer.custom().charFilter().get(0)); + }; + + // Explicit type + test.accept("{\"type\":\"custom\",\"filter\":[\"some-filter\"],\"char_filter\":[\"some-char-filter\"]}"); + + // Default type + test.accept("{\"filter\":[\"some-filter\"],\"char_filter\":[\"some-char-filter\"]}"); + } + @Test public void testBuilders() { String json = "{\"exists\":{\"field\":\"foo\"}}";