Keep the deprecation warning and introduce a title.

Author: gmarouli

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/SourceModeRollingUpgradeIT.java

@@ -46,7 +46,7 @@ public void testConfigureStoredSourceBeforeIndexCreationLegacy() throws IOExcept
                   }
                 }""";
             var putComponentTemplateRequest = new Request("PUT", "/_component_template/" + templateName);
-            putComponentTemplateRequest.setOptions(expectWarnings(SourceFieldMapper.DEPRECATION_WARNING));
+            putComponentTemplateRequest.setOptions(expectWarnings(SourceFieldMapper.DEPRECATION_WARNING_TITLE));
             putComponentTemplateRequest.setJsonEntity(storedSourceMapping);
             assertOK(client().performRequest(putComponentTemplateRequest));
             assertDeprecationWarningForTemplate(templateName);
@@ -70,7 +70,7 @@ public void testConfigureStoredSourceWhenIndexIsCreatedLegacy() throws IOExcepti
                   }
                 }""";
             var putComponentTemplateRequest = new Request("PUT", "/_component_template/" + templateName);
-            putComponentTemplateRequest.setOptions(expectWarnings(SourceFieldMapper.DEPRECATION_WARNING));
+            putComponentTemplateRequest.setOptions(expectWarnings(SourceFieldMapper.DEPRECATION_WARNING_TITLE));
             putComponentTemplateRequest.setJsonEntity(storedSourceMapping);
             assertOK(client().performRequest(putComponentTemplateRequest));
             assertDeprecationWarningForTemplate(templateName);
@@ -86,6 +86,7 @@ private void assertDeprecationWarningForTemplate(String templateName) throws IOE
         Map<?, ?> issuesByTemplate = (Map<?, ?>) response.get("templates");
         assertThat(issuesByTemplate.containsKey(templateName), equalTo(true));
         var templateIssues = (List<?>) issuesByTemplate.get(templateName);
-        assertThat(((Map<?, ?>) templateIssues.getFirst()).get("message"), equalTo(SourceFieldMapper.DEPRECATION_WARNING));
+        assertThat(((Map<?, ?>) templateIssues.getFirst()).get("message"), equalTo(SourceFieldMapper.DEPRECATION_WARNING_TITLE));
+        assertThat(((Map<?, ?>) templateIssues.getFirst()).get("details"), equalTo(SourceFieldMapper.DEPRECATION_WARNING));
     }
 }

server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java

@@ -58,9 +58,9 @@ public class SourceFieldMapper extends MetadataFieldMapper {
 
     public static final String LOSSY_PARAMETERS_ALLOWED_SETTING_NAME = "index.lossy.source-mapping-parameters";
 
-    public static final String DEPRECATION_WARNING = "Configuring source mode in mappings is deprecated.";
+    public static final String DEPRECATION_WARNING_TITLE = "Configuring source mode in mappings is deprecated.";
 
-    public static final String DEPRECATION_DETAILS = "Configuring source mode in mappings is deprecated and will be removed "
+    public static final String DEPRECATION_WARNING = "Configuring source mode in mappings is deprecated and will be removed "
         + "in future versions. Use [index.mapping.source.mode] index setting instead.";
 
     /** The source mode */

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TemplateDeprecationChecker.java

@@ -122,9 +122,9 @@ private DeprecationIssue checkSourceModeInComponentTemplates(ComponentTemplate t
                     if (sourceMap.containsKey("mode")) {
                         return new DeprecationIssue(
                             DeprecationIssue.Level.CRITICAL,
-                            SourceFieldMapper.DEPRECATION_WARNING,
+                            SourceFieldMapper.DEPRECATION_WARNING_TITLE,
                             "https://ela.st/migrate-source-mode",
-                            SourceFieldMapper.DEPRECATION_DETAILS,
+                            SourceFieldMapper.DEPRECATION_WARNING,
                             false,
                             null
                         );

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/TemplateDeprecationCheckerTests.java

@@ -51,9 +51,9 @@ public void testCheckSourceModeInComponentTemplates() throws IOException {
         Map<String, List<DeprecationIssue>> issuesByComponentTemplate = checker.check(clusterState);
         final DeprecationIssue expected = new DeprecationIssue(
             DeprecationIssue.Level.CRITICAL,
-            SourceFieldMapper.DEPRECATION_WARNING,
+            SourceFieldMapper.DEPRECATION_WARNING_TITLE,
             "https://ela.st/migrate-source-mode",
-            SourceFieldMapper.DEPRECATION_DETAILS,
+            SourceFieldMapper.DEPRECATION_WARNING,
             false,
             null
         );