Skip to content

Commit 93e3ff7

Browse files
RelaxSpiritRelaxSpirit
committed
Refactoring
1 parent 734e60f commit 93e3ff7

23 files changed

+138
-132
lines changed

‎Shared/MessagePack/Converters/ArrayConverter.cs‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ namespace nanoFramework.MessagePack.Converters
88
/// <summary>
99
/// Composite array converter
1010
/// </summary>
11-
public class ArrayConverter : IConverter
11+
internal class ArrayConverter : IConverter
1212
{
13-
/// <summary>
14-
/// Write array in to MessagePack stream
15-
/// </summary>
16-
/// <param name="value">Array to by write</param>
17-
/// <param name="writer">MessagePack target stream</param>
18-
public void Write(IList value, IMessagePackWriter writer)
13+
private static void Write(IList value, IMessagePackWriter writer)
1914
{
2015
if (value == null || value.Count < 1)
2116
{
@@ -44,14 +39,8 @@ public void Write(IList value, IMessagePackWriter writer)
4439

4540
}
4641

47-
/// <summary>
48-
/// Read array from MessagePack stream
49-
/// </summary>
50-
/// <param name="reader">MessagePack stream for reading</param>
51-
/// <param name="arrayType">Target array type</param>
52-
/// <returns>Readied array</returns>
5342
#nullable enable
54-
public static IList? Read(IMessagePackReader reader, Type arrayType)
43+
internal static IList? Read(IMessagePackReader reader, Type arrayType)
5544
{
5645
var length = (int)reader.ReadArrayLength();
5746
return length > 0 ? ReadArray(reader, length, arrayType) : null;
@@ -90,17 +79,12 @@ private static Array ReadArray(IMessagePackReader reader, int length, Type array
9079
return (Array) targetArray;
9180
}
9281

93-
/// <summary>
94-
/// Write array in to MessagePack stream
95-
/// </summary>
96-
/// <param name="value">Array object to by write</param>
97-
/// <param name="writer">MessagePack target stream</param>
98-
public void Write(object value, [NotNull] IMessagePackWriter writer)
82+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
9983
{
100-
Write((IList)value, writer);
84+
Write((IList)value!, writer);
10185
}
10286

103-
object IConverter.Read(IMessagePackReader reader)
87+
object? IConverter.Read([NotNull] IMessagePackReader reader)
10488
{
10589
throw new NotImplementedException();
10690
}

‎Shared/MessagePack/Converters/ArrayListConverter.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace nanoFramework.MessagePack.Converters
88
internal class ArrayListConverter : IConverter
99
{
1010
#nullable enable
11-
public void Write(ArrayList? value, IMessagePackWriter writer)
11+
private static void Write(ArrayList? value, IMessagePackWriter writer)
1212
{
1313
if (value == null)
1414
{
@@ -29,7 +29,7 @@ public void Write(ArrayList? value, IMessagePackWriter writer)
2929
}
3030
}
3131

32-
public ArrayList? Read(IMessagePackReader reader)
32+
private static ArrayList? Read(IMessagePackReader reader)
3333
{
3434
var length = reader.ReadArrayLength();
3535
return ((long)length) > -1 ? ReadArrayList(reader, length) : null;
@@ -47,12 +47,12 @@ internal static ArrayList ReadArrayList(IMessagePackReader reader, uint length)
4747
return array;
4848
}
4949

50-
public void Write(object value, [NotNull] IMessagePackWriter writer)
50+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
5151
{
52-
Write((ArrayList)value, writer);
52+
Write((ArrayList)value!, writer);
5353
}
5454

55-
object IConverter.Read(IMessagePackReader reader)
55+
object? IConverter.Read([NotNull] IMessagePackReader reader)
5656
{
5757
return Read(reader);
5858
}

‎Shared/MessagePack/Converters/BinaryConverter.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public BinaryConverter(bool compatibilityMode = false)
1414
_compatibilityMode = compatibilityMode;
1515
}
1616

17-
public void Write(byte[] value, IMessagePackWriter writer)
17+
private void Write(byte[] value, IMessagePackWriter writer)
1818
{
1919
if (value == null)
2020
{
@@ -35,7 +35,7 @@ public void Write(byte[] value, IMessagePackWriter writer)
3535
writer.Write(value);
3636
}
3737

38-
public byte[] Read(IMessagePackReader reader)
38+
private byte[] Read(IMessagePackReader reader)
3939
{
4040
var type = reader.ReadDataType();
4141

@@ -97,7 +97,7 @@ public byte[] Read(IMessagePackReader reader)
9797
return (byte[]) array;
9898
}
9999

100-
private void WriteBinaryHeaderAndLength(uint length, IMessagePackWriter writer)
100+
private static void WriteBinaryHeaderAndLength(uint length, IMessagePackWriter writer)
101101
{
102102
if (length <= byte.MaxValue)
103103
{
@@ -116,7 +116,7 @@ private void WriteBinaryHeaderAndLength(uint length, IMessagePackWriter writer)
116116
}
117117
}
118118

119-
private void WriteStringHeaderAndLength(uint length, IMessagePackWriter writer)
119+
private static void WriteStringHeaderAndLength(uint length, IMessagePackWriter writer)
120120
{
121121
if (length <= 31)
122122
{
@@ -136,12 +136,13 @@ private void WriteStringHeaderAndLength(uint length, IMessagePackWriter writer)
136136
}
137137
}
138138

139-
public void Write(object value, [NotNull] IMessagePackWriter writer)
139+
#nullable enable
140+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
140141
{
141-
Write((byte[])value, writer);
142+
Write((byte[])value!, writer);
142143
}
143144

144-
object IConverter.Read(IMessagePackReader reader)
145+
object? IConverter.Read([NotNull] IMessagePackReader reader)
145146
{
146147
return Read(reader);
147148
}

‎Shared/MessagePack/Converters/BoolConverter.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ namespace nanoFramework.MessagePack.Converters
66
{
77
internal class BoolConverter : IConverter
88
{
9-
public void Write(bool value, IMessagePackWriter writer)
9+
private static void Write(bool value, IMessagePackWriter writer)
1010
{
1111
writer.Write(value ? DataTypes.True : DataTypes.False);
1212
}
1313

14-
public bool Read(IMessagePackReader reader)
14+
private static bool Read(IMessagePackReader reader)
1515
{
1616
var type = reader.ReadDataType();
1717

@@ -23,12 +23,13 @@ public bool Read(IMessagePackReader reader)
2323
};
2424
}
2525

26-
public void Write(object value, [NotNull] IMessagePackWriter writer)
26+
#nullable enable
27+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
2728
{
28-
Write((bool)value, writer);
29+
Write((bool)value!, writer);
2930
}
3031

31-
object IConverter.Read(IMessagePackReader reader)
32+
object? IConverter.Read([NotNull] IMessagePackReader reader)
3233
{
3334
return Read(reader);
3435
}

‎Shared/MessagePack/Converters/ByteConverter.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace nanoFramework.MessagePack.Converters
77
{
88
internal class ByteConverter: IConverter
99
{
10-
public void Write(byte value, IMessagePackWriter writer)
10+
private static void Write(byte value, IMessagePackWriter writer)
1111
{
1212
// positive fixnum
1313
if (value < 128L)
@@ -21,7 +21,7 @@ public void Write(byte value, IMessagePackWriter writer)
2121
}
2222
}
2323

24-
public byte Read(IMessagePackReader reader)
24+
private static byte Read(IMessagePackReader reader)
2525
{
2626
var type = reader.ReadDataType();
2727

@@ -43,12 +43,13 @@ public byte Read(IMessagePackReader reader)
4343
};
4444
}
4545

46-
public void Write(object value, [NotNull] IMessagePackWriter writer)
46+
#nullable enable
47+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
4748
{
48-
Write((byte)value, writer);
49+
Write((byte)value!, writer);
4950
}
5051

51-
object IConverter.Read(IMessagePackReader reader)
52+
object? IConverter.Read([NotNull] IMessagePackReader reader)
5253
{
5354
return Read(reader);
5455
}

‎Shared/MessagePack/Converters/CharConverter.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@ namespace nanoFramework.MessagePack.Converters
66
{
77
internal class CharConverter : IConverter
88
{
9-
public void Write(char value, IMessagePackWriter writer)
9+
private static void Write(char value, IMessagePackWriter writer)
1010
{
1111
ConverterContext.GetConverter(typeof(ushort)).Write(BitConverter.ToUInt16(BitConverter.GetBytes(value), 0), writer);
1212
}
1313

14-
public char Read(IMessagePackReader reader)
14+
private static char Read(IMessagePackReader reader)
1515
{
1616
return BitConverter.ToChar(BitConverter.GetBytes((ushort)ConverterContext.GetConverter(typeof(ushort)).Read(reader)!), 0);
1717
}
1818

19-
public void Write(object value, [NotNull] IMessagePackWriter writer)
19+
#nullable enable
20+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
2021
{
21-
Write((char)value, writer);
22+
Write((char)value!, writer);
2223
}
2324

24-
object IConverter.Read(IMessagePackReader reader)
25+
object? IConverter.Read([NotNull] IMessagePackReader reader)
2526
{
2627
return Read(reader);
2728
}

‎Shared/MessagePack/Converters/DateTimeConverter.cs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,29 @@ namespace nanoFramework.MessagePack.Converters
66
{
77
internal class DateTimeConverter : IConverter
88
{
9-
object IConverter.Read([NotNull] IMessagePackReader reader)
9+
private static DateTime Read(IMessagePackReader reader)
1010
{
11-
return Read(reader);
11+
var longValue = (long)ConverterContext.GetConverter(typeof(long)).Read(reader)!;
12+
return DateTime.UnixEpoch.AddTicks(longValue);
1213
}
14+
1315

14-
public void Write(DateTime value, IMessagePackWriter writer)
16+
private static void Write(DateTime value, IMessagePackWriter writer)
1517
{
1618
var longValue = value.Subtract(DateTime.UnixEpoch).Ticks;
1719

1820
ConverterContext.GetConverter(typeof(long)).Write(longValue, writer);
1921
}
2022

21-
public void Write(object value, [NotNull] IMessagePackWriter writer)
23+
#nullable enable
24+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
2225
{
23-
Write((DateTime)value, writer);
26+
Write((DateTime)value!, writer);
2427
}
2528

26-
public DateTime Read(IMessagePackReader reader)
29+
object? IConverter.Read([NotNull] IMessagePackReader reader)
2730
{
28-
var longValue = (long)ConverterContext.GetConverter(typeof(long)).Read(reader)!;
29-
return DateTime.UnixEpoch.AddTicks(longValue);
31+
return Read(reader);
3032
}
3133
}
3234
}

‎Shared/MessagePack/Converters/DoubleConverter.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace nanoFramework.MessagePack.Converters
88
{
99
internal class DoubleConverter : IConverter
1010
{
11-
public void Write(double value, IMessagePackWriter writer)
11+
private static void Write(double value, IMessagePackWriter writer)
1212
{
1313
var binary = BitConverter.GetBytes(value);
1414
byte[] bytes;
@@ -46,7 +46,7 @@ public void Write(double value, IMessagePackWriter writer)
4646
writer.Write(bytes);
4747
}
4848

49-
public double Read(IMessagePackReader reader)
49+
private static double Read(IMessagePackReader reader)
5050
{
5151
var type = reader.ReadDataType();
5252

@@ -68,12 +68,13 @@ public double Read(IMessagePackReader reader)
6868
return NumberConverterHelper.ReadDouble(reader);
6969
}
7070

71-
public void Write(object value, [NotNull] IMessagePackWriter writer)
71+
#nullable enable
72+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
7273
{
73-
Write((double)value, writer);
74+
Write((double)value!, writer);
7475
}
7576

76-
object IConverter.Read(IMessagePackReader reader)
77+
object? IConverter.Read([NotNull] IMessagePackReader reader)
7778
{
7879
return Read(reader);
7980
}

‎Shared/MessagePack/Converters/FloatConverter.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace nanoFramework.MessagePack.Converters
88
{
99
internal class FloatConverter : IConverter
1010
{
11-
public void Write(float value, IMessagePackWriter writer)
11+
private static void Write(float value, IMessagePackWriter writer)
1212
{
1313
var binary = BitConverter.GetBytes(value);
1414
byte[] bytes;
@@ -38,7 +38,7 @@ public void Write(float value, IMessagePackWriter writer)
3838
writer.Write(bytes);
3939
}
4040

41-
public float Read(IMessagePackReader reader)
41+
private static float Read(IMessagePackReader reader)
4242
{
4343
var type = reader.ReadDataType();
4444

@@ -53,12 +53,13 @@ public float Read(IMessagePackReader reader)
5353
throw ExceptionUtility.BadTypeException(type, DataTypes.Single);
5454
}
5555

56-
public void Write(object value, [NotNull] IMessagePackWriter writer)
56+
#nullable enable
57+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
5758
{
58-
Write((float)value, writer);
59+
Write((float)value!, writer);
5960
}
6061

61-
object IConverter.Read(IMessagePackReader reader)
62+
object? IConverter.Read([NotNull] IMessagePackReader reader)
6263
{
6364
return Read(reader);
6465
}

‎Shared/MessagePack/Converters/GuidConverter.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@ namespace nanoFramework.MessagePack.Converters
66
{
77
internal class GuidConverter : IConverter
88
{
9-
public Guid Read([NotNull] IMessagePackReader reader)
9+
private static Guid Read([NotNull] IMessagePackReader reader)
1010
{
1111
return new Guid((byte[])ConverterContext.GetConverter(typeof(byte[])).Read(reader)!);
1212
}
1313

14-
public void Write(Guid value, [NotNull] IMessagePackWriter writer)
14+
private static void Write(Guid value, [NotNull] IMessagePackWriter writer)
1515
{
1616
ConverterContext.GetConverter(typeof(byte[])).Write(value.ToByteArray(), writer);
1717
}
1818

19-
public void Write(object value, [NotNull] IMessagePackWriter writer)
19+
#nullable enable
20+
public void Write(object? value, [NotNull] IMessagePackWriter writer)
2021
{
21-
Write((Guid)value, writer);
22+
Write((Guid)value!, writer);
2223
}
2324

24-
object IConverter.Read(IMessagePackReader reader)
25+
object? IConverter.Read([NotNull] IMessagePackReader reader)
2526
{
2627
return Read(reader);
2728
}

0 commit comments

Comments
 (0)