Add deprecation warning when using another name for attribute or index

2 files changed, 9 insertions, 1 deletions

diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index 9a38fdc673e..e29b5a4194d 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -992,6 +992,10 @@ void attribute(ParsedField field) :
 {
     <ATTRIBUTE> [name = identifier()]
     {
+        if ( ! name.equals(field.name()))
+                deployLogger.logApplicationPackage(Level.WARNING, "Creating an attribute for field '" + field.name() +
+                "' with a different name '" + name + "' than the field name" +
+                " is deprecated, and support will be removed in Vespa 9. Define a field with the wanted name outside the document instead.");
         ParsedAttribute attr = field.attributeFor(name);
     }
          ( (<COLON> attributeSetting(attr))
@@ -1506,6 +1510,10 @@ void indexInsideField(ParsedField field) :
 {
     <INDEX> [indexName = identifier()]
     {
+        if ( ! indexName.equals(field.name()))
+            deployLogger.logApplicationPackage(Level.WARNING, "Creating an index for field '" + field.name() +
+            "' with a different name '" + indexName + "' than the field name" +
+            " is deprecated, and support will be removed in Vespa 9. Define a field with the wanted name outside the document instead.");
         op = new ParsedIndex(indexName);
     }
     ( (<COLON> indexBody(op) (<COMMA> indexBody(op))*) |
diff --git a/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java
index b1d502dec36..7990d76d023 100644
--- a/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java
@@ -37,7 +37,7 @@ public class IndexSettingsTestCase extends AbstractSchemaTestCase {
     }
 
     @Test
-    void requireThatInterlavedFeaturesAreSetOnExtraField() throws ParseException {
+    void requireThatInterleavedFeaturesAreSetOnExtraField() throws ParseException {
         ApplicationBuilder builder = ApplicationBuilder.createFromString(joinLines(
                 "search test {",
                 "  document test {",