Do not set usage context, if it's null

timgrein · timgrein · commit 27ca440cb242 · 2025-06-24T10:22:16.000+02:00
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/request/ElasticInferenceServiceDenseTextEmbeddingsRequestEntity.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/request/ElasticInferenceServiceDenseTextEmbeddingsRequestEntity.java
@@ -45,7 +45,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field(MODEL_FIELD, modelId);
 
         // optional field
-        if ((usageContext == ElasticInferenceServiceUsageContext.UNSPECIFIED) == false) {
+        if (Objects.nonNull(usageContext) && usageContext != ElasticInferenceServiceUsageContext.UNSPECIFIED) {
             builder.field(USAGE_CONTEXT, usageContext);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws`
`45`	`45`	`builder.field(MODEL_FIELD, modelId);`
`46`	`46`
`47`	`47`	`// optional field`
`48`		`- if ((usageContext == ElasticInferenceServiceUsageContext.UNSPECIFIED) == false) {`
	`48`	`+ if (Objects.nonNull(usageContext) && usageContext != ElasticInferenceServiceUsageContext.UNSPECIFIED) {`
`49`	`49`	`builder.field(USAGE_CONTEXT, usageContext);`
`50`	`50`	`}`
`51`	`51`