pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

modifies GetJoinForKey and GetJoinSpanForKey to be one-liners

Browse Source 
* converts private JoinData property to readonly JoinData field and updates usages
* fixes some accidental recursiveness in JoinNameAttribute - converts Name property to auto-property
This commit is contained in:
Andrew Welker
2020-03-27 09:22:44 -06:00
parent 96a77539a1
commit c45bf44056
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
View File

@@ -203,14 +203,10 @@ namespace PepperDash.Essentials.Core
/// <returns></returns> /// <returns></returns>
public uint GetJoinForKey(string key) public uint GetJoinForKey(string key)
{ {
if (Joins.ContainsKey(key)) return Joins.ContainsKey(key) ? Joins[key].JoinNumber : 0;
return Joins[key].JoinNumber;
else
return 0;
} }
/// <summary> /// <summary>
/// Returns the join span for the join with the specified key /// Returns the join span for the join with the specified key
/// </summary> /// </summary>
@@ -218,12 +214,8 @@ namespace PepperDash.Essentials.Core
/// <returns></returns> /// <returns></returns>
public uint GetJoinSpanForKey(string key) public uint GetJoinSpanForKey(string key)
{ {
if (Joins.ContainsKey(key)) return Joins.ContainsKey(key) ? Joins[key].JoinSpan : 0;
return Joins[key].JoinSpan;
else return 0;
} }
} }
/// <summary> /// <summary>
@@ -315,24 +307,24 @@ namespace PepperDash.Essentials.Core
/// </summary> /// </summary>
public class JoinDataComplete public class JoinDataComplete
{ {
JoinData _Data { get; set; } private readonly JoinData _data;
public JoinMetadata Metadata { get; set; } public JoinMetadata Metadata { get; set; }
public JoinDataComplete(JoinData data, JoinMetadata metadata) public JoinDataComplete(JoinData data, JoinMetadata metadata)
{ {
_Data = data; _data = data;
Metadata = metadata; Metadata = metadata;
} }
public uint JoinNumber public uint JoinNumber
{ {
get { return _Data.JoinNumber; } get { return _data.JoinNumber; }
set { _Data.JoinNumber = value; } set { _data.JoinNumber = value; }
} }
public uint JoinSpan public uint JoinSpan
{ {
get { return _Data.JoinSpan; } get { return _data.JoinSpan; }
} }
public string GetNameAttribute() public string GetNameAttribute()
@@ -350,16 +342,11 @@ namespace PepperDash.Essentials.Core
[AttributeUsage(AttributeTargets.Field)] [AttributeUsage(AttributeTargets.Field)]
public class JoinNameAttribute : Attribute public class JoinNameAttribute : Attribute
{ {
private string _name; public string Name { get; set; }
public string Name
{
get { return this.Name; }
set { this._name = value; }
}
public JoinNameAttribute(string name) public JoinNameAttribute(string name)
{ {
this._name = name; Name = name;
} }
} }
} }