1 files changed, 2 insertions, 12 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index e90df2776e0..018531616fb 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -848,6 +848,7 @@ DataType dataType() :
     DataType wsetType = null;
     TensorType tensorType;
     TemporaryStructuredDataType referenceType;
+    String referencedDoc;
 }
 {
     (   LOOKAHEAD(<ARRAY> <LESSTHAN>)               ( <ARRAY> <LESSTHAN> arrayType = dataType() <GREATERTHAN> { return DataType.getArray(arrayType); } )
@@ -855,7 +856,7 @@ DataType dataType() :
       | LOOKAHEAD(<MAP> <LESSTHAN>)                 ( mapType = mapDataType() { return mapType; } )
       | LOOKAHEAD(<ANNOTATIONREFERENCE> <LESSTHAN>) ( mapType = annotationRefDataType() { return mapType; } )
       | LOOKAHEAD(<TENSOR_TYPE>)                    ( tensorType = tensorType("Field type") { return DataType.getTensor(tensorType); } )
-      | LOOKAHEAD(<REFERENCE>)                      ( <REFERENCE> <LESSTHAN> referenceType = referenceType() <GREATERTHAN> { return ReferenceDataType.createWithInferredId(referenceType); } )
+      | LOOKAHEAD(<REFERENCE>)                      ( <REFERENCE> <LESSTHAN> referencedDoc = identifier() <GREATERTHAN> { return NewDocumentReferenceDataType.forDocumentName(referencedDoc); } )
       | ( typeName = identifier() ["[]" { isArrayOldStyle = true; }] )
     )
     {
@@ -876,17 +877,6 @@ DataType dataType() :
     }
 }
 
-TemporaryStructuredDataType referenceType() :
-{
-    String documentName;
-}
-{
-    ( documentName = identifier() )
-    {
-        return TemporaryStructuredDataType.create(documentName);
-    }
-}
-
 DataType annotationRefDataType() :
 {
     DataType dataType;