Version is not optional.

Signed-off-by: pieper <mike.pieper@ser.de>
opensearch-project · Sep 29, 2023 · ecded52 · ecded52
1 parent aa5e13f
commit ecded52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsResponse.java
@@ -62,7 +62,7 @@ public class TermvectorsResponse implements JsonpSerializable {
 
 	private final long took;
 
-	private final Long version;
+	private final long version;
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -73,7 +73,7 @@ private TermvectorsResponse(Builder builder) {
 		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
 		this.termVectors = ApiTypeHelper.unmodifiable(builder.termVectors);
 		this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
-		this.version = builder.version;
+		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
 
 	}
 
@@ -157,10 +157,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeKey("took");
 		generator.write(this.took);
 
-		if (null != this.version) {
-			generator.writeKey("_version");
-			generator.write(this.version);
-		}
+		generator.writeKey("_version");
+		generator.write(this.version);
 
 	}
 

diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
@@ -179,6 +179,7 @@ public void testTermvectorsResponseOptionals() {
         final TermvectorsResponse response = TermvectorsResponse.of(b -> b
             .index("index")
             .id("id")
+            .version(1)
             .found(true)
             .took(0)
             .termVectors("key1", tvb -> tvb
@@ -190,7 +191,7 @@ public void testTermvectorsResponseOptionals() {
 
         String str = toJson(response);
         assertEquals("{\"found\":true,\"_id\":\"id\",\"_index\":\"index\","
-            +"\"term_vectors\":{\"key1\":{\"terms\":{\"term1\":{\"score\":0.3}}}},\"took\":0}", str);
+            +"\"term_vectors\":{\"key1\":{\"terms\":{\"term1\":{\"score\":0.3}}}},\"took\":0,\"_version\":1}", str);
 
         final TermvectorsResponse response2 = fromJson(str, TermvectorsResponse._DESERIALIZER);
         assertEquals(response.index(), response2.index());