Skip to content
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

Add support for processing Edm.Decimal data type #258

Closed
wants to merge 1 commit into from
Closed

Add support for processing Edm.Decimal data type #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ApiDoctor.Validation/ExtensionMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ public static SimpleDataType ParseSimpleTypeString(string lowercaseString)
case "single":
simpleType = SimpleDataType.Single;
break;
case "decimal":
case "double":
simpleType = SimpleDataType.Double;
break;
Expand Down
1 change: 1 addition & 0 deletions ApiDoctor.Validation/OData/ExtensionMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public static class ExtensionMethods
{ "Edm.DateTimeOffset", SimpleDataType.DateTimeOffset },
{ "Edm.Duration", SimpleDataType.Duration },
{ "Edm.Double", SimpleDataType.Double },
{ "Edm.Decimal", SimpleDataType.Decimal },
{ "Edm.Float", SimpleDataType.Float },
{ "Edm.Guid", SimpleDataType.Guid },
{ "Edm.TimeOfDay", SimpleDataType.TimeOfDay},
Expand Down
15 changes: 14 additions & 1 deletion ApiDoctor.Validation/ParameterDataType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,12 @@ internal bool JsonLooksDifferentFrom(ParameterDataType type)
type.Type != SimpleDataType.Int16 &&
type.Type != SimpleDataType.Int32 &&
type.Type != SimpleDataType.Int64;
case SimpleDataType.Decimal:
case SimpleDataType.Double:
case SimpleDataType.Float:
case SimpleDataType.Single:
return
type.Type != SimpleDataType.Decimal &&
type.Type != SimpleDataType.Double &&
type.Type != SimpleDataType.Float &&
type.Type != SimpleDataType.Single;
Expand Down Expand Up @@ -334,6 +336,7 @@ internal bool IsLessSpecificThan(ParameterDataType type)

float
-> double
-> decimal

object
-> complex type
Expand Down Expand Up @@ -374,7 +377,11 @@ We should never allow something from one tree to be considered less specific tha
{
return true;
}
else if (this.Type == SimpleDataType.Double && (type.Type == SimpleDataType.Float))
else if (this.Type == SimpleDataType.Decimal && (type.Type == SimpleDataType.Double || type.Type == SimpleDataType.Float))
{
return true;
}
else if (this.Type == SimpleDataType.Double && type.Type == SimpleDataType.Float)
{
return true;
}
Expand Down Expand Up @@ -418,6 +425,7 @@ static ParameterDataType()
GenericObject = new ParameterDataType(SimpleDataType.Object);
GenericCollection = new ParameterDataType(SimpleDataType.Object, true);
Boolean = new ParameterDataType(SimpleDataType.Boolean);
Decimal = new ParameterDataType(SimpleDataType.Decimal);
Double = new ParameterDataType(SimpleDataType.Double);
Float = new ParameterDataType(SimpleDataType.Float);
Guid = new ParameterDataType(SimpleDataType.Guid);
Expand All @@ -440,6 +448,10 @@ public static ParameterDataType GenericCollection
get; private set;
}
public static ParameterDataType Boolean
{
get; private set;
}
public static ParameterDataType Decimal
{
get; private set;
}
Expand Down Expand Up @@ -493,6 +505,7 @@ public enum SimpleDataType

Float,
Double,
Decimal,

Date,
DateTimeOffset,
Expand Down
1 change: 1 addition & 0 deletions ApiDoctor.Validation/ParameterDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public JToken ToExampleJToken()
return new JValue(DateTime.Now.ToString("yyyy-MM-dd"));
case SimpleDataType.DateTimeOffset:
return new JValue(DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"));
case SimpleDataType.Decimal:
case SimpleDataType.Double:
case SimpleDataType.Float:
case SimpleDataType.Single:
Expand Down
Loading