fixing tests

Author: l-trotta

java-client/src/test/java/co/elastic/clients/documentation/usage/SearchingTest.java

@@ -167,7 +167,7 @@ public void searchTemplate() throws Exception {
             .id("query-script") // <1>
             .script(s -> s
                 .lang("mustache")
-                .source("{\"query\":{\"match\":{\"{{field}}\":\"{{value}}\"}}}")
+                .source(so -> so.scriptString("{\"query\":{\"match\":{\"{{field}}\":\"{{value}}\"}}}"))
             ));
         //end::search-template-script
 

java-client/src/test/java/co/elastic/clients/elasticsearch/end_to_end/RequestTest.java

@@ -259,8 +259,8 @@ public void testCatRequest() throws IOException {
         NodesResponse nodes = client.cat().nodes(_0 -> _0);
         System.out.println(ModelTestCase.toJson(nodes, client._transport().jsonpMapper()));
 
-        assertEquals(1, nodes.valueBody().size());
-        assertEquals("*", nodes.valueBody().get(0).master());
+        assertEquals(1, nodes.nodes().size());
+        assertEquals("*", nodes.nodes().get(0).master());
     }
 
     @Test

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

@@ -122,10 +122,10 @@ public void testAdditionalPropertyOnContainer() {
 
         {
             SortOptions so = SortOptions.of(_0 -> _0
-                .script(_1 -> _1.script(_3 -> _3.source("blah")))
+                .script(_1 -> _1.script(_3 -> _3.source(_4 -> _4.scriptString("blah"))))
             );
             so = checkJsonRoundtrip(so, "{\"_script\":{\"script\":{\"source\":\"blah\"}}}");
-            assertEquals("blah", so.script().script().source());
+            assertEquals("blah", so.script().script().source().scriptString());
 
         }
 

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

@@ -86,15 +86,15 @@ public void loadAllDeserializers() throws Exception {
     public void testArrayValueBody() {
 
         NodesResponse nr = NodesResponse.of(_0 -> _0
-            .valueBody(_1 -> _1.bulkTotalOperations("1"))
-            .valueBody(_1 -> _1.bulkTotalOperations("2"))
+            .nodes(_1 -> _1.bulkTotalOperations("1"))
+            .nodes(_1 -> _1.bulkTotalOperations("2"))
         );
 
         checkJsonRoundtrip(nr, "[{\"bulk.total_operations\":\"1\"},{\"bulk.total_operations\":\"2\"}]");
 
-        assertEquals(2, nr.valueBody().size());
-        assertEquals("1", nr.valueBody().get(0).bulkTotalOperations());
-        assertEquals("2", nr.valueBody().get(1).bulkTotalOperations());
+        assertEquals(2, nr.nodes().size());
+        assertEquals("1", nr.nodes().get(0).bulkTotalOperations());
+        assertEquals("2", nr.nodes().get(1).bulkTotalOperations());
     }
 
     @Test

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

@@ -43,13 +43,13 @@ public class UnionTests extends ModelTestCase {
 
     @Test
     public void testScriptDeserializer() {
-        // A union discriminated by its field names (source -> inline, id -> stored)
+        // the source field in script is both a shortcut and an externally tagged union
         {
             Script s = Script.of(_1 -> _1
-                    .source("a script")
+                    .source(_2 -> _2.scriptString("a script"))
             );
             s = checkJsonRoundtrip(s, "{\"source\":\"a script\"}");
-            assertEquals("a script", s.source());
+            assertEquals("a script", s.source().scriptString());
         }
 
         {
@@ -63,7 +63,7 @@ public void testScriptDeserializer() {
         {
             // Test shortcut property
             Script s = fromJson("\"a script\"", Script.class);
-            assertEquals("a script", s.source());
+            assertEquals("a script", s.source().scriptString());
         }
     }
 

java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java

@@ -98,7 +98,7 @@ public void i0298_runtimeMappings() throws Exception {
         RuntimeField runtimeField = RuntimeField.of(rf -> rf
             .type(RuntimeFieldType.Double)
             .script(Script.of(s -> s
-                .source("emit(doc['price'].value * 1.19)")
+                .source(so -> so.scriptString("emit(doc['price'].value * 1.19)"))
             ))
         );
 

java-client/src/test/java/co/elastic/clients/json/WithJsonTest.java

@@ -128,7 +128,7 @@ public void testTypeWithParent() {
             .withJson(new StringReader(json))
         );
 
-        assertEquals("return doc;", is.source());
+        assertEquals("return doc;", is.source().scriptString());
     }
 
     @Test