avoid making new struct when we have it already

1 files changed, 10 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
index 3eef3314b62..784080c6865 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
@@ -529,7 +529,17 @@ public class DocumentModelBuilder {
             return null;
         }
 
+        @SuppressWarnings("deprecation")
         private StructDataType handleStruct(SDDocumentType type) {
+            if (type.isStruct()) {
+                var st = type.getStruct();
+                if (st.getName().equals(type.getName()) &&
+                    (st instanceof StructDataType) &&
+                    ! (st instanceof TemporaryStructuredDataType))
+                    {
+                        return handleStruct((StructDataType) st);
+                    }
+            }
             StructDataType s = new StructDataType(type.getName());
             for (Field f : type.getDocumentType().contentStruct().getFieldsThisTypeOnly()) {
                 specialHandleAnnotationReference(f);