From 06eee4bdcd87577183d39fa2b9c16af200baa481 Mon Sep 17 00:00:00 2001
From: jdnvn <joe@donovan.to>
Date: Thu, 22 Aug 2024 11:54:51 -0400
Subject: [PATCH] add conditional for default model id support when validating
 model id presence

---
 .../query/NeuralSparseQueryBuilder.java            | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opensearch/neuralsearch/query/NeuralSparseQueryBuilder.java b/src/main/java/org/opensearch/neuralsearch/query/NeuralSparseQueryBuilder.java
index f46997d5e..56f320290 100644
--- a/src/main/java/org/opensearch/neuralsearch/query/NeuralSparseQueryBuilder.java
+++ b/src/main/java/org/opensearch/neuralsearch/query/NeuralSparseQueryBuilder.java
@@ -376,16 +376,24 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
     }
 
     private static void validateForRewrite(String queryText, String modelId) {
-        if (StringUtils.isBlank(queryText) || StringUtils.isBlank(modelId)) {
+        if (StringUtils.isBlank(modelId) && !isClusterOnOrAfterMinReqVersionForDefaultModelIdSupport()) {
             throw new IllegalArgumentException(
                 String.format(
                     Locale.ROOT,
-                    "%s and %s cannot be null",
-                    QUERY_TEXT_FIELD.getPreferredName(),
+                    "%s cannot be null",
                     MODEL_ID_FIELD.getPreferredName()
                 )
             );
         }
+        if (StringUtils.isBlank(queryText)) {
+            throw new IllegalArgumentException(
+                String.format(
+                    Locale.ROOT,
+                    "%s cannot be null",
+                    QUERY_TEXT_FIELD.getPreferredName()
+                )
+            );
+        }
     }
 
     private static void validateFieldType(MappedFieldType fieldType) {