function score deserialization bug fix

Author: l-trotta

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/FunctionScoreQuery.java

@@ -385,7 +385,7 @@ protected static void setupFunctionScoreQueryDeserializer(ObjectDeserializer<Fun
 		op.add(Builder::query, Query._DESERIALIZER, "query");
 		op.add(Builder::scoreMode, FunctionScoreMode._DESERIALIZER, "score_mode");
 
-		op.shortcutProperty("functions", true);
+		op.shortcutProperty("functions");
 
 	}
 

java-client/src/test/java/co/elastic/clients/elasticsearch/model/BehaviorsTest.java

@@ -42,6 +42,8 @@
 import co.elastic.clients.util.MapBuilder;
 import org.junit.jupiter.api.Test;
 
+import static co.elastic.clients.elasticsearch._types.query_dsl.Query.Kind.MatchAll;
+
 public class BehaviorsTest extends ModelTestCase {
 
     /**
@@ -249,46 +251,88 @@ public void testObjectShortcutProperty() {
         assertEquals("foo", req.query().term().field());
         assertEquals("bar", req.query().term().value().stringValue());
     }
-    
+
     @Test
     public void testFunctionScoreQuery() {
-        String shortcut =
-            "{" +
-            "  \"gauss\": {" +
-            "    \"date\": {" +
-            "      \"origin\": \"2013-09-17\", " +
-            "      \"scale\": \"10d\"," +
-            "      \"offset\": \"5d\",         " +
-            "      \"decay\": 0.5" +
-            "    }," +
-            "    \"multi_value_mode\": \"avg\"" +
-            "  }" +
+
+        String queryOnly = "{" +
+            "          \"query\": {\n" +
+            "            \"match_all\": {}\n" +
+            "          }\n" +
             "}";
 
         String full =
             "{" +
-            "  \"functions\": [" +
-            "    {" +
-            "      \"gauss\": {" +
-            "        \"date\": {" +
-            "          \"origin\": \"2013-09-17\"," +
-            "          \"scale\": \"10d\"," +
-            "          \"offset\": \"5d\"," +
-            "          \"decay\": 0.5" +
-            "        }," +
-            "        \"multi_value_mode\": \"avg\"" +
-            "      }" +
-            "    }" +
-            "  ]" +
-            "}";
+                "  \"functions\": [" +
+                "    {" +
+                "      \"gauss\": {" +
+                "        \"date\": {" +
+                "          \"origin\": \"2013-09-17\"," +
+                "          \"scale\": \"10d\"," +
+                "          \"offset\": \"5d\"," +
+                "          \"decay\": 0.5" +
+                "        }," +
+                "        \"multi_value_mode\": \"avg\"" +
+                "      }" +
+                "    }" +
+                "  ]" +
+                "}";
+
+        String nested =
+            "{\n" +
+                "      \"functions\": [\n" +
+                "        {\n" +
+                "      \"gauss\": {" +
+                "        \"date\": {" +
+                "          \"origin\": \"2013-09-17\"," +
+                "          \"scale\": \"10d\"," +
+                "          \"offset\": \"5d\"," +
+                "          \"decay\": 0.5" +
+                "        }," +
+                "        \"multi_value_mode\": \"avg\"" +
+                "          }\n" +
+                "        }\n" +
+                "      ],\n" +
+                "      \"query\": {\n" +
+                "        \"function_score\": {\n" +
+                "          \"query\": {\n" +
+                "            \"match_all\": {}\n" +
+                "          }\n" +
+                "        }\n" +
+                "      }\n" +
+                "    }";
+
+
+        String shortcut =
+            "{" +
+                "  \"gauss\": {" +
+                "    \"date\": {" +
+                "      \"origin\": \"2013-09-17\", " +
+                "      \"scale\": \"10d\"," +
+                "      \"offset\": \"5d\",         " +
+                "      \"decay\": 0.5" +
+                "    }," +
+                "    \"multi_value_mode\": \"avg\"" +
+                "  }" +
+                "}";
 
         FunctionScoreQuery fsq;
 
+        // should always work, this is just a function score query with just one "query" field
+        fsq = fromJson(queryOnly, FunctionScoreQuery.class);
+        assertEquals(MatchAll, fsq.query()._kind());
+
+        // should also work
         fsq = fromJson(full, FunctionScoreQuery.class);
         assertEquals(MultiValueMode.Avg, fsq.functions().get(0).gauss().untyped().multiValueMode());
 
+        // should also work
+        fsq = fromJson(nested, FunctionScoreQuery.class);
+        assertEquals(MatchAll, fsq.query().functionScore().query()._kind());
+
+        // should not work, shortcut for function score query is currently not supported
         fsq = fromJson(shortcut, FunctionScoreQuery.class);
-        assertEquals(MultiValueMode.Avg, fsq.functions().get(0).gauss().untyped().multiValueMode());
+        assertEquals(0, fsq.functions().size());
     }
 
     @Test