Improve the error message when an index is incompatible with field aliases.

Author: jtibshirani

modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java

@@ -377,7 +377,7 @@ public void testSerializationFailsUnlessFetched() throws IOException {
     }
 
     public void testFieldAlias() throws IOException {
-        assumeTrue("Test only runs when there is a single mapping type.", isSingleType());
+        assumeTrue("Test only runs on indexes that enforce a single mapping type.", isSingleType());
 
         QueryShardContext shardContext = createShardContext();
 

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

@@ -115,7 +115,8 @@ public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext
         private static void checkIndexCompatibility(IndexSettings settings, String name) {
             if (!settings.isSingleType()) {
                 throw new IllegalStateException("Cannot create a field alias [" + name + "] " +
-                    "on index [" + settings.getIndex().getName() + "], as it has multiple types.");
+                    "for index [" + settings.getIndex().getName() + "]. Field aliases can only " +
+                    "be specified on indexes that enforce a single mapping type.");
             }
         }
     }

server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperTests.java

@@ -200,7 +200,7 @@ public void testFieldAliasDisallowedWithMultipleTypes() throws IOException {
         .endObject());
         IllegalStateException e = expectThrows(IllegalStateException.class,
             () -> parser.parse("type", new CompressedXContent(mapping)));
-        assertEquals("Cannot create a field alias [alias-field] on index [alias-test],"
-            + " as it has multiple types.", e.getMessage());
+        assertEquals("Cannot create a field alias [alias-field] for index [alias-test]. Field aliases" +
+            " can only be specified on indexes that enforce a single mapping type.", e.getMessage());
     }
 }

server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java

@@ -263,7 +263,7 @@ public void testDoToQuery_msmScriptField() throws Exception {
     }
 
     public void testFieldAlias() {
-        assumeTrue("Test runs only when there is a single mapping type.", isSingleType());
+        assumeTrue("Test only runs on indexes that enforce a single mapping type.", isSingleType());
 
         List<String> randomTerms = Arrays.asList(generateRandomStringArray(5, 10, false, false));
         TermsSetQueryBuilder queryBuilder = new TermsSetQueryBuilder(STRING_ALIAS_FIELD_NAME, randomTerms)