Skip to content

Commit

Permalink
Extra default(T) simplifications.
Browse files Browse the repository at this point in the history
  • Loading branch information
Corniel Nobel committed Jul 9, 2019
1 parent 963f4c7 commit d676141
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 46 deletions.
6 changes: 3 additions & 3 deletions src/Qowaiv/EmailAddress.cs
View file
Expand Up @@ -84,7 +84,7 @@ public struct EmailAddress : ISerializable, IXmlSerializable, IJsonSerializable,
#region Methods

/// <summary>Returns true if the email address is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(string);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the email address is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -151,7 +151,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
/// <summary>Generates an email address from a JSON null object representation.</summary>
void IJsonSerializable.FromJson()
{
m_Value = default(string);
m_Value = default;
}

/// <summary>Generates an email address from a JSON string representation.</summary>
Expand Down Expand Up @@ -184,7 +184,7 @@ void IJsonSerializable.FromJson(string jsonString)
/// <summary>Converts an email address into its JSON object representation.</summary>
object IJsonSerializable.ToJson()
{
return m_Value == default(string) ? null : ToString(CultureInfo.InvariantCulture);
return m_Value == default ? null : ToString(CultureInfo.InvariantCulture);
}

#endregion
Expand Down
6 changes: 3 additions & 3 deletions src/Qowaiv/Financial/BankIdentifierCode.cs
View file
Expand Up @@ -97,7 +97,7 @@ public Country Country
#region Methods

/// <summary>Returns true if the BIC is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(string);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the BIC is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -162,7 +162,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
#region (JSON) (De)serialization

/// <summary>Generates a BIC from a JSON null object representation.</summary>
void IJsonSerializable.FromJson() => m_Value = default(string);
void IJsonSerializable.FromJson() => m_Value = default;


/// <summary>Generates a BIC from a JSON string representation.</summary>
Expand Down Expand Up @@ -195,7 +195,7 @@ void IJsonSerializable.FromJson(string jsonString)
/// <summary>Converts a BIC into its JSON object representation.</summary>
object IJsonSerializable.ToJson()
{
return m_Value == default(string) ? null : ToString(CultureInfo.InvariantCulture);
return m_Value == default ? null : ToString(CultureInfo.InvariantCulture);
}

#endregion
Expand Down
16 changes: 8 additions & 8 deletions src/Qowaiv/Financial/Currency.cs
View file
Expand Up @@ -75,16 +75,16 @@ public partial struct Currency : ISerializable, IXmlSerializable, IJsonSerializa
public string IsoCode => GetResourceString("ISO", CultureInfo.InvariantCulture);

///<summary>Gets the numeric code defined in ISO 4217 for the currency.</summary>
public int IsoNumericCode => m_Value == default(string) ? 0 : XmlConvert.ToInt32(GetResourceString("Num", CultureInfo.InvariantCulture));
public int IsoNumericCode => m_Value == default ? 0 : XmlConvert.ToInt32(GetResourceString("Num", CultureInfo.InvariantCulture));

///<summary>Gets the symbol for a currency.</summary>
public string Symbol => m_Value == default(string) ? "" : GetResourceString("Symbol", CultureInfo.InvariantCulture);
public string Symbol => m_Value == default ? "" : GetResourceString("Symbol", CultureInfo.InvariantCulture);

///<summary>Gets the number of after the decimal separator.</summary>
public int Digits => m_Value == default(string) ? 0 : XmlConvert.ToInt32(GetResourceString("Digits", CultureInfo.InvariantCulture));
public int Digits => m_Value == default ? 0 : XmlConvert.ToInt32(GetResourceString("Digits", CultureInfo.InvariantCulture));

/// <summary>Gets the start date from witch the currency exists.</summary>
public Date StartDate => m_Value == default(string) ? Date.MinValue : (Date)XmlConvert.ToDateTime(GetResourceString("StartDate", CultureInfo.InvariantCulture), "yyyy-MM-dd");
public Date StartDate => m_Value == default ? Date.MinValue : (Date)XmlConvert.ToDateTime(GetResourceString("StartDate", CultureInfo.InvariantCulture), "yyyy-MM-dd");

/// <summary>If the currency does not exist anymore, the end date is given, otherwise null.</summary>
public Date? EndDate
Expand All @@ -101,7 +101,7 @@ public partial struct Currency : ISerializable, IXmlSerializable, IJsonSerializa
#region Methods

/// <summary>Returns true if the currency is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(string);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the currency is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -193,7 +193,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
#region (JSON) (De)serialization

/// <summary>Generates a currency from a JSON null object representation.</summary>
void IJsonSerializable.FromJson() => m_Value = default(string);
void IJsonSerializable.FromJson() => m_Value = default;


/// <summary>Generates a currency from a JSON string representation.</summary>
Expand Down Expand Up @@ -229,7 +229,7 @@ void IJsonSerializable.FromJson(Int64 jsonInteger)
/// <summary>Converts a currency into its JSON object representation.</summary>
object IJsonSerializable.ToJson()
{
return m_Value == default(string) ? null : ToString(CultureInfo.InvariantCulture);
return m_Value == default ? null : ToString(CultureInfo.InvariantCulture);
}

#endregion
Expand Down Expand Up @@ -676,7 +676,7 @@ internal string GetResourceString(string postfix, IFormatProvider formatProvider
/// </param>
internal string GetResourceString(string postfix, CultureInfo culture)
{
if (m_Value == default(string)) { return string.Empty; }
if (m_Value == default) { return string.Empty; }
return ResourceManager.GetString(m_Value + '_' + postfix, culture ?? CultureInfo.CurrentCulture) ?? string.Empty;
}

Expand Down
14 changes: 7 additions & 7 deletions src/Qowaiv/Financial/InternationalBankAccountNumber.cs
View file
Expand Up @@ -64,7 +64,7 @@ public Country Country
{
get
{
if (m_Value == default(string))
if (m_Value == default)
{
return Country.Empty;
}
Expand All @@ -81,7 +81,7 @@ public Country Country
#region Methods

/// <summary>Returns true if the IBAN is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(string);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the Gender is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -146,7 +146,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
#region (JSON) (De)serialization

/// <summary>Generates an IBAN from a JSON null object representation.</summary>
void IJsonSerializable.FromJson() => m_Value = default(string);
void IJsonSerializable.FromJson() => m_Value = default;

/// <summary>Generates an IBAN from a JSON string representation.</summary>
/// <param name="jsonString">
Expand Down Expand Up @@ -178,7 +178,7 @@ void IJsonSerializable.FromJson(string jsonString)
/// <summary>Converts an IBAN into its JSON object representation.</summary>
object IJsonSerializable.ToJson()
{
return m_Value == default(string) ? null : ToUnformattedString();
return m_Value == default ? null : ToUnformattedString();
}

#endregion
Expand All @@ -191,7 +191,7 @@ private string DebuggerDisplay
{
get
{
if (m_Value == default(string))
if (m_Value == default)
{
return "IBAN: (empty)";
}
Expand All @@ -206,7 +206,7 @@ private string DebuggerDisplay
/// <summary>Formats the IBAN without spaces.</summary>
private string ToUnformattedString()
{
if (m_Value == default(string))
if (m_Value == default)
{
return string.Empty;
}
Expand All @@ -225,7 +225,7 @@ private string ToUnformattedString()
/// <summary>Formats the IBAN with spaces.</summary>
private string ToFormattedString()
{
if (m_Value == default(string))
if (m_Value == default)
{
return string.Empty;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Qowaiv/Formatting/FormattingArguments.cs
View file
Expand Up @@ -12,7 +12,7 @@ namespace Qowaiv.Formatting
public struct FormattingArguments : ISerializable
{
/// <summary>Represents empty/not set formatting arguments.</summary>
public static readonly FormattingArguments None = new FormattingArguments(default(string), null);
public static readonly FormattingArguments None = new FormattingArguments(default, null);

/// <summary>Initializes a new instance of new formatting arguments.</summary>
/// <param name="format">
Expand Down
6 changes: 3 additions & 3 deletions src/Qowaiv/Gender.cs
View file
Expand Up @@ -90,7 +90,7 @@ public struct Gender : ISerializable, IXmlSerializable, IJsonSerializable, IForm
#region Methods

/// <summary>Returns true if the Gender is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(byte);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the Gender is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -173,7 +173,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
/// <summary>Generates a Gender from a JSON null object representation.</summary>
void IJsonSerializable.FromJson()
{
m_Value = default(byte);
m_Value = default;
}

/// <summary>Generates a Gender from a JSON string representation.</summary>
Expand Down Expand Up @@ -222,7 +222,7 @@ private string DebuggerDisplay
{
get
{
if (m_Value == default(byte)) { return "Gender: (empty)"; }
if (m_Value == default) { return "Gender: (empty)"; }
return "Gender: " + GetDisplayName(CultureInfo.InvariantCulture);
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/Qowaiv/Globalization/Country.cs
View file
Expand Up @@ -83,7 +83,7 @@ public partial struct Country : ISerializable, IXmlSerializable, IJsonSerializab
/// <returns>
/// The numeric code defined in ISO 3166-1 for the country/region.
/// </returns>
public int IsoNumericCode { get { return m_Value == default(string) ? 0 : XmlConvert.ToInt32(GetResourceString("ISO", CultureInfo.InvariantCulture)); } }
public int IsoNumericCode { get { return m_Value == default ? 0 : XmlConvert.ToInt32(GetResourceString("ISO", CultureInfo.InvariantCulture)); } }

/// <summary>Gets the country calling code as defined by ITU-T.</summary>
/// <remarks>
Expand All @@ -95,7 +95,7 @@ public partial struct Country : ISerializable, IXmlSerializable, IJsonSerializab
public bool RegionInfoExists { get { return !string.IsNullOrEmpty(GetResourceString("RegionInfoExists", CultureInfo.InvariantCulture)); } }

/// <summary>Gets the start date from witch the country exists.</summary>
public Date StartDate { get { return m_Value == default(string) ? Date.MinValue : (Date)XmlConvert.ToDateTime(GetResourceString("StartDate", CultureInfo.InvariantCulture), "yyyy-MM-dd"); } }
public Date StartDate { get { return m_Value == default ? Date.MinValue : (Date)XmlConvert.ToDateTime(GetResourceString("StartDate", CultureInfo.InvariantCulture), "yyyy-MM-dd"); } }

/// <summary>If the country does not exist anymore, the end date is given, otherwise null.</summary>
public Date? EndDate
Expand All @@ -112,7 +112,7 @@ public partial struct Country : ISerializable, IXmlSerializable, IJsonSerializab
#region Methods

/// <summary>Returns true if the Country is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(string);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the Country is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -223,7 +223,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
#region (JSON) (De)serialization

/// <summary>Generates a Country from a JSON null object representation.</summary>
void IJsonSerializable.FromJson() => m_Value = default(string);
void IJsonSerializable.FromJson() => m_Value = default;

/// <summary>Generates a Country from a JSON string representation.</summary>
/// <param name="jsonString">
Expand Down Expand Up @@ -268,7 +268,7 @@ private string DebuggerDisplay
{
get
{
if (m_Value == default(string))
if (m_Value == default)
{
return "Country: (empty)";
}
Expand Down Expand Up @@ -575,7 +575,7 @@ public static bool TryParse(string s, IFormatProvider formatProvider, out Countr
/// </returns>
public static Country Create(RegionInfo region)
{
if (region == null) { return default(Country); }
if (region == null) { return default; }
// In .NET, Serbia and Montenegro (CS) is still active.
if (region.TwoLetterISORegionName == "CS") { return CSXX; }

Expand All @@ -594,7 +594,7 @@ public static Country Create(CultureInfo culture)
{
if (culture == null || culture == CultureInfo.InvariantCulture || culture.IsNeutralCulture)
{
return default(Country);
return default;
}

var name = culture.Name.Substring(culture.Name.IndexOf('-') + 1);
Expand Down Expand Up @@ -700,7 +700,7 @@ internal string GetResourceString(string postfix, IFormatProvider formatProvider
/// </param>
internal string GetResourceString(string postfix, CultureInfo culture)
{
if (m_Value == default(string)) { return string.Empty; }
if (m_Value == default) { return string.Empty; }
return ResourceManager.GetString(m_Value + '_' + postfix, culture ?? CultureInfo.CurrentCulture) ?? string.Empty;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Qowaiv/IO/StreamSize.cs
View file
Expand Up @@ -411,7 +411,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
/// <summary>Generates a stream size from a JSON null object representation.</summary>
void IJsonSerializable.FromJson()
{
m_Value = default(long);
m_Value = default;
}

/// <summary>Generates a stream size from a JSON string representation.</summary>
Expand Down
6 changes: 3 additions & 3 deletions src/Qowaiv/Month.cs
View file
Expand Up @@ -99,7 +99,7 @@ public struct Month : ISerializable, IXmlSerializable, IJsonSerializable, IForma
#region Methods

/// <summary>Returns true if the month is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(byte);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the month is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down Expand Up @@ -195,7 +195,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
#region (JSON) (De)serialization

/// <summary>Generates a month from a JSON null object representation.</summary>
void IJsonSerializable.FromJson() => m_Value = default(Byte);
void IJsonSerializable.FromJson() => m_Value = default;

/// <summary>Generates a month from a JSON string representation.</summary>
/// <param name="jsonString">
Expand Down Expand Up @@ -224,7 +224,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
/// <summary>Converts a month into its JSON object representation.</summary>
object IJsonSerializable.ToJson()
{
return (m_Value == default(byte)) ? null : ToString(CultureInfo.InvariantCulture);
return (m_Value == default) ? null : ToString(CultureInfo.InvariantCulture);
}

#endregion
Expand Down
4 changes: 2 additions & 2 deletions src/Qowaiv/PostalCode.cs
View file
Expand Up @@ -53,7 +53,7 @@ public struct PostalCode : ISerializable, IXmlSerializable, IJsonSerializable, I
#region Methods

/// <summary>Returns true if the postal code is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(string);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the postal code is unknown, otherwise false.</summary>
public bool IsUnknown() { return m_Value == PostalCode.Unknown.m_Value; }
Expand Down Expand Up @@ -139,7 +139,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
/// <summary>Generates a postal code from a JSON null object representation.</summary>
void IJsonSerializable.FromJson()
{
m_Value = default(string);
m_Value = default;
}

/// <summary>Generates a postal code from a JSON string representation.</summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Qowaiv/Statistics/Elo.cs
View file
Expand Up @@ -33,7 +33,7 @@ namespace Qowaiv.Statistics
public struct Elo : ISerializable, IXmlSerializable, IJsonSerializable, IFormattable, IEquatable<Elo>, IComparable, IComparable<Elo>
{
/// <summary>Represents the zero value of an Elo.</summary>
public static readonly Elo Zero = new Elo { m_Value = default(Double) };
public static readonly Elo Zero = new Elo { m_Value = default };

/// <summary>Represents the minimum value of an Elo.</summary>
public static readonly Elo MinValue = new Elo { m_Value = Double.MinValue };
Expand Down
6 changes: 3 additions & 3 deletions src/Qowaiv/Uuid.cs
View file
Expand Up @@ -60,7 +60,7 @@ public struct Uuid : ISerializable, IXmlSerializable, IJsonSerializable, IFormat
#region Methods

/// <summary>Returns true if the UUID is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(Guid);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns a 16-element byte array that contains the value of this instance.</summary>
public byte[] ToByteArray() => m_Value.ToByteArray();
Expand Down Expand Up @@ -122,7 +122,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
#region (JSON) (De)serialization

/// <summary>Generates a UUID from a JSON null object representation.</summary>
void IJsonSerializable.FromJson() => m_Value = default(Guid);
void IJsonSerializable.FromJson() => m_Value = default;

/// <summary>Generates a UUID from a JSON string representation.</summary>
/// <param name="jsonString">
Expand Down Expand Up @@ -150,7 +150,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)


/// <summary>Converts a UUID into its JSON object representation.</summary>
object IJsonSerializable.ToJson() => m_Value == default(Guid) ? null : ToString(CultureInfo.InvariantCulture);
object IJsonSerializable.ToJson() => m_Value == default ? null : ToString(CultureInfo.InvariantCulture);

#endregion

Expand Down
2 changes: 1 addition & 1 deletion src/Qowaiv/Year.cs
View file
Expand Up @@ -59,7 +59,7 @@ public bool IsLeapYear
#region Methods

/// <summary>Returns true if the year is empty, otherwise false.</summary>
public bool IsEmpty() => m_Value == default(short);
public bool IsEmpty() => m_Value == default;

/// <summary>Returns true if the year is unknown, otherwise false.</summary>
public bool IsUnknown() => m_Value == Unknown.m_Value;
Expand Down

0 comments on commit d676141

Please sign in to comment.