Remove extraneous method parameter for composable version checks (#102221)

Author: thecoop

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/TemplateUtils.java

@@ -134,25 +134,10 @@ public static boolean checkTemplateExistsAndVersionIsGTECurrentVersion(String te
      * @param templateName Name of the index template
      * @param state Cluster state
      * @param logger Logger
-     * @param versionComposableTemplateExpected In which version of Elasticsearch did this template switch to being a composable template?
-     *                                          <code>null</code> means the template hasn't been switched yet.
      */
-    public static boolean checkTemplateExistsAndIsUpToDate(
-        String templateName,
-        String versionKey,
-        ClusterState state,
-        Logger logger,
-        Version versionComposableTemplateExpected
-    ) {
+    public static boolean checkTemplateExistsAndIsUpToDate(String templateName, String versionKey, ClusterState state, Logger logger) {
 
-        return checkTemplateExistsAndVersionMatches(
-            templateName,
-            versionKey,
-            state,
-            logger,
-            Version.CURRENT::equals,
-            versionComposableTemplateExpected
-        );
+        return checkTemplateExistsAndVersionMatches(templateName, versionKey, state, logger, Version.CURRENT::equals);
     }
 
     /**
@@ -162,32 +147,20 @@ public static boolean checkTemplateExistsAndIsUpToDate(
      * @param state Cluster state
      * @param logger Logger
      * @param predicate Predicate to execute on version check
-     * @param versionComposableTemplateExpected In which version of Elasticsearch did this template switch to being a composable template?
-     *                                          <code>null</code> means the template hasn't been switched yet.
      */
     public static boolean checkTemplateExistsAndVersionMatches(
         String templateName,
         String versionKey,
         ClusterState state,
         Logger logger,
-        Predicate<Version> predicate,
-        Version versionComposableTemplateExpected
+        Predicate<Version> predicate
     ) {
 
-        CompressedXContent mappings;
-        if (versionComposableTemplateExpected != null && state.nodes().getMinNodeVersion().onOrAfter(versionComposableTemplateExpected)) {
-            ComposableIndexTemplate templateMeta = state.metadata().templatesV2().get(templateName);
-            if (templateMeta == null) {
-                return false;
-            }
-            mappings = templateMeta.template().mappings();
-        } else {
-            IndexTemplateMetadata templateMeta = state.metadata().templates().get(templateName);
-            if (templateMeta == null) {
-                return false;
-            }
-            mappings = templateMeta.getMappings();
+        IndexTemplateMetadata templateMeta = state.metadata().templates().get(templateName);
+        if (templateMeta == null) {
+            return false;
         }
+        CompressedXContent mappings = templateMeta.getMappings();
 
         // check all mappings contain correct version in _meta
         // we have to parse the source here which is annoying

x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java

@@ -215,7 +215,7 @@ public void installIndexTemplate(ActionListener<Boolean> listener) {
     }
 
     private boolean isTemplateUpToDate(ClusterState state) {
-        return TemplateUtils.checkTemplateExistsAndIsUpToDate(TEMPLATE_NAME, TEMPLATE_META_VERSION_KEY, state, logger, null);
+        return TemplateUtils.checkTemplateExistsAndIsUpToDate(TEMPLATE_NAME, TEMPLATE_META_VERSION_KEY, state, logger);
     }
 
     public void deleteDocument(DocumentVersion version, WriteRequest.RefreshPolicy refreshPolicy, ActionListener<DeleteResponse> listener) {