Add default variant to Analyzer (#522) (#523)

elastic · Mar 6, 2023 · 0b9456d · 0b9456d
1 parent c7117b4
commit 0b9456d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Analyzer.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Analyzer.java
@@ -628,7 +628,7 @@ protected static void setupAnalyzerDeserializer(ObjectDeserializer<Builder> op)
 			builder._custom(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
 		});
 
-		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
@@ -19,6 +19,7 @@
 
 package co.elastic.clients.elasticsearch.model;
 
+import co.elastic.clients.elasticsearch._types.analysis.Analyzer;
 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;
@@ -29,6 +30,8 @@
 import co.elastic.clients.json.JsonData;
 import org.junit.jupiter.api.Test;
 
+import java.util.function.Consumer;
+
 public class VariantsTest extends ModelTestCase {
 
     @Test
@@ -102,6 +105,24 @@ public void testInternalTag() {
         assertTrue(property.ip().fields().get("a-field").float_().coerce());
     }
 
+    @Test
+    public void testDefaultInternalTag() {
+
+        Consumer<String> test = s -> {
+            Analyzer a = fromJson(s, Analyzer.class);
+            assertEquals(Analyzer.Kind.Custom, a._kind());
+            assertEquals("some-filter", a.custom().filter().get(0));
+            assertTrue(a.custom().charFilter().isEmpty());
+            assertEquals("some-tokenizer", a.custom().tokenizer());
+        };
+
+        // Explicit type
+        test.accept("{\"type\":\"custom\",\"filter\":[\"some-filter\"],\"tokenizer\":\"some-tokenizer\"}");
+
+        // Default type
+        test.accept("{\"filter\":[\"some-filter\"],\"tokenizer\":\"some-tokenizer\"}");
+    }
+
     @Test
     public void testBuilders() {
         String json = "{\"exists\":{\"field\":\"foo\"}}";