Skip to content

Commit ab563fd

Browse files
josesimoesjosesimoes
committed
Code style fixes
***NO_CI***
1 parent 95b59ed commit ab563fd

35 files changed

+330
-83
lines changed

‎Shared/MessagePack/ConverterContext.cs

+46-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
using System.Collections;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
24
using System;
3-
using nanoFramework.MessagePack.Converters;
5+
using System.Collections;
6+
using System.Diagnostics;
47
using System.Runtime.CompilerServices;
5-
using nanoFramework.MessagePack.Utility;
8+
using nanoFramework.MessagePack.Converters;
69
using nanoFramework.MessagePack.Dto;
7-
using System.Diagnostics;
8-
using nanoFramework.MessagePack.Stream;
9-
using nanoFramework.MessagePack.Extensions;
1010
using nanoFramework.MessagePack.Exceptions;
11-
using System.Diagnostics.CodeAnalysis;
11+
using nanoFramework.MessagePack.Extensions;
12+
using nanoFramework.MessagePack.Stream;
13+
using nanoFramework.MessagePack.Utility;
1214
#if !NANOFRAMEWORK_1_0
1315
using System.Collections.Concurrent;
1416
#endif
@@ -84,7 +86,10 @@ public static class ConverterContext
8486
public static void Add(Type type, IConverter converter)
8587
{
8688
if (type == typeof(object))
89+
{
8790
throw new NotSupportedException($"Converter by type {type.Name} not support in convertors table.");
91+
}
92+
8893
ConversionTable.Add(type.FullName!, converter);
8994
}
9095

@@ -117,7 +122,9 @@ public static void Replace(Type type, IConverter converter)
117122
public static IConverter GetConverter(Type type)
118123
{
119124
if (type == typeof(object))
125+
{
120126
throw ExceptionUtility.ConverterNotFound(type);
127+
}
121128

122129
if (ConversionTable.Contains(type.FullName!))
123130
{
@@ -133,11 +140,12 @@ internal static Hashtable GetMappingsValues(Type targetType, object value)
133140

134141
Hashtable result = new();
135142

136-
foreach(var memberMapping in memberMappings)
143+
foreach (var memberMapping in memberMappings)
137144
{
138145
if (memberMapping.TryGetValue(value, out var memberValue) && memberValue != null)
146+
{
139147
result.Add(memberMapping.Name!, memberValue);
140-
148+
}
141149
}
142150
return result;
143151
}
@@ -148,19 +156,25 @@ internal static void SetMappingsValues(Type targetType, object targetObject, Has
148156

149157
foreach (var memberMapping in memberMappings)
150158
{
151-
if(objectValuesMap.Contains(memberMapping.Name!))
159+
if (objectValuesMap.Contains(memberMapping.Name!))
152160
{
153161
var memberMpToken = (ArraySegment)objectValuesMap[memberMapping.Name!]!;
154162
var memberValueMapType = memberMapping.GetMemberType();
155163
var converter = GetConverter(memberValueMapType!);
156164
if (converter != null)
165+
{
157166
memberMapping.SetValue(targetObject, converter.Read(new ByteArrayReader((byte[])memberMpToken))!);
167+
}
158168
else
159169
{
160170
if (memberValueMapType!.IsArray)
171+
{
161172
memberMapping.SetValue(targetObject, ArrayConverter.Read(new ByteArrayReader((byte[])memberMpToken), memberValueMapType)!);
173+
}
162174
else
175+
{
163176
memberMapping.SetValue(targetObject, DeserializeObject(memberValueMapType!, new ByteArrayReader((byte[])memberMpToken))!);
177+
}
164178
}
165179
}
166180
}
@@ -228,8 +242,9 @@ internal static void SerializeObject(Type type, object value, IMessagePackWriter
228242
return targetObject;
229243
}
230244
else
245+
{
231246
throw new SerializationException($"Type {type.Name} can not by deserialize.");
232-
247+
}
233248
}
234249

235250
internal static object? GetObjectByDataType(IMessagePackReader reader)
@@ -288,15 +303,29 @@ private static void ThreadSafeAddItemCache(Hashtable hashtable, object key, obje
288303
private static object ReadObject(DataTypes type, IMessagePackReader reader)
289304
{
290305
if (type.GetHighBits(3) == DataTypes.FixStr.GetHighBits(3))
306+
{
291307
return StringConverter.ReadString(reader, type - DataTypes.FixStr);
308+
}
309+
292310
if (NumberConverterHelper.TryGetFixPositiveNumber(type, out var positive))
311+
{
293312
return positive;
313+
}
314+
294315
if (NumberConverterHelper.TryGetNegativeNumber(type, out var negative))
316+
{
295317
return negative;
318+
}
319+
296320
if (type.GetHighBits(4) == DataTypes.FixArray.GetHighBits(4))
321+
{
297322
return ArrayListConverter.ReadArrayList(reader, type - DataTypes.FixArray);
323+
}
324+
298325
if (type.GetHighBits(4) == DataTypes.FixMap.GetHighBits(4))
326+
{
299327
return MapConverter.ReadMap(reader, type - DataTypes.FixMap);
328+
}
300329

301330
throw ExceptionUtility.BadTypeException(type);
302331
}
@@ -309,7 +338,9 @@ private static DateTime ReadDateTimeExt(DataTypes type, IMessagePackReader reade
309338
if (extType == -1)
310339
{
311340
if (type == DataTypes.Timestamp32)
341+
{
312342
seconds = NumberConverterHelper.ReadUInt32(reader);
343+
}
313344
else
314345
{
315346
nanoSeconds = NumberConverterHelper.ReadUInt32(reader);
@@ -325,10 +356,14 @@ private static DateTime ReadDateTimeExt(DataTypes type, IMessagePackReader reade
325356
seconds = NumberConverterHelper.ReadInt64(reader);
326357
}
327358
else
359+
{
328360
throw ExceptionUtility.BadTypeException(type, DataTypes.Timestamp32, DataTypes.Timestamp64, DataTypes.Timestamp96);
361+
}
329362
}
330363
else
364+
{
331365
throw ExceptionUtility.BadTypeException(type, DataTypes.Timestamp32, DataTypes.Timestamp64, DataTypes.Timestamp96);
366+
}
332367

333368
return DateTime.UnixEpoch.AddSeconds(seconds).AddMilliseconds(nanoSeconds / 1000.0);
334369
}

‎Shared/MessagePack/Converters/ArrayConverter.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
using nanoFramework.MessagePack.Stream;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
24
using System;
35
using System.Collections;
46
using System.Diagnostics.CodeAnalysis;
7+
using nanoFramework.MessagePack.Stream;
58

69
namespace nanoFramework.MessagePack.Converters
710
{
@@ -76,7 +79,7 @@ private static Array ReadArray(IMessagePackReader reader, int length, Type array
7679
}
7780
}
7881

79-
return (Array) targetArray;
82+
return (Array)targetArray;
8083
}
8184

8285
public void Write(object? value, [NotNull] IMessagePackWriter writer)

‎Shared/MessagePack/Converters/ArrayListConverter.cs

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
using nanoFramework.MessagePack.Stream;
2-
using System;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
34
using System.Collections;
45
using System.Diagnostics.CodeAnalysis;
6+
using nanoFramework.MessagePack.Stream;
57

68
namespace nanoFramework.MessagePack.Converters
79
{
@@ -23,9 +25,13 @@ private static void Write(ArrayList? value, IMessagePackWriter writer)
2325
var elementType = element.GetType();
2426
var elementConverter = ConverterContext.GetConverter(elementType);
2527
if (elementConverter != null)
28+
{
2629
elementConverter.Write(element, writer);
30+
}
2731
else
32+
{
2833
ConverterContext.SerializeObject(elementType, element, writer);
34+
}
2935
}
3036
}
3137

‎Shared/MessagePack/Converters/BinaryConverter.cs

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
using nanoFramework.MessagePack.Extensions;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Diagnostics.CodeAnalysis;
5+
using nanoFramework.MessagePack.Extensions;
26
using nanoFramework.MessagePack.Stream;
37
using nanoFramework.MessagePack.Utility;
4-
using System.Diagnostics.CodeAnalysis;
58

69
namespace nanoFramework.MessagePack.Converters
710
{
@@ -59,32 +62,51 @@ private byte[] Read(IMessagePackReader reader)
5962

6063
case DataTypes.Str8:
6164
if (_compatibilityMode)
65+
{
6266
length = NumberConverterHelper.ReadUInt8(reader);
67+
}
6368
else
69+
{
6470
throw ExceptionUtility.CantReadStringAsBinary();
71+
}
72+
6573
break;
6674

6775
case DataTypes.Str16:
6876
if (_compatibilityMode)
77+
{
6978
length = NumberConverterHelper.ReadUInt16(reader);
79+
}
7080
else
81+
{
7182
throw ExceptionUtility.CantReadStringAsBinary();
83+
}
84+
7285
break;
7386

7487
case DataTypes.Str32:
7588
if (_compatibilityMode)
89+
{
7690
length = NumberConverterHelper.ReadUInt32(reader);
91+
}
7792
else
93+
{
7894
throw ExceptionUtility.CantReadStringAsBinary();
95+
}
96+
7997
break;
8098

8199
default:
82100
if ((type & DataTypes.FixStr) == DataTypes.FixStr)
83101
{
84102
if (_compatibilityMode)
103+
{
85104
length = (uint)(type & ~DataTypes.FixStr);
105+
}
86106
else
107+
{
87108
throw ExceptionUtility.CantReadStringAsBinary();
109+
}
88110
}
89111
else
90112
{
@@ -94,7 +116,7 @@ private byte[] Read(IMessagePackReader reader)
94116
}
95117

96118
var array = reader.ReadBytes(length);
97-
return (byte[]) array;
119+
return (byte[])array;
98120
}
99121

100122
private static void WriteBinaryHeaderAndLength(uint length, IMessagePackWriter writer)

‎Shared/MessagePack/Converters/BoolConverter.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
using nanoFramework.MessagePack.Stream;
2-
using nanoFramework.MessagePack.Utility;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
34
using System.Diagnostics.CodeAnalysis;
5+
using nanoFramework.MessagePack.Stream;
6+
using nanoFramework.MessagePack.Utility;
47

58
namespace nanoFramework.MessagePack.Converters
69
{

‎Shared/MessagePack/Converters/ByteConverter.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
using nanoFramework.MessagePack.Extensions;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Diagnostics.CodeAnalysis;
5+
using nanoFramework.MessagePack.Extensions;
26
using nanoFramework.MessagePack.Stream;
37
using nanoFramework.MessagePack.Utility;
4-
using System.Diagnostics.CodeAnalysis;
58

69
namespace nanoFramework.MessagePack.Converters
710
{
8-
internal class ByteConverter: IConverter
11+
internal class ByteConverter : IConverter
912
{
1013
private static void Write(byte value, IMessagePackWriter writer)
1114
{

‎Shared/MessagePack/Converters/CharConverter.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
using System;
2-
using nanoFramework.MessagePack.Stream;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
35
using System.Diagnostics.CodeAnalysis;
6+
using nanoFramework.MessagePack.Stream;
47

58
namespace nanoFramework.MessagePack.Converters
69
{

‎Shared/MessagePack/Converters/DoubleConverter.cs

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
using nanoFramework.MessagePack.Extensions;
2-
using nanoFramework.MessagePack.Stream;
3-
using nanoFramework.MessagePack.Utility;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
44
using System;
55
using System.Diagnostics.CodeAnalysis;
6+
using nanoFramework.MessagePack.Extensions;
7+
using nanoFramework.MessagePack.Stream;
8+
using nanoFramework.MessagePack.Utility;
69

710
namespace nanoFramework.MessagePack.Converters
811
{
@@ -55,9 +58,13 @@ private static double Read(IMessagePackReader reader)
5558
//throw ExceptionUtility.BadTypeException(type, DataTypes.Single, DataTypes.Double);
5659

5760
if (NumberConverterHelper.TryGetInt64(type, reader, out var result))
61+
{
5862
return result;
63+
}
5964
else
65+
{
6066
throw ExceptionUtility.BadTypeException(type, DataTypes.Single, DataTypes.Double);
67+
}
6168
}
6269

6370
if (type == DataTypes.Single)

‎Shared/MessagePack/Converters/FloatConverter.cs

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
using nanoFramework.MessagePack.Extensions;
2-
using nanoFramework.MessagePack.Stream;
3-
using nanoFramework.MessagePack.Utility;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
44
using System;
55
using System.Diagnostics.CodeAnalysis;
6+
using nanoFramework.MessagePack.Extensions;
7+
using nanoFramework.MessagePack.Stream;
8+
using nanoFramework.MessagePack.Utility;
69

710
namespace nanoFramework.MessagePack.Converters
811
{
@@ -48,9 +51,13 @@ private static float Read(IMessagePackReader reader)
4851
}
4952

5053
if (NumberConverterHelper.TryGetInt32(type, reader, out var result))
54+
{
5155
return result;
56+
}
5257
else
58+
{
5359
throw ExceptionUtility.BadTypeException(type, DataTypes.Single);
60+
}
5461
}
5562

5663
#nullable enable

‎Shared/MessagePack/Converters/GuidConverter.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
using nanoFramework.MessagePack.Stream;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
24
using System;
35
using System.Diagnostics.CodeAnalysis;
6+
using nanoFramework.MessagePack.Stream;
47

58
namespace nanoFramework.MessagePack.Converters
69
{

‎Shared/MessagePack/Converters/IConverter.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
using nanoFramework.MessagePack.Stream;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
24
using System.Diagnostics.CodeAnalysis;
5+
using nanoFramework.MessagePack.Stream;
36

47
namespace nanoFramework.MessagePack.Converters
58
{

0 commit comments

Comments
 (0)