Refactor: includeFileSettings

Author: prdoyle

server/src/main/java/org/elasticsearch/health/node/HealthInfo.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.health.node;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -51,7 +52,7 @@ public HealthInfo(StreamInput input) throws IOException {
                 ? input.readOptionalWriteable(DataStreamLifecycleHealthInfo::new)
                 : null,
             input.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0) ? input.readMap(RepositoriesHealthInfo::new) : Map.of(),
-            input.getTransportVersion().onOrAfter(TransportVersions.FILE_SETTINGS_HEALTH_INFO)
+            includeFileSettings(input.getTransportVersion())
                 ? input.readOptionalWriteable(FileSettingsHealthInfo::new)
                 : INDETERMINATE
         );
@@ -66,8 +67,13 @@ public void writeTo(StreamOutput output) throws IOException {
         if (output.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
             output.writeMap(repositoriesInfoByNode, StreamOutput::writeWriteable);
         }
-        if (output.getTransportVersion().onOrAfter(TransportVersions.FILE_SETTINGS_HEALTH_INFO)) {
+        if (includeFileSettings(output.getTransportVersion())) {
             output.writeOptionalWriteable(fileSettingsHealthInfo);
         }
     }
+
+    public static boolean includeFileSettings(TransportVersion transportVersion) {
+        return transportVersion.onOrAfter(TransportVersions.FILE_SETTINGS_HEALTH_INFO);
+    }
+
 }

server/src/main/java/org/elasticsearch/health/node/UpdateHealthInfoCacheAction.java

@@ -92,7 +92,7 @@ public Request(StreamInput in) throws IOException {
                 this.repositoriesHealthInfo = in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)
                     ? in.readOptionalWriteable(RepositoriesHealthInfo::new)
                     : null;
-                this.fileSettingsHealthInfo = in.getTransportVersion().onOrAfter(TransportVersions.FILE_SETTINGS_HEALTH_INFO)
+                this.fileSettingsHealthInfo = HealthInfo.includeFileSettings(in.getTransportVersion())
                     ? in.readOptionalWriteable(FileSettingsService.FileSettingsHealthInfo::new)
                     : null;
             } else {
@@ -143,7 +143,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
                     out.writeOptionalWriteable(repositoriesHealthInfo);
                 }
-                if (out.getTransportVersion().onOrAfter(TransportVersions.FILE_SETTINGS_HEALTH_INFO)) {
+                if (HealthInfo.includeFileSettings(out.getTransportVersion())) {
                     out.writeOptionalWriteable(fileSettingsHealthInfo);
                 }
             } else {