Omit xcontent when value is not true

Author: prwhelan

server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java

@@ -431,9 +431,16 @@ public record CrossProjectModeOptions(boolean resolveIndexExpression) implements
 
         private static final String INDEX_EXPRESSION_NAME = "resolve_cross_project_index_expression";
 
+        public static CrossProjectModeOptions parseParameter(Object resolveIndexExpression, CrossProjectModeOptions defaultOptions) {
+            if (resolveIndexExpression == null) {
+                return defaultOptions != null ? defaultOptions : DEFAULT;
+            }
+            return new CrossProjectModeOptions(nodeBooleanValue(resolveIndexExpression, INDEX_EXPRESSION_NAME));
+        }
+
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            return builder.field(INDEX_EXPRESSION_NAME, resolveIndexExpression);
+            return resolveIndexExpression ? builder.field(INDEX_EXPRESSION_NAME, resolveIndexExpression) : builder;
         }
 
         @Override
@@ -1198,6 +1205,7 @@ public static IndicesOptions fromMap(Map<String, Object> map, IndicesOptions def
                 : map.get("ignoreUnavailable"),
             map.containsKey(WildcardOptions.ALLOW_NO_INDICES) ? map.get(WildcardOptions.ALLOW_NO_INDICES) : map.get("allowNoIndices"),
             map.containsKey(GatekeeperOptions.IGNORE_THROTTLED) ? map.get(GatekeeperOptions.IGNORE_THROTTLED) : map.get("ignoreThrottled"),
+            map.get(CrossProjectModeOptions.INDEX_EXPRESSION_NAME),
             defaultSettings
         );
     }
@@ -1214,8 +1222,7 @@ public static boolean isIndicesOptions(String name) {
             || GatekeeperOptions.IGNORE_THROTTLED.equals(name)
             || "ignoreThrottled".equals(name)
             || WildcardOptions.ALLOW_NO_INDICES.equals(name)
-            || "allowNoIndices".equals(name)
-            || CrossProjectModeOptions.INDEX_EXPRESSION_NAME.equals(name);
+            || "allowNoIndices".equals(name);
     }
 
     public static IndicesOptions fromParameters(
@@ -1228,12 +1235,32 @@ public static IndicesOptions fromParameters(
         return fromParameters(wildcardsString, ignoreUnavailableString, allowNoIndicesString, ignoreThrottled, null, defaultSettings);
     }
 
+    public static IndicesOptions fromParameters(
+        Object wildcardsString,
+        Object ignoreUnavailableString,
+        Object allowNoIndicesString,
+        Object ignoreThrottled,
+        Object resolveCrossProject,
+        IndicesOptions defaultSettings
+    ) {
+        return fromParameters(
+            wildcardsString,
+            ignoreUnavailableString,
+            allowNoIndicesString,
+            ignoreThrottled,
+            null,
+            resolveCrossProject,
+            defaultSettings
+        );
+    }
+
     public static IndicesOptions fromParameters(
         Object wildcardsString,
         Object ignoreUnavailableString,
         Object allowNoIndicesString,
         Object ignoreThrottled,
         Object failureStoreString,
+        Object resolveCrossProject,
         IndicesOptions defaultSettings
     ) {
         if (wildcardsString == null
@@ -1252,6 +1279,7 @@ public static IndicesOptions fromParameters(
             .concreteTargetOptions(ConcreteTargetOptions.fromParameter(ignoreUnavailableString, defaultSettings.concreteTargetOptions))
             .wildcardOptions(wildcards)
             .gatekeeperOptions(gatekeeperOptions)
+            .crossProjectModeOptions(CrossProjectModeOptions.parseParameter(resolveCrossProject, defaultSettings.crossProjectModeOptions))
             .build();
     }
 

server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java

@@ -376,7 +376,10 @@ public void testToXContent() throws IOException {
         assertThat(map.get("ignore_unavailable"), equalTo(concreteTargetOptions.allowUnavailableTargets()));
         assertThat(map.get("allow_no_indices"), equalTo(wildcardOptions.allowEmptyExpressions()));
         assertThat(map.get("ignore_throttled"), equalTo(gatekeeperOptions.ignoreThrottled()));
-        assertThat(map.get("resolve_cross_project_index_expression"), equalTo(crossProjectModeOptions.resolveIndexExpression()));
+        assertThat(
+            map.get("resolve_cross_project_index_expression"),
+            equalTo(crossProjectModeOptions.resolveIndexExpression() ? true : null)
+        );
     }
 
     public void testFromXContent() throws IOException {