THRIFT-5746 Upgrade to net8
Client: netstd
Patch: Jens Geyer
diff --git a/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs b/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs
index 11b5af4..7a43ca8 100644
--- a/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs
+++ b/lib/netstd/Tests/Thrift.Tests/DataModel/DeepCopy.cs
@@ -59,7 +59,7 @@
return instance;
}
- private jack? MakeNestedUnion(int nesting)
+ private jack.nested_struct? MakeNestedUnion(int nesting)
{
if (++nesting > 1)
return null;
@@ -148,14 +148,14 @@
if (nesting < 2)
{
- instance.Far_list = new List<Distance>() { Distance.foo, Distance.bar, Distance.baz };
- instance.Far_set = new HashSet<Distance>() { Distance.foo, Distance.bar, Distance.baz };
- instance.Far_map = new Dictionary<Distance, Distance>() { [Distance.foo] = Distance.foo, [Distance.bar] = Distance.bar, [Distance.baz] = Distance.baz };
+ instance.Far_list = [Distance.foo, Distance.bar, Distance.baz];
+ instance.Far_set = [Distance.foo, Distance.bar, Distance.baz];
+ instance.Far_map = new() { [Distance.foo] = Distance.foo, [Distance.bar] = Distance.bar, [Distance.baz] = Distance.baz };
- instance.Far_set_list = new HashSet<List<Distance>>() { new List<Distance>() { Distance.foo } };
- instance.Far_list_map_set = new List<Dictionary<sbyte, HashSet<Distance>>>() { new Dictionary<sbyte, HashSet<Distance>>() { [1] = new HashSet<Distance>() { Distance.baz } } };
+ instance.Far_set_list = [[Distance.foo]];
+ instance.Far_list_map_set = [new Dictionary<sbyte, HashSet<Distance>>() { [1] = [Distance.baz] }];
- instance.Far_map_dist_to_rds = new Dictionary<Distance, List<RaceDetails>>() { [Distance.bar] = new List<RaceDetails>() };
+ instance.Far_map_dist_to_rds = new() { [Distance.bar] = [] };
var details = MakeNestedRaceDetails(nesting);
if (details != null)
instance.Far_map_dist_to_rds[Distance.bar].Add(details);
@@ -265,8 +265,7 @@
if (++level > 4)
return value;
- if (value == null)
- value = MakeNestedUnion(0);
+ value ??= MakeNestedUnion(0);
Debug.Assert(value?.As_nested_struct != null);
ModifyInstance(value.As_nested_struct, level);
return value;
@@ -277,23 +276,21 @@
if (++level > 4)
return value;
- if (value == null)
- value = new RaceDetails();
+ value ??= new RaceDetails();
ModifyInstance(value,level);
return value;
}
private Dictionary<Distance, List<RaceDetails>> ModifyValue(Dictionary<Distance, List<RaceDetails>>? value, int level)
{
- if (value == null)
- value = new Dictionary<Distance, List<RaceDetails>>();
+ value ??= [];
if (++level > 4)
return value;
var details = new RaceDetails();
InitializeInstance(details);
- value[Distance.foo] = new List<RaceDetails>() { details };
+ value[Distance.foo] = [details];
if (value.TryGetValue(Distance.bar, out var list) && (list.Count > 0))
{
@@ -309,17 +306,16 @@
private static List<Dictionary<sbyte, HashSet<Distance>>> ModifyValue(List<Dictionary<sbyte, HashSet<Distance>>>? value)
{
- if (value == null)
- value = new List<Dictionary<sbyte, HashSet<Distance>>>();
+ value ??= [];
if (value.Count == 0)
- value.Add(new Dictionary<sbyte, HashSet<Distance>>());
+ value.Add([]);
//else
//value.Add(null); --Thrift does not allow null values in containers
sbyte key = (sbyte)(value[0].Count + 10);
if (value[0].Count == 0)
- value[0].Add(key, new HashSet<Distance>());
+ value[0].Add(key, []);
//else
//value[0].Add(key, null); --Thrift does not allow null values in containers
@@ -331,9 +327,7 @@
{
if (pair.Value != null)
{
- if (pair.Value.Contains(Distance.baz))
- pair.Value.Remove(Distance.baz);
- else
+ if (!pair.Value.Remove(Distance.baz))
pair.Value.Add(Distance.baz);
}
}
@@ -345,25 +339,22 @@
private static HashSet<List<Distance>> ModifyValue(HashSet<List<Distance>>? value)
{
- if (value == null)
- value = new HashSet<List<Distance>>();
+ value ??= [];
if (value.Count == 0)
- value.Add(new List<Distance>());
+ value.Add([]);
//else
//value.Add(null); -- Thrift does not allow null values in containers
foreach (var entry in value)
- if( entry != null)
- entry.Add(Distance.baz);
+ entry?.Add(Distance.baz);
return value;
}
private static Dictionary<Distance, Distance> ModifyValue(Dictionary<Distance, Distance>? value)
{
- if (value == null)
- value = new Dictionary<Distance, Distance>();
+ value ??= [];
value[Distance.foo] = value.ContainsKey(Distance.foo) ? ++value[Distance.foo] : Distance.foo;
value[Distance.bar] = value.ContainsKey(Distance.bar) ? ++value[Distance.bar] : Distance.bar;
value[Distance.baz] = value.ContainsKey(Distance.baz) ? ++value[Distance.baz] : Distance.baz;
@@ -372,22 +363,15 @@
private static HashSet<Distance> ModifyValue(HashSet<Distance>? value)
{
- if (value == null)
- value = new HashSet<Distance>();
+ value ??= [];
- if (value.Contains(Distance.foo))
- value.Remove(Distance.foo);
- else
+ if (!value.Remove(Distance.foo))
value.Add(Distance.foo);
- if (value.Contains(Distance.bar))
- value.Remove(Distance.bar);
- else
+ if (!value.Remove(Distance.bar))
value.Add(Distance.bar);
- if (value.Contains(Distance.baz))
- value.Remove(Distance.baz);
- else
+ if (!value.Remove(Distance.baz))
value.Add(Distance.baz);
return value;
@@ -395,8 +379,7 @@
private static List<Distance> ModifyValue(List<Distance>? value)
{
- if (value == null)
- value = new List<Distance>();
+ value ??= [];
value.Add(Distance.foo);
value.Add(Distance.bar);
value.Add(Distance.baz);
@@ -410,36 +393,32 @@
private static Dictionary<sbyte, short> ModifyValue(Dictionary<sbyte, short>? value)
{
- if (value == null)
- value = new Dictionary<sbyte, short>();
+ value ??= [];
value.Add((sbyte)(value.Count + 10), (short)value.Count);
return value;
}
private static HashSet<long> ModifyValue(HashSet<long>? value)
{
- if (value == null)
- value = new HashSet<long>();
+ value ??= [];
value.Add(value.Count+100);
return value;
}
private static List<int> ModifyValue(List<int>? value)
{
- if (value == null)
- value = new List<int>();
+ value ??= [];
value.Add(value.Count);
return value;
}
private static byte[] ModifyValue(byte[]? value)
{
- if (value == null)
- value = new byte[1] { 0 };
+ value ??= [0];
if (value.Length > 0)
value[0] = (value[0] < 0xFF) ? ++value[0] : (byte)0;
else
- value = new byte[1] { 0 };
+ value = [0];
return value;
}