diff --git a/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj b/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj index f81867b285..e0adc4177c 100644 --- a/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj +++ b/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj @@ -388,15 +388,9 @@ Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlDecimalTypeReference.cs - - Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlDocumentation.cs - Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlElement.cs - - Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlElementWithDocumentation.cs - Microsoft\OData\Edm\Csdl\Parsing\Ast\CsdlEntityContainer.cs @@ -509,9 +503,6 @@ Microsoft\OData\Edm\Csdl\Semantics\CsdlSemanticsDecimalTypeReference.cs - - Microsoft\OData\Edm\Csdl\Semantics\CsdlSemanticsDocumentation.cs - Microsoft\OData\Edm\Csdl\Semantics\CsdlSemanticsEntityContainer.cs @@ -860,9 +851,6 @@ Microsoft\OData\Edm\Schema\EdmDecimalTypeReference.cs - - Microsoft\OData\Edm\Schema\EdmDocumentation.cs - Microsoft\OData\Edm\Schema\EdmElement.cs @@ -1061,9 +1049,6 @@ Microsoft\OData\Edm\Schema\Interfaces\IEdmDecimalTypeReference.cs - - Microsoft\OData\Edm\Schema\Interfaces\IEdmDocumentation.cs - Microsoft\OData\Edm\Schema\Interfaces\IEdmElement.cs diff --git a/src/Microsoft.OData.Edm/Build.NetStandard/Microsoft.OData.Edm.NetStandard.csproj b/src/Microsoft.OData.Edm/Build.NetStandard/Microsoft.OData.Edm.NetStandard.csproj index c08d9b7ad8..891ed4a5a7 100644 --- a/src/Microsoft.OData.Edm/Build.NetStandard/Microsoft.OData.Edm.NetStandard.csproj +++ b/src/Microsoft.OData.Edm/Build.NetStandard/Microsoft.OData.Edm.NetStandard.csproj @@ -121,15 +121,9 @@ Csdl\Parsing\Ast\CsdlDirectValueAnnotation.cs - - Csdl\Parsing\Ast\CsdlDocumentation.cs - Csdl\Parsing\Ast\CsdlElement.cs - - Csdl\Parsing\Ast\CsdlElementWithDocumentation.cs - Csdl\Parsing\Ast\CsdlEntityContainer.cs @@ -410,9 +404,6 @@ Csdl\Semantics\CsdlSemanticsDirectValueAnnotationsManager.cs - - Csdl\Semantics\CsdlSemanticsDocumentation.cs - Csdl\Semantics\CsdlSemanticsDurationConstantExpression.cs @@ -783,9 +774,6 @@ Schema\EdmDecimalTypeReference.cs - - Schema\EdmDocumentation.cs - Schema\EdmElement.cs @@ -985,9 +973,6 @@ Schema\Interfaces\IEdmDecimalTypeReference.cs - - Schema\Interfaces\IEdmDocumentation.cs - Schema\Interfaces\IEdmElement.cs diff --git a/src/Microsoft.OData.Edm/Csdl/CsdlConstants.cs b/src/Microsoft.OData.Edm/Csdl/CsdlConstants.cs index a04f04913c..232edb0ea5 100644 --- a/src/Microsoft.OData.Edm/Csdl/CsdlConstants.cs +++ b/src/Microsoft.OData.Edm/Csdl/CsdlConstants.cs @@ -115,7 +115,6 @@ public static class CsdlConstants internal const string Element_Date = "Date"; internal const string Element_DateTimeOffset = "DateTimeOffset"; internal const string Element_Decimal = "Decimal"; - internal const string Element_Documentation = "Documentation"; internal const string Element_EntityContainer = "EntityContainer"; internal const string Element_EntitySet = "EntitySet"; internal const string Element_EntitySetReference = "EntitySetReference"; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAbstractNavigationSource.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAbstractNavigationSource.cs index 8a1b8addca..6cc9a9e9be 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAbstractNavigationSource.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAbstractNavigationSource.cs @@ -15,8 +15,8 @@ internal abstract class CsdlAbstractNavigationSource : CsdlNamedElement { private readonly List navigationPropertyBindings; - public CsdlAbstractNavigationSource(string name, IEnumerable navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlAbstractNavigationSource(string name, IEnumerable navigationPropertyBindings, CsdlLocation location) + : base(name, location) { this.navigationPropertyBindings = new List(navigationPropertyBindings); } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAction.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAction.cs index 619a728a77..4ae6a7f0fa 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAction.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlAction.cs @@ -21,7 +21,6 @@ internal class CsdlAction : CsdlOperation /// The return type of the function. /// if set to true [is bound]. /// The entity set path. - /// The documentation. /// The location in the csdl document of the function. public CsdlAction( string name, @@ -29,9 +28,8 @@ public CsdlAction( CsdlTypeReference returnType, bool isBound, string entitySetPath, - CsdlDocumentation documentation, CsdlLocation location) - : base(name, parameters, returnType, isBound, entitySetPath, documentation, location) + : base(name, parameters, returnType, isBound, entitySetPath, location) { } } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlActionImport.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlActionImport.cs index 23c141a697..cf28bbe6c5 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlActionImport.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlActionImport.cs @@ -15,9 +15,8 @@ public CsdlActionImport( string name, string schemaOperationQualifiedTypeName, string entitySet, - CsdlDocumentation documentation, CsdlLocation location) - : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, documentation, location) + : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, location) { } } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlComplexType.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlComplexType.cs index 3e3f21a65e..66abd8f2e3 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlComplexType.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlComplexType.cs @@ -13,8 +13,8 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// internal class CsdlComplexType : CsdlNamedStructuredType { - public CsdlComplexType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable structuralProperties, IEnumerable navigationProperties, CsdlDocumentation documentation, CsdlLocation location) - : base(name, baseTypeName, isAbstract, isOpen, structuralProperties, navigationProperties, documentation, location) + public CsdlComplexType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable structuralProperties, IEnumerable navigationProperties, CsdlLocation location) + : base(name, baseTypeName, isAbstract, isOpen, structuralProperties, navigationProperties, location) { } } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlDocumentation.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlDocumentation.cs deleted file mode 100644 index 23cf5bb01e..0000000000 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlDocumentation.cs +++ /dev/null @@ -1,34 +0,0 @@ -//--------------------------------------------------------------------- -// -// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -// -//--------------------------------------------------------------------- - -namespace Microsoft.OData.Edm.Csdl.Parsing.Ast -{ - /// - /// Represents a CSDL documentation. - /// - internal class CsdlDocumentation : CsdlElement - { - private readonly string summary; - private readonly string longDescription; - - public CsdlDocumentation(string summary, string longDescription, CsdlLocation location) - : base(location) - { - this.summary = summary; - this.longDescription = longDescription; - } - - public string Summary - { - get { return this.summary; } - } - - public string LongDescription - { - get { return this.longDescription; } - } - } -} diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlElementWithDocumentation.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlElementWithDocumentation.cs deleted file mode 100644 index 83b7ff3fe2..0000000000 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlElementWithDocumentation.cs +++ /dev/null @@ -1,32 +0,0 @@ -//--------------------------------------------------------------------- -// -// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -// -//--------------------------------------------------------------------- - -namespace Microsoft.OData.Edm.Csdl.Parsing.Ast -{ - /// - /// Base class for CSDL elements that have documentation. - /// - internal abstract class CsdlElementWithDocumentation : CsdlElement - { - private readonly CsdlDocumentation documentation; - - public CsdlElementWithDocumentation(CsdlDocumentation documentation, CsdlLocation location) - : base(location) - { - this.documentation = documentation; - } - - public CsdlDocumentation Documentation - { - get { return this.documentation; } - } - - public override bool HasDirectValueAnnotations - { - get { return this.documentation != null || base.HasDirectValueAnnotations; } - } - } -} diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityContainer.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityContainer.cs index 9404933b8e..46f0561d9f 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityContainer.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityContainer.cs @@ -18,8 +18,8 @@ internal class CsdlEntityContainer : CsdlNamedElement private readonly List singletons; private readonly List operationImports; - public CsdlEntityContainer(string name, string extends, IEnumerable entitySets, IEnumerable singletons, IEnumerable operationImports, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlEntityContainer(string name, string extends, IEnumerable entitySets, IEnumerable singletons, IEnumerable operationImports, CsdlLocation location) + : base(name, location) { this.extends = extends; this.entitySets = new List(entitySets); diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntitySet.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntitySet.cs index df6a571596..9e3264f26d 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntitySet.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntitySet.cs @@ -15,13 +15,13 @@ internal class CsdlEntitySet : CsdlAbstractNavigationSource { private readonly string elementType; - public CsdlEntitySet(string name, string elementType, IEnumerable navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location) - : this(name, elementType, navigationPropertyBindings, documentation, location, true) + public CsdlEntitySet(string name, string elementType, IEnumerable navigationPropertyBindings, CsdlLocation location) + : this(name, elementType, navigationPropertyBindings, location, true) { } - public CsdlEntitySet(string name, string elementType, IEnumerable navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location, bool includeInServiceDocument) - : base(name, navigationPropertyBindings, documentation, location) + public CsdlEntitySet(string name, string elementType, IEnumerable navigationPropertyBindings, CsdlLocation location, bool includeInServiceDocument) + : base(name, navigationPropertyBindings, location) { this.elementType = elementType; this.IncludeInServiceDocument = includeInServiceDocument; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityType.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityType.cs index addff2f3be..b95f4ae98c 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityType.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEntityType.cs @@ -16,8 +16,8 @@ internal class CsdlEntityType : CsdlNamedStructuredType private readonly CsdlKey key; private readonly bool hasStream; - public CsdlEntityType(string name, string baseTypeName, bool isAbstract, bool isOpen, bool hasStream, CsdlKey key, IEnumerable structualProperties, IEnumerable navigationProperties, CsdlDocumentation documentation, CsdlLocation location) - : base(name, baseTypeName, isAbstract, isOpen, structualProperties, navigationProperties, documentation, location) + public CsdlEntityType(string name, string baseTypeName, bool isAbstract, bool isOpen, bool hasStream, CsdlKey key, IEnumerable structualProperties, IEnumerable navigationProperties, CsdlLocation location) + : base(name, baseTypeName, isAbstract, isOpen, structualProperties, navigationProperties, location) { this.key = key; this.hasStream = hasStream; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumMember.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumMember.cs index 728c810335..a9b9cfd3e2 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumMember.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumMember.cs @@ -11,8 +11,8 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// internal class CsdlEnumMember : CsdlNamedElement { - public CsdlEnumMember(string name, long? value, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlEnumMember(string name, long? value, CsdlLocation location) + : base(name, location) { this.Value = value; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumType.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumType.cs index 96648ce96b..ce7aa75663 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumType.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlEnumType.cs @@ -17,8 +17,8 @@ internal class CsdlEnumType : CsdlNamedElement private readonly bool isFlags; private readonly List members; - public CsdlEnumType(string name, string underlyingTypeName, bool isFlags, IEnumerable members, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlEnumType(string name, string underlyingTypeName, bool isFlags, IEnumerable members, CsdlLocation location) + : base(name, location) { this.underlyingTypeName = underlyingTypeName; this.isFlags = isFlags; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunction.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunction.cs index 27eee85e23..c88316ae6d 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunction.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunction.cs @@ -22,7 +22,6 @@ internal class CsdlFunction : CsdlOperation /// if set to true [is bound]. /// The entity set path. /// if set to true [is composable]. - /// The documentation. /// The location in the csdl document of the function. public CsdlFunction( string name, @@ -31,9 +30,8 @@ public CsdlFunction( bool isBound, string entitySetPath, bool isComposable, - CsdlDocumentation documentation, CsdlLocation location) - : base(name, parameters, returnType, isBound, entitySetPath, documentation, location) + : base(name, parameters, returnType, isBound, entitySetPath, location) { this.IsComposable = isComposable; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionBase.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionBase.cs index 2c408cc877..aa96220ac2 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionBase.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionBase.cs @@ -16,8 +16,8 @@ internal abstract class CsdlFunctionBase : CsdlNamedElement private readonly List parameters; private readonly CsdlTypeReference returnType; - protected CsdlFunctionBase(string name, IEnumerable parameters, CsdlTypeReference returnType, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + protected CsdlFunctionBase(string name, IEnumerable parameters, CsdlTypeReference returnType, CsdlLocation location) + : base(name, location) { this.parameters = new List(parameters); this.returnType = returnType; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionImport.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionImport.cs index 7a19cea4d8..59cf66ba05 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionImport.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlFunctionImport.cs @@ -16,9 +16,8 @@ public CsdlFunctionImport( string schemaOperationQualifiedTypeName, string entitySet, bool includeInServiceDocument, - CsdlDocumentation documentation, CsdlLocation location) - : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, documentation, location) + : base(name, schemaOperationQualifiedTypeName, entitySet, new CsdlOperationParameter[] { }, null /*returnType*/, location) { this.IncludeInServiceDocument = includeInServiceDocument; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedElement.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedElement.cs index e8946f9411..ccdc509dec 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedElement.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedElement.cs @@ -9,12 +9,12 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Common base class for all named CSDL elements. /// - internal abstract class CsdlNamedElement : CsdlElementWithDocumentation + internal abstract class CsdlNamedElement : CsdlElement { private readonly string name; - protected CsdlNamedElement(string name, CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + protected CsdlNamedElement(string name, CsdlLocation location) + : base(location) { this.name = name; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedStructuredType.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedStructuredType.cs index ad6dcdf33e..0fc5bbe367 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedStructuredType.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNamedStructuredType.cs @@ -18,8 +18,8 @@ internal abstract class CsdlNamedStructuredType : CsdlStructuredType protected bool isOpen; protected string name; - protected CsdlNamedStructuredType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable structuralproperties, IEnumerable navigationProperties, CsdlDocumentation documentation, CsdlLocation location) - : base(structuralproperties, navigationProperties, documentation, location) + protected CsdlNamedStructuredType(string name, string baseTypeName, bool isAbstract, bool isOpen, IEnumerable structuralproperties, IEnumerable navigationProperties, CsdlLocation location) + : base(structuralproperties, navigationProperties, location) { this.isAbstract = isAbstract; this.isOpen = isOpen; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationProperty.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationProperty.cs index cb0bb80737..4e7c15ce19 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationProperty.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationProperty.cs @@ -20,8 +20,8 @@ internal class CsdlNavigationProperty : CsdlNamedElement private readonly CsdlOnDelete onDelete; private readonly IEnumerable referentialConstraints; - public CsdlNavigationProperty(string name, string type, bool? nullable, string partner, bool containsTarget, CsdlOnDelete onDelete, IEnumerable referentialConstraints, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlNavigationProperty(string name, string type, bool? nullable, string partner, bool containsTarget, CsdlOnDelete onDelete, IEnumerable referentialConstraints, CsdlLocation location) + : base(name, location) { this.type = type; this.nullable = nullable; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationPropertyBinding.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationPropertyBinding.cs index 0ec6c4c749..e4ea1fd9cb 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationPropertyBinding.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlNavigationPropertyBinding.cs @@ -9,13 +9,13 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Represents a CSDL Navigation Property Binding. /// - internal class CsdlNavigationPropertyBinding : CsdlElementWithDocumentation + internal class CsdlNavigationPropertyBinding : CsdlElement { private readonly string path; private readonly string target; - public CsdlNavigationPropertyBinding(string path, string target, CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + public CsdlNavigationPropertyBinding(string path, string target, CsdlLocation location) + : base(location) { this.path = path; this.target = target; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOnDelete.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOnDelete.cs index dd94723f55..dbdd2ecefb 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOnDelete.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOnDelete.cs @@ -9,12 +9,12 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Represents a CSDL "on delete" action. /// - internal class CsdlOnDelete : CsdlElementWithDocumentation + internal class CsdlOnDelete : CsdlElement { private readonly EdmOnDeleteAction action; - public CsdlOnDelete(EdmOnDeleteAction action, CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + public CsdlOnDelete(EdmOnDeleteAction action, CsdlLocation location) + : base(location) { this.action = action; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperation.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperation.cs index 7006d89160..f756b46760 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperation.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperation.cs @@ -21,7 +21,6 @@ internal class CsdlOperation : CsdlFunctionBase /// Type of the return. /// if set to true [is bound]. /// The entity set path. - /// The documentation. /// The location. public CsdlOperation( string name, @@ -29,9 +28,8 @@ public CsdlOperation( CsdlTypeReference returnType, bool isBound, string entitySetPath, - CsdlDocumentation documentation, CsdlLocation location) - : base(name, parameters, returnType, documentation, location) + : base(name, parameters, returnType, location) { this.IsBound = isBound; this.EntitySetPath = entitySetPath; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationImport.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationImport.cs index fb920d80ca..0db3902550 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationImport.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationImport.cs @@ -21,9 +21,8 @@ protected CsdlOperationImport( string entitySet, IEnumerable parameters, CsdlTypeReference returnType, - CsdlDocumentation documentation, CsdlLocation location) - : base(name, parameters, returnType, documentation, location) + : base(name, parameters, returnType, location) { this.entitySet = entitySet; this.SchemaOperationQualifiedTypeName = schemaOperationQualifiedTypeName; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationParameter.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationParameter.cs index c8bcde06d2..f73aaeb0cc 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationParameter.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlOperationParameter.cs @@ -15,14 +15,14 @@ internal class CsdlOperationParameter : CsdlNamedElement private readonly bool isOptional = false; private readonly string defaultValue; - public CsdlOperationParameter(string name, CsdlTypeReference type, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlOperationParameter(string name, CsdlTypeReference type, CsdlLocation location) + : base(name, location) { this.type = type; } - public CsdlOperationParameter(string name, CsdlTypeReference type, CsdlDocumentation documentation, CsdlLocation location, bool isOptional, string defaultValue) - : this(name, type, documentation, location) + public CsdlOperationParameter(string name, CsdlTypeReference type, CsdlLocation location, bool isOptional, string defaultValue) + : this(name, type, location) { this.isOptional = isOptional; this.defaultValue = defaultValue; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlProperty.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlProperty.cs index 7cbb648f94..ee0dc163cb 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlProperty.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlProperty.cs @@ -14,8 +14,8 @@ internal class CsdlProperty : CsdlNamedElement private readonly CsdlTypeReference type; private readonly string defaultValue; - public CsdlProperty(string name, CsdlTypeReference type, string defaultValue, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlProperty(string name, CsdlTypeReference type, string defaultValue, CsdlLocation location) + : base(name, location) { this.type = type; this.defaultValue = defaultValue; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraint.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraint.cs index 62c29e17f7..39094c0591 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraint.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraint.cs @@ -9,13 +9,13 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Represents a CSDL referential constraint. /// - internal class CsdlReferentialConstraint : CsdlElementWithDocumentation + internal class CsdlReferentialConstraint : CsdlElement { private readonly string propertyName; private readonly string referencedPropertyName; - public CsdlReferentialConstraint(string propertyName, string referencedPropertyName, CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + public CsdlReferentialConstraint(string propertyName, string referencedPropertyName, CsdlLocation location) + : base(location) { this.propertyName = propertyName; this.referencedPropertyName = referencedPropertyName; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraintRole.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraintRole.cs index ef763f5cb9..e9af134731 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraintRole.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlReferentialConstraintRole.cs @@ -11,13 +11,13 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Represents a CSDL referential constraint role. /// - internal class CsdlReferentialConstraintRole : CsdlElementWithDocumentation + internal class CsdlReferentialConstraintRole : CsdlElement { private readonly string role; private readonly List properties; - public CsdlReferentialConstraintRole(string role, IEnumerable properties, CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + public CsdlReferentialConstraintRole(string role, IEnumerable properties, CsdlLocation location) + : base(location) { this.role = role; this.properties = new List(properties); diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSchema.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSchema.cs index 82dbbfcf0a..e3898fbcf4 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSchema.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSchema.cs @@ -12,7 +12,7 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Represents a CSDL schema. /// - internal class CsdlSchema : CsdlElementWithDocumentation + internal class CsdlSchema : CsdlElement { private readonly List structuredTypes; private readonly List enumTypes; @@ -37,9 +37,8 @@ public CsdlSchema( IEnumerable entityContainers, IEnumerable outOfLineAnnotations, IEnumerable typeDefinitions, - CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + : base(location) { this.alias = alias; this.namespaceName = namespaceName; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSingleton.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSingleton.cs index e36e682558..a89d0f8ff0 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSingleton.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlSingleton.cs @@ -15,8 +15,8 @@ internal class CsdlSingleton : CsdlAbstractNavigationSource { private readonly string type; - public CsdlSingleton(string name, string type, IEnumerable navigationPropertyBindings, CsdlDocumentation documentation, CsdlLocation location) - : base(name, navigationPropertyBindings, documentation, location) + public CsdlSingleton(string name, string type, IEnumerable navigationPropertyBindings, CsdlLocation location) + : base(name, navigationPropertyBindings, location) { this.type = type; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlStructuredType.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlStructuredType.cs index a66f1e77ab..afd795a533 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlStructuredType.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlStructuredType.cs @@ -11,13 +11,13 @@ namespace Microsoft.OData.Edm.Csdl.Parsing.Ast /// /// Common base class for CSDL entity and complex Types. /// - internal abstract class CsdlStructuredType : CsdlElementWithDocumentation + internal abstract class CsdlStructuredType : CsdlElement { protected List structuralProperties; protected List navigationProperties; - protected CsdlStructuredType(IEnumerable structuralProperties, IEnumerable navigationProperties, CsdlDocumentation documentation, CsdlLocation location) - : base(documentation, location) + protected CsdlStructuredType(IEnumerable structuralProperties, IEnumerable navigationProperties, CsdlLocation location) + : base(location) { this.structuralProperties = new List(structuralProperties); this.navigationProperties = new List(navigationProperties); diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTerm.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTerm.cs index f5486b41bd..84ebafa5ef 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTerm.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTerm.cs @@ -15,8 +15,8 @@ internal class CsdlTerm : CsdlNamedElement private readonly string appliesTo; private readonly string defaultValue; - public CsdlTerm(string name, CsdlTypeReference type, string appliesTo, string defaultValue, CsdlDocumentation documentation, CsdlLocation location) - : base(name, documentation, location) + public CsdlTerm(string name, CsdlTypeReference type, string appliesTo, string defaultValue, CsdlLocation location) + : base(name, location) { this.type = type; this.appliesTo = appliesTo; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTypeDefinition.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTypeDefinition.cs index d282ac0d89..2222344e1b 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTypeDefinition.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Ast/CsdlTypeDefinition.cs @@ -14,7 +14,7 @@ internal class CsdlTypeDefinition : CsdlNamedElement private readonly string underlyingTypeName; public CsdlTypeDefinition(string name, string underlyingTypeName, CsdlLocation location) - : base(name, /*documentation*/null, location) + : base(name, location) { this.underlyingTypeName = underlyingTypeName; } diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/Common/EdmXmlDocumentParser.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/Common/EdmXmlDocumentParser.cs index 791aabaa35..1a2845aa24 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/Common/EdmXmlDocumentParser.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/Common/EdmXmlDocumentParser.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Xml; using Microsoft.OData.Edm.Validation; diff --git a/src/Microsoft.OData.Edm/Csdl/Parsing/CsdlDocumentParser.cs b/src/Microsoft.OData.Edm/Csdl/Parsing/CsdlDocumentParser.cs index 4d9262871d..e13f249682 100644 --- a/src/Microsoft.OData.Edm/Csdl/Parsing/CsdlDocumentParser.cs +++ b/src/Microsoft.OData.Edm/Csdl/Parsing/CsdlDocumentParser.cs @@ -71,33 +71,24 @@ protected override void AnnotateItem(object result, XmlElementValueCollection ch private XmlElementParser CreateRootElementParser() { - var documentationParser = - //// - CsdlElement(CsdlConstants.Element_Documentation, this.OnDocumentationElement, - //// - Element(CsdlConstants.Element_Summary, (element, children) => children.FirstText.Value), - //// - Element(CsdlConstants.Element_LongDescription, (element, children) => children.FirstText.TextValue)); - //// - // There is recursion in the grammar between CollectionType, ReturnType, and Property within RowType. // This requires breaking up the parser construction into pieces and then weaving them together with AddChildParser. var referenceTypeParser = //// - CsdlElement(CsdlConstants.Element_ReferenceType, this.OnEntityReferenceTypeElement, documentationParser); + CsdlElement(CsdlConstants.Element_ReferenceType, this.OnEntityReferenceTypeElement); var collectionTypeParser = //// - CsdlElement(CsdlConstants.Element_CollectionType, this.OnCollectionTypeElement, documentationParser, + CsdlElement(CsdlConstants.Element_CollectionType, this.OnCollectionTypeElement, //// - CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement, documentationParser), + CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement), //// referenceTypeParser); //// var nominalTypePropertyElementParser = //// - CsdlElement(CsdlConstants.Element_Property, this.OnPropertyElement, documentationParser); + CsdlElement(CsdlConstants.Element_Property, this.OnPropertyElement); var stringConstantExpressionParser = //// @@ -277,18 +268,16 @@ private XmlElementParser CreateRootElementParser() var rootElementParser = //// CsdlElement(CsdlConstants.Element_Schema, this.OnSchemaElement, - documentationParser, //// CsdlElement(CsdlConstants.Element_ComplexType, this.OnComplexTypeElement, - documentationParser, //// nominalTypePropertyElementParser, //// - CsdlElement(CsdlConstants.Element_NavigationProperty, this.OnNavigationPropertyElement, documentationParser, + CsdlElement(CsdlConstants.Element_NavigationProperty, this.OnNavigationPropertyElement, //// - CsdlElement(CsdlConstants.Element_ReferentialConstraint, this.OnReferentialConstraintElement, documentationParser), + CsdlElement(CsdlConstants.Element_ReferentialConstraint, this.OnReferentialConstraintElement), //// - CsdlElement(CsdlConstants.Element_OnDelete, this.OnDeleteActionElement, documentationParser), + CsdlElement(CsdlConstants.Element_OnDelete, this.OnDeleteActionElement), //// annotationParser), //// @@ -299,7 +288,6 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_EntityType, this.OnEntityTypeElement, - documentationParser, //// CsdlElement(CsdlConstants.Element_Key, OnEntityKeyElement, //// @@ -310,11 +298,11 @@ private XmlElementParser CreateRootElementParser() nominalTypePropertyElementParser, //// - CsdlElement(CsdlConstants.Element_NavigationProperty, this.OnNavigationPropertyElement, documentationParser, + CsdlElement(CsdlConstants.Element_NavigationProperty, this.OnNavigationPropertyElement, //// - CsdlElement(CsdlConstants.Element_ReferentialConstraint, this.OnReferentialConstraintElement, documentationParser), + CsdlElement(CsdlConstants.Element_ReferentialConstraint, this.OnReferentialConstraintElement), //// - CsdlElement(CsdlConstants.Element_OnDelete, this.OnDeleteActionElement, documentationParser), + CsdlElement(CsdlConstants.Element_OnDelete, this.OnDeleteActionElement), //// annotationParser), //// @@ -325,9 +313,8 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_EnumType, this.OnEnumTypeElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_Member, this.OnEnumMemberElement, documentationParser, annotationParser), + CsdlElement(CsdlConstants.Element_Member, this.OnEnumMemberElement, annotationParser), //// annotationParser), //// @@ -340,12 +327,10 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_Action, this.OnActionElement, - documentationParser, //// CsdlElement(CsdlConstants.Element_Parameter, this.OnParameterElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement, documentationParser), + CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement), //// collectionTypeParser, //// @@ -356,9 +341,8 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_ReturnType, this.OnReturnTypeElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement, documentationParser), + CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement), //// collectionTypeParser, //// @@ -372,12 +356,10 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_Function, this.OnFunctionElement, - documentationParser, //// CsdlElement(CsdlConstants.Element_Parameter, this.OnParameterElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement, documentationParser), + CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement), //// collectionTypeParser, //// @@ -388,9 +370,8 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_ReturnType, this.OnReturnTypeElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement, documentationParser), + CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement), //// collectionTypeParser, //// @@ -406,7 +387,7 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_Term, this.OnTermElement, //// - CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement, documentationParser), + CsdlElement(CsdlConstants.Element_TypeRef, this.OnTypeRefElement), //// collectionTypeParser, //// @@ -423,9 +404,8 @@ private XmlElementParser CreateRootElementParser() //// CsdlElement(CsdlConstants.Element_EntityContainer, this.OnEntityContainerElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_EntitySet, this.OnEntitySetElement, documentationParser, + CsdlElement(CsdlConstants.Element_EntitySet, this.OnEntitySetElement, //// CsdlElement(CsdlConstants.Element_NavigationPropertyBinding, this.OnNavigationPropertyBindingElement), //// @@ -433,7 +413,7 @@ private XmlElementParser CreateRootElementParser() //// //// - CsdlElement(CsdlConstants.Element_Singleton, this.OnSingletonElement, documentationParser, + CsdlElement(CsdlConstants.Element_Singleton, this.OnSingletonElement, //// CsdlElement(CsdlConstants.Element_NavigationPropertyBinding, this.OnNavigationPropertyBindingElement), //// @@ -442,17 +422,15 @@ private XmlElementParser CreateRootElementParser() //// (CsdlConstants.Element_ActionImport, this.OnActionImportElement, - documentationParser, //// annotationParser), ////(CsdlConstants.Element_FunctionImport, this.OnFunctionImportElement, - documentationParser, //// - CsdlElement(CsdlConstants.Element_Parameter, this.OnFunctionImportParameterElement, documentationParser, + CsdlElement(CsdlConstants.Element_Parameter, this.OnFunctionImportParameterElement, //// annotationParser), //// @@ -469,11 +447,6 @@ private XmlElementParser CreateRootElementParser() return rootElementParser; } - private static CsdlDocumentation Documentation(XmlElementValueCollection childValues) - { - return childValues.ValuesOfType().FirstOrDefault(); - } - private CsdlSchema OnSchemaElement(XmlElementInfo element, XmlElementValueCollection childValues) { string namespaceName = Optional(CsdlConstants.Attribute_Namespace) ?? string.Empty; @@ -491,17 +464,11 @@ private CsdlSchema OnSchemaElement(XmlElementInfo element, XmlElementValueCollec childValues.ValuesOfType(), childValues.ValuesOfType(), childValues.ValuesOfType(), - Documentation(childValues), element.Location); return result; } - private CsdlDocumentation OnDocumentationElement(XmlElementInfo element, XmlElementValueCollection childValues) - { - return new CsdlDocumentation(childValues[CsdlConstants.Element_Summary].TextValue, childValues[CsdlConstants.Element_LongDescription].TextValue, element.Location); - } - private CsdlComplexType OnComplexTypeElement(XmlElementInfo element, XmlElementValueCollection childValues) { string name = Required(CsdlConstants.Attribute_Name); @@ -509,7 +476,7 @@ private CsdlComplexType OnComplexTypeElement(XmlElementInfo element, XmlElementV bool isOpen = OptionalBoolean(CsdlConstants.Attribute_OpenType) ?? CsdlConstants.Default_OpenType; bool isAbstract = OptionalBoolean(CsdlConstants.Attribute_Abstract) ?? CsdlConstants.Default_Abstract; - return new CsdlComplexType(name, baseType, isAbstract, isOpen, childValues.ValuesOfType(), childValues.ValuesOfType(), Documentation(childValues), element.Location); + return new CsdlComplexType(name, baseType, isAbstract, isOpen, childValues.ValuesOfType(), childValues.ValuesOfType(), element.Location); } private CsdlEntityType OnEntityTypeElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -522,7 +489,7 @@ private CsdlEntityType OnEntityTypeElement(XmlElementInfo element, XmlElementVal CsdlKey key = childValues.ValuesOfType().FirstOrDefault(); - return new CsdlEntityType(name, baseType, isAbstract, isOpen, hasStream, key, childValues.ValuesOfType(), childValues.ValuesOfType(), Documentation(childValues), element.Location); + return new CsdlEntityType(name, baseType, isAbstract, isOpen, hasStream, key, childValues.ValuesOfType(), childValues.ValuesOfType(), element.Location); } private CsdlProperty OnPropertyElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -532,7 +499,7 @@ private CsdlProperty OnPropertyElement(XmlElementInfo element, XmlElementValueCo string name = Required(CsdlConstants.Attribute_Name); string defaultValue = Optional(CsdlConstants.Attribute_DefaultValue); - return new CsdlProperty(name, type, defaultValue, Documentation(childValues), element.Location); + return new CsdlProperty(name, type, defaultValue, element.Location); } private CsdlTerm OnTermElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -543,7 +510,7 @@ private CsdlTerm OnTermElement(XmlElementInfo element, XmlElementValueCollection string appliesTo = Optional(CsdlConstants.Attribute_AppliesTo); string defaultValue = Optional(CsdlConstants.Attribute_DefaultValue); - return new CsdlTerm(name, type, appliesTo, defaultValue, Documentation(childValues), element.Location); + return new CsdlTerm(name, type, appliesTo, defaultValue, element.Location); } private CsdlAnnotations OnAnnotationsElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1048,7 +1015,7 @@ private CsdlNamedElement OnNavigationPropertyElement(XmlElementInfo element, Xml CsdlOnDelete onDelete = childValues.ValuesOfType().FirstOrDefault(); IEnumerable referentialConstraints = childValues.ValuesOfType().ToList(); - return new CsdlNavigationProperty(name, typeName, isNullable, partner, containsTarget ?? false, onDelete, referentialConstraints, Documentation(childValues), element.Location); + return new CsdlNavigationProperty(name, typeName, isNullable, partner, containsTarget ?? false, onDelete, referentialConstraints, element.Location); } private static CsdlKey OnEntityKeyElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1067,7 +1034,7 @@ private CsdlEnumType OnEnumTypeElement(XmlElementInfo element, XmlElementValueCo string underlyingType = OptionalType(CsdlConstants.Attribute_UnderlyingType); bool? isFlags = OptionalBoolean(CsdlConstants.Attribute_IsFlags); - return new CsdlEnumType(name, underlyingType, isFlags ?? false, childValues.ValuesOfType(), Documentation(childValues), element.Location); + return new CsdlEnumType(name, underlyingType, isFlags ?? false, childValues.ValuesOfType(), element.Location); } private CsdlEnumMember OnEnumMemberElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1075,14 +1042,14 @@ private CsdlEnumMember OnEnumMemberElement(XmlElementInfo element, XmlElementVal string name = Required(CsdlConstants.Attribute_Name); long? value = OptionalLong(CsdlConstants.Attribute_Value); - return new CsdlEnumMember(name, value, Documentation(childValues), element.Location); + return new CsdlEnumMember(name, value, element.Location); } private CsdlOnDelete OnDeleteActionElement(XmlElementInfo element, XmlElementValueCollection childValues) { EdmOnDeleteAction action = RequiredOnDeleteAction(CsdlConstants.Attribute_Action); - return new CsdlOnDelete(action, Documentation(childValues), element.Location); + return new CsdlOnDelete(action, element.Location); } private CsdlReferentialConstraint OnReferentialConstraintElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1090,7 +1057,7 @@ private CsdlReferentialConstraint OnReferentialConstraintElement(XmlElementInfo string propertyName = this.Required(CsdlConstants.Attribute_Property); string referencedPropertyName = this.Required(CsdlConstants.Attribute_ReferencedProperty); - return new CsdlReferentialConstraint(propertyName, referencedPropertyName, Documentation(childValues), element.Location); + return new CsdlReferentialConstraint(propertyName, referencedPropertyName, element.Location); } internal CsdlAction OnActionElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1106,7 +1073,7 @@ internal CsdlAction OnActionElement(XmlElementInfo element, XmlElementValueColle this.ReportOperationReadErrorsIfExist(entitySetPath, isBound, name); - return new CsdlAction(name, parameters, returnType, isBound, entitySetPath, Documentation(childValues), element.Location); + return new CsdlAction(name, parameters, returnType, isBound, entitySetPath, element.Location); } internal CsdlFunction OnFunctionElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1123,7 +1090,7 @@ internal CsdlFunction OnFunctionElement(XmlElementInfo element, XmlElementValueC this.ReportOperationReadErrorsIfExist(entitySetPath, isBound, name); - return new CsdlFunction(name, parameters, returnType, isBound, entitySetPath, isComposable, Documentation(childValues), element.Location); + return new CsdlFunction(name, parameters, returnType, isBound, entitySetPath, isComposable, element.Location); } private void ReportOperationReadErrorsIfExist(string entitySetPath, bool isBound, string name) @@ -1172,7 +1139,7 @@ c is XmlElementValue && childValues.Remove(optionalAnnotationValue); } - return new CsdlOperationParameter(name, type, Documentation(childValues), element.Location, isOptional, defaultValue); + return new CsdlOperationParameter(name, type, element.Location, isOptional, defaultValue); } private CsdlActionImport OnActionImportElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1181,7 +1148,7 @@ private CsdlActionImport OnActionImportElement(XmlElementInfo element, XmlElemen string qualifiedActionName = RequiredQualifiedName(CsdlConstants.Attribute_Action); string entitySet = Optional(CsdlConstants.Attribute_EntitySet); - return new CsdlActionImport(name, qualifiedActionName, entitySet, Documentation(childValues), element.Location); + return new CsdlActionImport(name, qualifiedActionName, entitySet, element.Location); } private CsdlFunctionImport OnFunctionImportElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1191,7 +1158,7 @@ private CsdlFunctionImport OnFunctionImportElement(XmlElementInfo element, XmlEl string entitySet = Optional(CsdlConstants.Attribute_EntitySet); bool includeInServiceDocument = OptionalBoolean(CsdlConstants.Attribute_IncludeInServiceDocument) ?? CsdlConstants.Default_IncludeInServiceDocument; - return new CsdlFunctionImport(name, qualifiedActionName, entitySet, includeInServiceDocument, Documentation(childValues), element.Location); + return new CsdlFunctionImport(name, qualifiedActionName, entitySet, includeInServiceDocument, element.Location); } private CsdlOperationParameter OnFunctionImportParameterElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1199,7 +1166,7 @@ private CsdlOperationParameter OnFunctionImportParameterElement(XmlElementInfo e string name = Required(CsdlConstants.Attribute_Name); string typeName = RequiredType(CsdlConstants.Attribute_Type); CsdlTypeReference type = this.ParseTypeReference(typeName, null, element.Location, Optionality.Required); - return new CsdlOperationParameter(name, type, Documentation(childValues), element.Location); + return new CsdlOperationParameter(name, type, element.Location); } private CsdlTypeReference OnEntityReferenceTypeElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1245,7 +1212,6 @@ private CsdlEntityContainer OnEntityContainerElement(XmlElementInfo element, Xml childValues.ValuesOfType(), childValues.ValuesOfType(), childValues.ValuesOfType(), - Documentation(childValues), element.Location); } @@ -1257,11 +1223,11 @@ private CsdlEntitySet OnEntitySetElement(XmlElementInfo element, XmlElementValue if (includeInServiceDocument == null) { - return new CsdlEntitySet(name, entityType, childValues.ValuesOfType(), Documentation(childValues), element.Location); + return new CsdlEntitySet(name, entityType, childValues.ValuesOfType(), element.Location); } else { - return new CsdlEntitySet(name, entityType, childValues.ValuesOfType(), Documentation(childValues), element.Location, (bool)includeInServiceDocument); + return new CsdlEntitySet(name, entityType, childValues.ValuesOfType(), element.Location, (bool)includeInServiceDocument); } } @@ -1270,7 +1236,7 @@ private CsdlSingleton OnSingletonElement(XmlElementInfo element, XmlElementValue string name = Required(CsdlConstants.Attribute_Name); string type = RequiredQualifiedName(CsdlConstants.Attribute_Type); - return new CsdlSingleton(name, type, childValues.ValuesOfType(), Documentation(childValues), element.Location); + return new CsdlSingleton(name, type, childValues.ValuesOfType(), element.Location); } private CsdlNavigationPropertyBinding OnNavigationPropertyBindingElement(XmlElementInfo element, XmlElementValueCollection childValues) @@ -1278,7 +1244,7 @@ private CsdlNavigationPropertyBinding OnNavigationPropertyBindingElement(XmlElem string path = Required(CsdlConstants.Attribute_Path); string entitySet = Required(CsdlConstants.Attribute_Target); - return new CsdlNavigationPropertyBinding(path, entitySet, Documentation(childValues), element.Location); + return new CsdlNavigationPropertyBinding(path, entitySet, element.Location); } private void ParseMaxLength(out bool Unbounded, out int? maxLength) diff --git a/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsDocumentation.cs b/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsDocumentation.cs deleted file mode 100644 index a34e58ce93..0000000000 --- a/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsDocumentation.cs +++ /dev/null @@ -1,62 +0,0 @@ -//--------------------------------------------------------------------- -// -// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -// -//--------------------------------------------------------------------- - -using Microsoft.OData.Edm.Csdl.Parsing.Ast; -using Microsoft.OData.Edm.Vocabularies; - -namespace Microsoft.OData.Edm.Csdl.CsdlSemantics -{ - /// - /// Provides semantics for CsdlDocumentation. - /// - internal class CsdlSemanticsDocumentation : CsdlSemanticsElement, IEdmDocumentation, IEdmDirectValueAnnotation - { - private readonly CsdlDocumentation documentation; - private readonly CsdlSemanticsModel model; - - public CsdlSemanticsDocumentation(CsdlDocumentation documentation, CsdlSemanticsModel model) - : base(documentation) - { - this.documentation = documentation; - this.model = model; - } - - public string Summary - { - get { return this.documentation.Summary; } - } - - public string Description - { - get { return this.documentation.LongDescription; } - } - - public override CsdlSemanticsModel Model - { - get { return this.model; } - } - - public override CsdlElement Element - { - get { return this.documentation; } - } - - public string NamespaceUri - { - get { return EdmConstants.DocumentationUri; } - } - - public string Name - { - get { return EdmConstants.DocumentationAnnotation; } - } - - object IEdmDirectValueAnnotation.Value - { - get { return this; } - } - } -} diff --git a/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsElement.cs b/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsElement.cs index 0822da0b91..de891b7b9b 100644 --- a/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsElement.cs +++ b/src/Microsoft.OData.Edm/Csdl/Semantics/CsdlSemanticsElement.cs @@ -128,10 +128,7 @@ protected IEnumerable ComputeDirectValueAnnotations() } List annotations = this.Element.ImmediateValueAnnotations.ToList(); - CsdlElementWithDocumentation elementWithDocumentation = this.Element as CsdlElementWithDocumentation; - CsdlDocumentation documentation = (elementWithDocumentation != null) ? elementWithDocumentation.Documentation : null; - - if (documentation != null || annotations.FirstOrDefault() != null) + if (annotations.FirstOrDefault() != null) { List wrappedAnnotations = new List(); @@ -140,11 +137,6 @@ protected IEnumerable ComputeDirectValueAnnotations() wrappedAnnotations.Add(new CsdlSemanticsDirectValueAnnotation(annotation, this.Model)); } - if (documentation != null) - { - wrappedAnnotations.Add(new CsdlSemanticsDocumentation(documentation, this.Model)); - } - return wrappedAnnotations; } diff --git a/src/Microsoft.OData.Edm/ExtensionMethods/ExtensionMethods.cs b/src/Microsoft.OData.Edm/ExtensionMethods/ExtensionMethods.cs index 448a6b1671..91717d7c11 100644 --- a/src/Microsoft.OData.Edm/ExtensionMethods/ExtensionMethods.cs +++ b/src/Microsoft.OData.Edm/ExtensionMethods/ExtensionMethods.cs @@ -2764,34 +2764,6 @@ internal static IEdmEntityType GetPathSegmentEntityType(IEdmTypeReference segmen return (segmentType.IsCollection() ? segmentType.AsCollection().ElementType() : segmentType).AsEntity().EntityDefinition(); } - /// - /// Gets documentation for a specified element. - /// - /// The model containing the documentation. - /// The element. - /// Documentation that exists on the element. Otherwise, null. - internal static IEdmDocumentation GetDocumentation(this IEdmModel model, IEdmElement element) - { - EdmUtil.CheckArgumentNull(model, "model"); - EdmUtil.CheckArgumentNull(element, "element"); - - return (IEdmDocumentation)model.GetAnnotationValue(element, EdmConstants.DocumentationUri, EdmConstants.DocumentationAnnotation); - } - - /// - /// Sets documentation for a specified element. - /// - /// The model containing the documentation. - /// The element. - /// Documentation to set. - internal static void SetDocumentation(this IEdmModel model, IEdmElement element, IEdmDocumentation documentation) - { - EdmUtil.CheckArgumentNull(model, "model"); - EdmUtil.CheckArgumentNull(element, "element"); - - model.SetAnnotationValue(element, EdmConstants.DocumentationUri, EdmConstants.DocumentationAnnotation, documentation); - } - internal static IEnumerable AllElements(this IEdmEntityContainer container, int depth = ContainerExtendsMaxDepth) { if (depth <= 0) diff --git a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj index 3a240f4b7d..fcd424a467 100644 --- a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj +++ b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj @@ -322,9 +322,7 @@ - - @@ -363,7 +361,6 @@ - @@ -414,7 +411,6 @@ - @@ -440,7 +436,6 @@ - diff --git a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.txt b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.txt index 9981107641..922239d049 100644 --- a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.txt +++ b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.txt @@ -5,7 +5,6 @@ ; EDM Model messages EdmPrimitive_UnexpectedKind=Unexpected primitive type kind. EdmPath_UnexpectedKind=Unexpected path type kind. -Annotations_DocumentationPun=Annotations in the 'Documentation' namespace must implement 'IEdmDocumentation', but '{0}' does not. Annotations_TypeMismatch=Annotation of type '{0}' cannot be interpreted as '{1}'. Constructable_VocabularyAnnotationMustHaveTarget=The annotation must have non-null target. Constructable_EntityTypeOrCollectionOfEntityTypeExpected=An entity type or a collection of an entity type is expected. diff --git a/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs b/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs index f6ea7d3fd5..00ce1c1c75 100644 --- a/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs +++ b/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs @@ -33,13 +33,6 @@ internal static string EdmPath_UnexpectedKind { } } - /// - /// A string like "Annotations in the 'Documentation' namespace must implement 'IEdmDocumentation', but '{0}' does not." - /// - internal static string Annotations_DocumentationPun(object p0) { - return Microsoft.OData.Edm.EntityRes.GetString(Microsoft.OData.Edm.EntityRes.Annotations_DocumentationPun, p0); - } - /// /// A string like "Annotation of type '{0}' cannot be interpreted as '{1}'." /// diff --git a/src/Microsoft.OData.Edm/Schema/EdmConstants.cs b/src/Microsoft.OData.Edm/Schema/EdmConstants.cs index 2532edfd44..a2f3b740e6 100644 --- a/src/Microsoft.OData.Edm/Schema/EdmConstants.cs +++ b/src/Microsoft.OData.Edm/Schema/EdmConstants.cs @@ -29,16 +29,6 @@ public static class EdmConstants internal const string XmlPrefix = "xml"; internal const string XmlNamespacePrefix = "xmlns"; - /// - /// The URI of annotations that will be serialized as documentation elements. - /// - internal const string DocumentationUri = "http://schemas.microsoft.com/ado/2011/04/edm/documentation"; - - /// - /// The local name of annotations that will be serialized as documentation elements. - /// - internal const string DocumentationAnnotation = "Documentation"; - /// /// The URI of annotations that are internal and will not be serialized. /// diff --git a/src/Microsoft.OData.Edm/Schema/EdmDocumentation.cs b/src/Microsoft.OData.Edm/Schema/EdmDocumentation.cs deleted file mode 100644 index 39aef8b4f6..0000000000 --- a/src/Microsoft.OData.Edm/Schema/EdmDocumentation.cs +++ /dev/null @@ -1,44 +0,0 @@ -//--------------------------------------------------------------------- -// -// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -// -//--------------------------------------------------------------------- - -namespace Microsoft.OData.Edm -{ - /// - /// Represents an EDM documentation. - /// - internal class EdmDocumentation : IEdmDocumentation - { - private readonly string summary; - private readonly string description; - - /// - /// Initializes a new instance of the class. - /// - /// Summary of the documentation. - /// The documentation contents. - public EdmDocumentation(string summary, string description) - { - this.summary = summary; - this.description = description; - } - - /// - /// Gets summary of this documentation. - /// - public string Summary - { - get { return this.summary; } - } - - /// - /// Gets documentation. - /// - public string Description - { - get { return this.description; } - } - } -} diff --git a/src/Microsoft.OData.Edm/Schema/Interfaces/IEdmDocumentation.cs b/src/Microsoft.OData.Edm/Schema/Interfaces/IEdmDocumentation.cs deleted file mode 100644 index f107683a0f..0000000000 --- a/src/Microsoft.OData.Edm/Schema/Interfaces/IEdmDocumentation.cs +++ /dev/null @@ -1,24 +0,0 @@ -//--------------------------------------------------------------------- -// -// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information. -// -//--------------------------------------------------------------------- - -namespace Microsoft.OData.Edm -{ - /// - /// Represents an EDM documentation. - /// - internal interface IEdmDocumentation - { - /// - /// Gets a summary of this documentation. - /// - string Summary { get; } - - /// - /// Gets a long description of this documentation. - /// - string Description { get; } - } -} diff --git a/src/Microsoft.OData.Edm/Vocabularies/Annotations/EdmDirectValueAnnotationsManager.cs b/src/Microsoft.OData.Edm/Vocabularies/Annotations/EdmDirectValueAnnotationsManager.cs index 2e7a478135..ba607dcb12 100644 --- a/src/Microsoft.OData.Edm/Vocabularies/Annotations/EdmDirectValueAnnotationsManager.cs +++ b/src/Microsoft.OData.Edm/Vocabularies/Annotations/EdmDirectValueAnnotationsManager.cs @@ -191,11 +191,6 @@ private static void SetAnnotation(IEnumerable immutab } } - if (namespaceName == EdmConstants.DocumentationUri && value != null && !(value is IEdmDocumentation)) - { - throw new InvalidOperationException(Edm.Strings.Annotations_DocumentationPun(value.GetType().Name)); - } - IEdmDirectValueAnnotation newAnnotation = value != null ? new EdmDirectValueAnnotation(namespaceName, localName, value) : new EdmDirectValueAnnotation(namespaceName, localName); diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs index 80c21acce8..bae9a57a6c 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs @@ -25,7 +25,7 @@ public class CsdlSemanticsEntityContainerTests [Fact] public void EnsureFunctionImportFunctionPropertyIsUnresolvedFunction() { - var functionImport = new CsdlFunctionImport("GetStuff", "FQ.NS.GetStuff", null /*entitySet*/, true /*includeInServiceDocument*/, null /*documentation*/, testLocation); + var functionImport = new CsdlFunctionImport("GetStuff", "FQ.NS.GetStuff", null /*entitySet*/, true /*includeInServiceDocument*/, testLocation); var csdlEntityContainer = CsdlBuilder.EntityContainer("Container", operationImports: new CsdlOperationImport[] {functionImport}); var schema = CsdlBuilder.Schema("FQ.NS", csdlEntityContainers: new CsdlEntityContainer[] { csdlEntityContainer }); var csdlModel = new CsdlModel(); @@ -53,7 +53,7 @@ public void EnsureFunctionImportFunctionPropertyIsUnresolvedFunction() [Fact] public void EnsureActionImportActionPropertyIsUnresolvedAction() { - var actionImport = new CsdlActionImport("Action", "FQ.NS.Action", null /*entitySet*/, null /*documentation*/, testLocation); + var actionImport = new CsdlActionImport("Action", "FQ.NS.Action", null /*entitySet*/, testLocation); var csdlEntityContainer = CsdlBuilder.EntityContainer("Container", operationImports: new CsdlOperationImport[] { actionImport }); var schema = CsdlBuilder.Schema("FQ.NS", csdlEntityContainers: new CsdlEntityContainer[] { csdlEntityContainer }); var csdlModel = new CsdlModel(); diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs index d38b56ba29..5b28bbd0e3 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs @@ -32,18 +32,18 @@ public class CsdlSemanticsEntitySetTests public CsdlSemanticsEntitySetTests() { var referentialConstraints = new List(); - var csdlNavigation = new CsdlNavigationProperty("Navigation", null, null, null, false, null, referentialConstraints, null, null); - this.csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, Enumerable.Empty(), new[] { csdlNavigation }, null, null); - var goodBinding = new CsdlNavigationPropertyBinding("Navigation", "EntitySet", null, new CsdlLocation(1, 1)); - this.csdlEntitySet = new CsdlEntitySet("EntitySet", "FQ.NS.EntityType", new[] { goodBinding }, null, null); - this.csdlContainer = new CsdlEntityContainer("Container", null, new[] { this.csdlEntitySet }, Enumerable.Empty(), Enumerable.Empty(), null, null); + var csdlNavigation = new CsdlNavigationProperty("Navigation", null, null, null, false, null, referentialConstraints, null); + this.csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, Enumerable.Empty(), new[] { csdlNavigation }, null); + var goodBinding = new CsdlNavigationPropertyBinding("Navigation", "EntitySet", new CsdlLocation(1, 1)); + this.csdlEntitySet = new CsdlEntitySet("EntitySet", "FQ.NS.EntityType", new[] { goodBinding }, null); + this.csdlContainer = new CsdlEntityContainer("Container", null, new[] { this.csdlEntitySet }, Enumerable.Empty(), Enumerable.Empty(), null); - var derivedCsdlNavigation = new CsdlNavigationProperty("DerivedNavigation", null, null, null, false, null, referentialConstraints, null, null); - var derivedCsdlEntityType = new CsdlEntityType("DerivedEntityType", "FQ.NS.EntityType", false, false, false, null, Enumerable.Empty(), new[] { derivedCsdlNavigation }, null, null); + var derivedCsdlNavigation = new CsdlNavigationProperty("DerivedNavigation", null, null, null, false, null, referentialConstraints, null); + var derivedCsdlEntityType = new CsdlEntityType("DerivedEntityType", "FQ.NS.EntityType", false, false, false, null, Enumerable.Empty(), new[] { derivedCsdlNavigation }, null); - var unrelatedCsdlEntityType = new CsdlEntityType("UnrelatedEntityType", null, false, false, false, null, Enumerable.Empty(), Enumerable.Empty(), null, null); + var unrelatedCsdlEntityType = new CsdlEntityType("UnrelatedEntityType", null, false, false, false, null, Enumerable.Empty(), Enumerable.Empty(), null); - var csdlSchema = new CsdlSchema("FQ.NS", null, null, new[] { this.csdlEntityType, derivedCsdlEntityType, unrelatedCsdlEntityType }, Enumerable.Empty(), Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(), Enumerable.Empty(), null, null); + var csdlSchema = new CsdlSchema("FQ.NS", null, null, new[] { this.csdlEntityType, derivedCsdlEntityType, unrelatedCsdlEntityType }, Enumerable.Empty(), Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(), Enumerable.Empty(), null); var csdlModel = new CsdlModel(); csdlModel.AddSchema(csdlSchema); var semanticModel = new CsdlSemanticsModel(csdlModel, new EdmDirectValueAnnotationsManager(), Enumerable.Empty()); @@ -59,8 +59,8 @@ public CsdlSemanticsEntitySetTests() [Fact] public void FindNavigationTargetShouldReturnUnresolvedEntitySetIfEntitySetIsNotFound() { - var nonExistentBinding = new CsdlNavigationPropertyBinding("Navigation", "NonExistent", null, new CsdlLocation(1, 1)); - var testSubject = new CsdlSemanticsEntitySet(this.semanticContainer, new CsdlEntitySet("Fake", "FQ.NS.EntityType", new[] { nonExistentBinding }, null, null)); + var nonExistentBinding = new CsdlNavigationPropertyBinding("Navigation", "NonExistent", new CsdlLocation(1, 1)); + var testSubject = new CsdlSemanticsEntitySet(this.semanticContainer, new CsdlEntitySet("Fake", "FQ.NS.EntityType", new[] { nonExistentBinding }, null)); var result = testSubject.FindNavigationTarget(this.navigationProperty); result.Should().BeAssignableTo(); result.As().Name.Should().Be("NonExistent"); @@ -71,7 +71,7 @@ public void FindNavigationTargetShouldReturnUnresolvedEntitySetIfEntitySetIsNotF public void FindNavigationTargetShouldReturnNullIfNavigationPropertyHasNoBinding() { var testSubject = new CsdlSemanticsEntitySet(this.semanticContainer, this.csdlEntitySet); - Assert.True(testSubject.FindNavigationTarget(new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", "FQ.NS.EntityType", null, null, false, null, Enumerable.Empty(), null, null))) is IEdmUnknownEntitySet); + Assert.True(testSubject.FindNavigationTarget(new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", "FQ.NS.EntityType", null, null, false, null, Enumerable.Empty(), null))) is IEdmUnknownEntitySet); } [Fact] @@ -193,8 +193,8 @@ public void NavigationTargetShouldHaveUnresolvedPathIfPathIsEmpty() private IEdmNavigationPropertyBinding ParseSingleBinding(string path, string target, CsdlLocation location = null) { - var binding = new CsdlNavigationPropertyBinding(path, target, null, location); - var testSubject = new CsdlSemanticsEntitySet(this.semanticContainer, new CsdlEntitySet("Fake", "FQ.NS.EntityType", new[] { binding }, null, null)); + var binding = new CsdlNavigationPropertyBinding(path, target, location); + var testSubject = new CsdlSemanticsEntitySet(this.semanticContainer, new CsdlEntitySet("Fake", "FQ.NS.EntityType", new[] { binding }, null)); testSubject.NavigationPropertyBindings.Should().HaveCount(1); var result = testSubject.NavigationPropertyBindings.Single(); diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs index 6ae0bbaaf5..84de2f55c3 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs @@ -31,17 +31,17 @@ public class CsdlSemanticsNavigationPropertyTests public CsdlSemanticsNavigationPropertyTests() { - var constraints = new[] { new CsdlReferentialConstraint("FK", "ID", null, null) }; - this.collectionProperty = new CsdlNavigationProperty("Collection", "Collection(FQ.NS.EntityType)", null, "Reference", false, null, constraints, null, null); - this.referenceProperty = new CsdlNavigationProperty("Reference", "FQ.NS.EntityType", false, null, false, null, Enumerable.Empty(), null, null); + var constraints = new[] { new CsdlReferentialConstraint("FK", "ID", null) }; + this.collectionProperty = new CsdlNavigationProperty("Collection", "Collection(FQ.NS.EntityType)", null, "Reference", false, null, constraints, null); + this.referenceProperty = new CsdlNavigationProperty("Reference", "FQ.NS.EntityType", false, null, false, null, Enumerable.Empty(), null); - var navigationWithoutPartner = new CsdlNavigationProperty("WithoutPartner", "FQ.NS.EntityType", false, null, false, null, Enumerable.Empty(), null, null); + var navigationWithoutPartner = new CsdlNavigationProperty("WithoutPartner", "FQ.NS.EntityType", false, null, false, null, Enumerable.Empty(), null); - var idProperty = new CsdlProperty("ID", new CsdlNamedTypeReference("Edm.Int32", false, null), null, null, null); - var fkProperty = new CsdlProperty("FK", new CsdlNamedTypeReference("Edm.Int32", false, null), null, null, null); - this.csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, new CsdlKey(new[] { new CsdlPropertyReference("ID", null) }, null), new[] { idProperty, fkProperty }, new[] { collectionProperty, referenceProperty, navigationWithoutPartner }, null, null); + var idProperty = new CsdlProperty("ID", new CsdlNamedTypeReference("Edm.Int32", false, null), null, null); + var fkProperty = new CsdlProperty("FK", new CsdlNamedTypeReference("Edm.Int32", false, null), null, null); + this.csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, new CsdlKey(new[] { new CsdlPropertyReference("ID", null) }, null), new[] { idProperty, fkProperty }, new[] { collectionProperty, referenceProperty, navigationWithoutPartner }, null); - var csdlSchema = new CsdlSchema("FQ.NS", null, null, new[] { this.csdlEntityType }, Enumerable.Empty(), Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(), Enumerable.Empty(), null, null); + var csdlSchema = new CsdlSchema("FQ.NS", null, null, new[] { this.csdlEntityType }, Enumerable.Empty(), Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(),Enumerable.Empty(), Enumerable.Empty(), null); var csdlModel = new CsdlModel(); csdlModel.AddSchema(csdlSchema); @@ -239,20 +239,20 @@ public void NavigationPropertyTypeParsingShouldProduceErrorIfElementTypeCannotBe private IEdmNavigationProperty ParseSingleConstraint(string property, string referencedProperty, CsdlLocation location = null) { - var constraint = new CsdlReferentialConstraint(property, referencedProperty, null, location); - var testSubject = new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", "Fake.Fake", false, "Fake", false, null, new[] { constraint }, null, null)); + var constraint = new CsdlReferentialConstraint(property, referencedProperty, location); + var testSubject = new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", "Fake.Fake", false, "Fake", false, null, new[] { constraint }, null)); return testSubject; } private IEdmNavigationProperty ParseAndGetPartner(string partnerName, string targetTypeName) { - var testSubject = new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", targetTypeName, false, partnerName, false, null, Enumerable.Empty(), null, null)); + var testSubject = new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", targetTypeName, false, partnerName, false, null, Enumerable.Empty(), null)); return testSubject.Partner; } private IEdmNavigationProperty ParseNavigation(string typeName, bool? nullable) { - return new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", typeName, nullable, null, false, null, Enumerable.Empty(), null, null)); + return new CsdlSemanticsNavigationProperty(this.semanticEntityType, new CsdlNavigationProperty("Fake", typeName, nullable, null, false, null, Enumerable.Empty(), null)); } } } diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs index 6969001665..cf1b535aee 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs @@ -29,7 +29,7 @@ public CsdlSemanticsOperationImportTests() public void EnsureEntitySetResolvesToEdmPathExpression() { var action = CsdlBuilder.Action("Checkout"); - var actionImport = new CsdlActionImport("Checkout", "FQ.NS.Checkout", "Nav1/Nav2" /*entitySet*/, null /*documentation*/, testLocation); + var actionImport = new CsdlActionImport("Checkout", "FQ.NS.Checkout", "Nav1/Nav2" /*entitySet*/, testLocation); var csdlEntityContainer = CsdlBuilder.EntityContainer("Container"); var semanticSchema = CreateCsdlSemanticsSchema(csdlEntityContainer, action); @@ -49,7 +49,7 @@ public void EnsureEntitySetResolvesToEdmPathExpression() public void CsdlSemanticsActionImportPropertiesShouldBeInitializedCorrectly() { var action = CsdlBuilder.Action("Checkout"); - var actionImport = new CsdlActionImport("Checkout", "FQ.NS.Checkout", null, null /*documentation*/, testLocation); + var actionImport = new CsdlActionImport("Checkout", "FQ.NS.Checkout", null, testLocation); var csdlEntityContainer = CsdlBuilder.EntityContainer("Container"); var semanticSchema = CreateCsdlSemanticsSchema(csdlEntityContainer, action); @@ -71,7 +71,7 @@ public void CsdlSemanticsFunctionImportPropertiesShouldBeInitializedCorrectly() // Added to ensure this is filtered out var function = CsdlBuilder.Function("GetStuff"); - var functionImport = new CsdlFunctionImport("GetStuff", "FQ.NS.GetStuff", null /*entitySet*/, true /*includeInServiceDocument*/, null /*documentation*/, testLocation); + var functionImport = new CsdlFunctionImport("GetStuff", "FQ.NS.GetStuff", null /*entitySet*/, true /*includeInServiceDocument*/, testLocation); var csdlEntityContainer = CsdlBuilder.EntityContainer("Container"); var semanticSchema = CreateCsdlSemanticsSchema(csdlEntityContainer, function); @@ -90,7 +90,7 @@ public void CsdlSemanticsFunctionImportPropertiesShouldBeInitializedCorrectly() private static CsdlSemanticsSchema CreateCsdlSemanticsSchema(CsdlEntityContainer csdlEntityContainer, params CsdlOperation[] operations) { - var csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, new Collection(), new System.Collections.Generic.List(), null, null); + var csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, new Collection(), new System.Collections.Generic.List(), null); var schema = CsdlBuilder.Schema("FQ.NS", csdlOperations: operations, csdlEntityContainers: new CsdlEntityContainer[] { csdlEntityContainer }, csdlStructuredTypes: new CsdlStructuredType[] { csdlEntityType }); var csdlModel = new CsdlModel(); csdlModel.AddSchema(schema); diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs index 602d436d21..a8909dc4fb 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs @@ -25,7 +25,7 @@ public class CsdlSemanticsOperationTests private readonly CsdlLocation testLocation; public CsdlSemanticsOperationTests() { - this.csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, Enumerable.Empty(), Enumerable.Empty(), null, null); + this.csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, Enumerable.Empty(), Enumerable.Empty(), null); var csdlSchema = CsdlBuilder.Schema("FQ.NS", csdlStructuredTypes: new[] { this.csdlEntityType }); @@ -39,7 +39,7 @@ public CsdlSemanticsOperationTests() [Fact] public void NonBoundCsdlSemanticsOperationPropertiesShouldBeCorrect() { - var function = new CsdlFunction("Checkout", Enumerable.Empty(), new CsdlNamedTypeReference("Edm.String", false, testLocation), false /*isBound*/, null /*entitySetPath*/, true /*isComposable*/, null /*documentation*/, testLocation); + var function = new CsdlFunction("Checkout", Enumerable.Empty(), new CsdlNamedTypeReference("Edm.String", false, testLocation), false /*isBound*/, null /*entitySetPath*/, true /*isComposable*/, testLocation); var semanticFunction = new CsdlSemanticsFunction(this.semanticSchema, function); semanticFunction.IsBound.Should().BeFalse(); semanticFunction.Location().Should().Be(testLocation); @@ -56,11 +56,10 @@ public void BoundCsdlSemanticsOperationPropertiesShouldBeCorrect() { var action = new CsdlAction( "Checkout", - new CsdlOperationParameter[] { new CsdlOperationParameter("entity", new CsdlNamedTypeReference("FQ.NS.EntityType", false, testLocation), null, testLocation) }, + new CsdlOperationParameter[] { new CsdlOperationParameter("entity", new CsdlNamedTypeReference("FQ.NS.EntityType", false, testLocation), testLocation) }, new CsdlNamedTypeReference("Edm.String", false, testLocation), - true /*isBound*/, - "entity/FakePath", - null /*documentation*/, + true /*isBound*/, + "entity/FakePath", testLocation); var semanticAction = new CsdlSemanticsAction(this.semanticSchema, action); diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs index 46356f6f9d..7764cb03df 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs @@ -18,7 +18,6 @@ internal static CsdlEntityContainer EntityContainer( CsdlEntitySet[] entitySets = default(CsdlEntitySet[]), CsdlSingleton[] singletons = default(CsdlSingleton[]), CsdlOperationImport[] operationImports = default(CsdlOperationImport[]), - CsdlDocumentation documentation = null, CsdlLocation location = null) { if (entitySets == null) @@ -42,7 +41,6 @@ internal static CsdlEntityContainer EntityContainer( entitySets, singletons, operationImports, - documentation, location); } @@ -55,7 +53,6 @@ internal static CsdlEntityType EntityType( CsdlKey csdlKey = null, CsdlProperty[] properties = default(CsdlProperty[]), CsdlNavigationProperty[] navProps = default(CsdlNavigationProperty[]), - CsdlDocumentation documentation = null, CsdlLocation location = null) { if (properties == null) @@ -77,17 +74,15 @@ internal static CsdlEntityType EntityType( csdlKey, properties, navProps, - documentation, location); } internal static CsdlOperationParameter Parameter( string name, string fullTypeReferenceName, - CsdlDocumentation documentation = null, CsdlLocation location = null) { - return new CsdlOperationParameter(name, new CsdlNamedTypeReference(fullTypeReferenceName, true, null), documentation, location); + return new CsdlOperationParameter(name, new CsdlNamedTypeReference(fullTypeReferenceName, true, null), location); } internal static CsdlFunction Function( @@ -97,7 +92,6 @@ internal static CsdlFunction Function( bool isBound = false, string entitySetPath = null, bool isComposable = false, - CsdlDocumentation documentation = null, CsdlLocation location = null) { if (parameters == null) @@ -112,7 +106,6 @@ internal static CsdlFunction Function( isBound, entitySetPath, isComposable, - documentation, location); } @@ -122,7 +115,6 @@ internal static CsdlAction Action( CsdlTypeReference typeReference = null, bool isBound = false, string entitySetPath = null, - CsdlDocumentation documentation = null, CsdlLocation location = null) { @@ -137,7 +129,6 @@ internal static CsdlAction Action( typeReference, isBound, entitySetPath, - documentation, location); } @@ -152,7 +143,6 @@ internal static CsdlSchema Schema( CsdlEntityContainer[] csdlEntityContainers = default(CsdlEntityContainer[]), CsdlAnnotations[] csdlAnnotations = default(CsdlAnnotations[]), CsdlTypeDefinition[] csdlTypeDefinitions = default(CsdlTypeDefinition[]), - CsdlDocumentation documentation = null, CsdlLocation location = null) { if (csdlStructuredTypes == null) @@ -201,7 +191,6 @@ internal static CsdlSchema Schema( csdlEntityContainers, csdlAnnotations, csdlTypeDefinitions, - documentation /*documentation*/, location /*location*/); return csdlSchema; diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs index 0f4939a3ca..84628b534b 100644 --- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs +++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs @@ -382,7 +382,7 @@ public void TryGetRelativeEntitySetWithJustBindingParameterShouldReturnTrueAndHa [Fact] public void TryGetEntitySetWithBoundCsdlSemanticOperationParameterShouldReturnTrueAndHaveNoErrors() { - var csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, Enumerable.Empty(), Enumerable.Empty(), null, null); + var csdlEntityType = new CsdlEntityType("EntityType", null, false, false, false, null, Enumerable.Empty(), Enumerable.Empty(), null); var csdlSchema = CsdlBuilder.Schema("FQ.NS", csdlStructuredTypes: new[] { csdlEntityType }); var csdlModel = new CsdlModel(); @@ -393,11 +393,10 @@ public void TryGetEntitySetWithBoundCsdlSemanticOperationParameterShouldReturnTr var action = new CsdlAction( "Checkout", - new CsdlOperationParameter[] { new CsdlOperationParameter("entity", new CsdlNamedTypeReference("FQ.NS.EntityType", false, testLocation), null, testLocation) }, + new CsdlOperationParameter[] { new CsdlOperationParameter("entity", new CsdlNamedTypeReference("FQ.NS.EntityType", false, testLocation), testLocation) }, new CsdlNamedTypeReference("Edm.String", false, testLocation), true /*isBound*/, "entity", - null /*documentation*/, testLocation); var semanticAction = new CsdlSemanticsAction(semanticSchema, action); diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ConstructibleModelTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ConstructibleModelTests.cs index 2cc2513334..f9eef6de69 100644 --- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ConstructibleModelTests.cs +++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ConstructibleModelTests.cs @@ -156,21 +156,6 @@ public void ConstructSimpleEntityTypes() bool caught = false; try - { - model.SetAnnotationValue(f11, "http://schemas.microsoft.com/ado/2011/04/edm/documentation", "Documentation", "Crud"); - } - catch (InvalidOperationException e) - { - if (e.Message.Contains("IEdmDocumentation") && e.Message.Contains("String")) - { - caught = true; - } - } - - Assert.IsTrue(caught, "Documentation pun."); - - caught = false; - try { model.GetAnnotationValue>(f11, "Grumble", "Tumble"); } diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/SchemaParsingTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/SchemaParsingTests.cs index 0326e98054..800c9180f4 100644 --- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/SchemaParsingTests.cs +++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/SchemaParsingTests.cs @@ -550,42 +550,6 @@ public void SchemaReadSingleton() Assert.AreEqual("SingletonPeople", singletonPeople.Name, "SingletonPeople: correct name"); } - [TestMethod] - public void SchemaReadParseDocumentation() - { - //Only parse, do not do validation here. - const string csdl = -@" - - - - - - - - - Just some silly property - - - - Summarize this - Or at length - - -"; - - IEdmModel model; - IEnumerable errors; - bool parsed = SchemaReader.TryParse(new XmlReader[] { XmlReader.Create(new StringReader(csdl)) }, out model, out errors); - Assert.IsTrue(parsed, "parsed"); - Assert.IsTrue(errors.Count() == 0, "No errors"); - - IEdmEntityType person = (IEdmEntityType)model.SchemaElements.First(); - // Test the structural objects. - - IEdmProperty address = person.DeclaredStructuralProperties().Last(); - } - [TestMethod] public void SchemaReadAssociationAndNavigationProperty() { @@ -1660,36 +1624,6 @@ public void OperationImportParameterAndReturnTypesV3() Assert.IsFalse(operationImports[10].TryGetStaticEntitySet(model, out eset), "operationImports[10].TryGetStaticEntitySet"); Assert.IsFalse(operationImports[10].TryGetRelativeEntitySetPath(model, out p, out np, out entitySetPathErrors), "operationImports[10].TryGetStaticEntitySet"); } - - [TestMethod] - public void SimpleOperationWithDocumentation() - { - const string csdl = -@" - - - - - - - - - - Function Documentation!!! - - - -"; - - IEdmModel model; - IEnumerable errors; - bool parsed = SchemaReader.TryParse(new XmlReader[] { XmlReader.Create(new StringReader(csdl)) }, out model, out errors); - Assert.IsTrue(parsed, "parsed"); - Assert.IsTrue(errors.Count() == 0, "No errors"); - - IEdmOperation getAge = (IEdmOperation)model.FindOperations("foo.GetAge").First(); - } - #endregion [TestMethod] diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalUtilities/ModelBuilder.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalUtilities/ModelBuilder.cs index 46dd7fe634..d30a2d53ab 100644 --- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalUtilities/ModelBuilder.cs +++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalUtilities/ModelBuilder.cs @@ -1008,12 +1008,7 @@ public static IEnumerable SimpleConstructiveApiTestModel() - - - Foolishness rules. - Wisdom drools. - - +