mirror of https://github.com/ppy/osu
Merge pull request #16268 from bdach/implicit-newtonsoft-properties
Revert rename of implicitly-used newtonsoft method
This commit is contained in:
commit
f2ed8af9cb
|
@ -70,8 +70,15 @@ public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> val
|
|||
SliderFactor = values[ATTRIB_ID_SLIDER_FACTOR];
|
||||
}
|
||||
|
||||
// Used implicitly by Newtonsoft.Json to not serialize flashlight property in some cases.
|
||||
#region Newtonsoft.Json implicit ShouldSerialize() methods
|
||||
|
||||
// The properties in this region are used implicitly by Newtonsoft.Json to not serialise certain fields in some cases.
|
||||
// They rely on being named exactly the same as the corresponding fields (casing included) and as such should NOT be renamed
|
||||
// unless the fields are also renamed.
|
||||
|
||||
[UsedImplicitly]
|
||||
public bool ShouldSerializeFlashlightRating() => Mods.Any(m => m is ModFlashlight);
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using JetBrains.Annotations;
|
||||
using Newtonsoft.Json;
|
||||
using osu.Framework.Bindables;
|
||||
using osu.Game.Beatmaps;
|
||||
|
@ -112,8 +113,20 @@ public void MapObjects(IRulesetStore rulesets)
|
|||
}
|
||||
}
|
||||
|
||||
#region Newtonsoft.Json implicit ShouldSerialize() methods
|
||||
|
||||
// The properties in this region are used implicitly by Newtonsoft.Json to not serialise certain fields in some cases.
|
||||
// They rely on being named exactly the same as the corresponding fields (casing included) and as such should NOT be renamed
|
||||
// unless the fields are also renamed.
|
||||
|
||||
[UsedImplicitly]
|
||||
public bool ShouldSerializeID() => false;
|
||||
public bool ShouldSerializeAPIBeatmap() => false;
|
||||
|
||||
// ReSharper disable once IdentifierTypo
|
||||
[UsedImplicitly]
|
||||
public bool ShouldSerializeapiBeatmap() => false;
|
||||
|
||||
#endregion
|
||||
|
||||
public bool Equals(PlaylistItem other)
|
||||
=> ID == other?.ID
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
using System;
|
||||
using System.Linq;
|
||||
using JetBrains.Annotations;
|
||||
using Newtonsoft.Json;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Bindables;
|
||||
|
@ -211,8 +212,21 @@ public void RemoveExpiredPlaylistItems()
|
|||
Playlist.RemoveAll(i => i.Expired);
|
||||
}
|
||||
|
||||
#region Newtonsoft.Json implicit ShouldSerialize() methods
|
||||
|
||||
// The properties in this region are used implicitly by Newtonsoft.Json to not serialise certain fields in some cases.
|
||||
// They rely on being named exactly the same as the corresponding fields (casing included) and as such should NOT be renamed
|
||||
// unless the fields are also renamed.
|
||||
|
||||
[UsedImplicitly]
|
||||
public bool ShouldSerializeRoomID() => false;
|
||||
|
||||
[UsedImplicitly]
|
||||
public bool ShouldSerializeHost() => false;
|
||||
|
||||
[UsedImplicitly]
|
||||
public bool ShouldSerializeEndDate() => false;
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue