Drop improved error message for single value struct field.

vespa-engine · Apr 10, 2024 · 6a53177 · 6a53177
1 parent 0f0340a
commit 6a53177
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/config-model/src/main/java/com/yahoo/schema/document/Attribute.java b/config-model/src/main/java/com/yahoo/schema/document/Attribute.java
@@ -279,9 +279,6 @@ public static void validateDataType(String schemaName, String fieldName, DataTyp
         if (fieldType instanceof ArrayDataType arrayType && arrayType.getNestedType() instanceof StructDataType nestedType) {
             failDataType(schemaName, fieldName, "array<" + nestedType.getName() + ">");
         }
-        if (fieldType instanceof StructDataType structType) {
-            failDataType(schemaName, fieldName, structType.getName());
-        }
     }
 
     /** Converts to the right attribute type from a field datatype */

diff --git a/config-model/src/test/java/com/yahoo/schema/derived/AttributeListTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/AttributeListTestCase.java
@@ -137,11 +137,6 @@ void bad_array_of_struct_attribute() throws ParseException {
         run_bad_struct_or_map_attribute("array<s>");
     }
 
-    @Test
-    void bad_struct_attribute() throws ParseException {
-        run_bad_struct_or_map_attribute("s");
-    }
-
     private void run_bad_struct_or_map_attribute(String type) throws ParseException {
         run_bad_struct_or_map_attribute(type, false, true);
         run_bad_struct_or_map_attribute(type, true, false);