Skip to content

Fix the issue #32: Annotation TopSupported should be a Tag, not a Record #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xuzhg merged 3 commits into from
Apr 6, 2023
Merged

Fix the issue #32: Annotation TopSupported should be a Tag, not a Record #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34c9dc7
Fix the issue #32: Annotation TopSupported should be a Tag, not a Record
xuzhg Oct 13, 2022
1408e5f
Address the comments
xuzhg Apr 5, 2023
b6214c5
Address the comments
xuzhg Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 5 additions & 280 deletions src/Microsoft.OData.ModelBuilder/Microsoft.OData.ModelBuilder.xml
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 1 addition & 28 deletions ...odelBuilder/Vocabularies/Capabilities/V1/AnnotationValuesInQuerySupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class AnnotationValuesInQuerySupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _annotationValuesInQuerySupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.AnnotationValuesInQuerySupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="AnnotationValuesInQuerySupportedConfiguration"/></returns>
public AnnotationValuesInQuerySupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Supports annotation values within system query options
/// </summary>
Expand All @@ -48,21 +35,7 @@ public AnnotationValuesInQuerySupportedConfiguration IsAnnotationValuesInQuerySu
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_annotationValuesInQuerySupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("AnnotationValuesInQuerySupported", new EdmBooleanConstant(_annotationValuesInQuerySupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _annotationValuesInQuerySupported.HasValue ? new EdmBooleanConstant(_annotationValuesInQuerySupported.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions ...a.ModelBuilder/Vocabularies/Capabilities/V1/AsynchronousRequestsSupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class AsynchronousRequestsSupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _asynchronousRequestsSupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.AsynchronousRequestsSupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="AsynchronousRequestsSupportedConfiguration"/></returns>
public AsynchronousRequestsSupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Service supports the asynchronous request preference
/// </summary>
Expand All @@ -48,21 +35,7 @@ public AsynchronousRequestsSupportedConfiguration IsAsynchronousRequestsSupporte
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_asynchronousRequestsSupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("AsynchronousRequestsSupported", new EdmBooleanConstant(_asynchronousRequestsSupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _asynchronousRequestsSupported.HasValue ? new EdmBooleanConstant(_asynchronousRequestsSupported.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions ...a.ModelBuilder/Vocabularies/Capabilities/V1/BatchContinueOnErrorSupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class BatchContinueOnErrorSupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _batchContinueOnErrorSupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.BatchContinueOnErrorSupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="BatchContinueOnErrorSupportedConfiguration"/></returns>
public BatchContinueOnErrorSupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Service supports the continue on error preference. Supports $batch requests. Services that apply the BatchContinueOnErrorSupported term should also specify the ContinueOnErrorSupported property from the BatchSupport term.
/// </summary>
Expand All @@ -48,21 +35,7 @@ public BatchContinueOnErrorSupportedConfiguration IsBatchContinueOnErrorSupporte
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_batchContinueOnErrorSupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("BatchContinueOnErrorSupported", new EdmBooleanConstant(_batchContinueOnErrorSupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _batchContinueOnErrorSupported.HasValue ? new EdmBooleanConstant(_batchContinueOnErrorSupported.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions src/Microsoft.OData.ModelBuilder/Vocabularies/Capabilities/V1/BatchSupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class BatchSupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _batchSupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.BatchSupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="BatchSupportedConfiguration"/></returns>
public BatchSupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Supports $batch requests. Services that apply the BatchSupported term should also apply the more comprehensive BatchSupport term.
/// </summary>
Expand All @@ -48,21 +35,7 @@ public BatchSupportedConfiguration IsBatchSupported(bool batchSupported)
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_batchSupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("BatchSupported", new EdmBooleanConstant(_batchSupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _batchSupported.HasValue ? new EdmBooleanConstant(_batchSupported.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions ...icrosoft.OData.ModelBuilder/Vocabularies/Capabilities/V1/ComputeSupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class ComputeSupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _computeSupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.ComputeSupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="ComputeSupportedConfiguration"/></returns>
public ComputeSupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Supports $compute
/// </summary>
Expand All @@ -48,21 +35,7 @@ public ComputeSupportedConfiguration IsComputeSupported(bool computeSupported)
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_computeSupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("ComputeSupported", new EdmBooleanConstant(_computeSupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _computeSupported.HasValue ? new EdmBooleanConstant(_computeSupported.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions ...rosoft.OData.ModelBuilder/Vocabularies/Capabilities/V1/CrossJoinSupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class CrossJoinSupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _crossJoinSupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.CrossJoinSupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="CrossJoinSupportedConfiguration"/></returns>
public CrossJoinSupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Supports cross joins for the entity sets in this container
/// </summary>
Expand All @@ -48,21 +35,7 @@ public CrossJoinSupportedConfiguration IsCrossJoinSupported(bool crossJoinSuppor
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_crossJoinSupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("CrossJoinSupported", new EdmBooleanConstant(_crossJoinSupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _crossJoinSupported.HasValue ? new EdmBooleanConstant(_crossJoinSupported.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions src/Microsoft.OData.ModelBuilder/Vocabularies/Capabilities/V1/IndexableByKeyConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class IndexableByKeyConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _indexableByKey;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.IndexableByKey";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="IndexableByKeyConfiguration"/></returns>
public IndexableByKeyConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Supports key values according to OData URL conventions
/// </summary>
Expand All @@ -48,21 +35,7 @@ public IndexableByKeyConfiguration IsIndexableByKey(bool indexableByKey)
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_indexableByKey.HasValue)
{
properties.Add(new EdmPropertyConstructor("IndexableByKey", new EdmBooleanConstant(_indexableByKey.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _indexableByKey.HasValue ? new EdmBooleanConstant(_indexableByKey.Value) : null;
}
}
}
29 changes: 1 addition & 28 deletions ...oft.OData.ModelBuilder/Vocabularies/Capabilities/V1/KeyAsSegmentSupportedConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,11 @@ namespace Microsoft.OData.ModelBuilder.Capabilities.V1
/// </summary>
public partial class KeyAsSegmentSupportedConfiguration : VocabularyTermConfiguration
{
private readonly Dictionary<string, object> _dynamicProperties = new Dictionary<string, object>();
private bool? _keyAsSegmentSupported;

/// <inheritdoc/>
public override string TermName => "Org.OData.Capabilities.V1.KeyAsSegmentSupported";

/// <summary>
/// Dynamic properties.
/// </summary>
/// <param name="name">The name to set</param>
/// <param name="value">The value to set</param>
/// <returns><see cref="KeyAsSegmentSupportedConfiguration"/></returns>
public KeyAsSegmentSupportedConfiguration HasDynamicProperty(string name, object value)
{
_dynamicProperties[name] = value;
return this;
}

/// <summary>
/// Supports [key-as-segment convention](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_KeyasSegmentConvention) for addressing entities within a collection
/// </summary>
Expand All @@ -48,21 +35,7 @@ public KeyAsSegmentSupportedConfiguration IsKeyAsSegmentSupported(bool keyAsSegm
/// <inheritdoc/>
public override IEdmExpression ToEdmExpression()
{
var properties = new List<IEdmPropertyConstructor>();

if (_keyAsSegmentSupported.HasValue)
{
properties.Add(new EdmPropertyConstructor("KeyAsSegmentSupported", new EdmBooleanConstant(_keyAsSegmentSupported.Value)));
}

properties.AddRange(_dynamicProperties.ToEdmProperties());

if (!properties.Any())
{
return null;
}

return new EdmRecordExpression(properties);
return _keyAsSegmentSupported.HasValue ? new EdmBooleanConstant(_keyAsSegmentSupported.Value) : null;
}
}
}
Loading