Improve validation of complex fields using struct field attributes.

With this more unsupported (and rare setups) are caught by the validator.

1 files changed, 16 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.java b/config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.java
index 993c9180f78..ebafd8f1d24 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.java
@@ -70,6 +70,9 @@ public class ComplexAttributeFieldUtils {
                         return false;
                     }
                 }
+                if (!structField.isImportedField() && hasStructFieldAttributes(structField)) {
+                    return false;
+                }
             }
             return true;
         } else {
@@ -77,6 +80,19 @@ public class ComplexAttributeFieldUtils {
         }
     }
 
+    private static boolean hasStructFieldAttributes(ImmutableSDField field) {
+        for (var structField : field.getStructFields()) {
+            var attribute = structField.getAttributes().get(structField.getName());
+            if (attribute != null) {
+                return true;
+            }
+            if (hasStructFieldAttributes(structField)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static boolean isPrimitiveType(Attribute attribute) {
         return attribute.getCollectionType().equals(Attribute.CollectionType.SINGLE) &&
                 isPrimitiveType(attribute.getDataType());