Changed method name and relaxed when it is called

Author: markharwood

qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

@@ -923,8 +923,8 @@ public void testSnapshotRestore() throws IOException {
         // We therefore use the deprecated typed APIs when running against the current version.
         if (isRunningAgainstOldCluster() == false) {
             createTemplateRequest.addParameter(INCLUDE_TYPE_NAME_PARAMETER, "true");
-            createTemplateRequest.setOptions(expectTypeRemovalWarnings());
         }
+        createTemplateRequest.setOptions(allowTypeRemovalWarnings());
 
         client().performRequest(createTemplateRequest);
 
@@ -1133,8 +1133,8 @@ && getOldClusterVersion().onOrAfter(Version.V_6_1_0) && getOldClusterVersion().b
         // We therefore use the deprecated typed APIs when running against the current version.
         if (isRunningAgainstOldCluster() == false) {
             getTemplateRequest.addParameter(INCLUDE_TYPE_NAME_PARAMETER, "true");
-            getTemplateRequest.setOptions(expectTypeRemovalWarnings());
         }
+        getTemplateRequest.setOptions(allowTypeRemovalWarnings());
 
         Map<String, Object> getTemplateResponse = entityAsMap(client().performRequest(getTemplateRequest));
         Map<String, Object> expectedTemplate = new HashMap<>();

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -263,7 +263,7 @@ public static RequestOptions expectWarnings(String... warnings) {
      * @deprecated this method is only required while we deprecate types and can be removed in 8.0
      */
     @Deprecated
-    public static RequestOptions expectTypeRemovalWarnings() {
+    public static RequestOptions allowTypeRemovalWarnings() {
         Builder builder = RequestOptions.DEFAULT.toBuilder();
         builder.setWarningsHandler(new WarningsHandler() {
                 @Override