Code style fixes

josesimoes · josesimoes · commit a045663ae7d2 · 2025-04-23T14:48:50.000+01:00
***NO_CI***
diff --git a/NFUnitTest/Properties/AssemblyInfo.cs b/NFUnitTest/Properties/AssemblyInfo.cs
@@ -1,9 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Reflection;
-using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
diff --git a/Shared/MessagePack/ConverterContext.cs b/Shared/MessagePack/ConverterContext.cs
@@ -145,13 +145,13 @@ internal static Hashtable GetMappingsValues(Type targetType, object value)
             foreach (var memberMapping in memberMappings)
             {
 #if NANOFRAMEWORK_1_0
-                if(!memberMapping.OriginalName!.StartsWith(MemberMapping.SET_))
+                if (!memberMapping.OriginalName!.StartsWith(MemberMapping.SET_))
                 {
 #endif
-                if (memberMapping.TryGetValue(value, out var memberValue) && memberValue != null)
-                {
-                    result.Add(memberMapping.Name!, memberValue);
-                }
+                    if (memberMapping.TryGetValue(value, out var memberValue) && memberValue != null)
+                    {
+                        result.Add(memberMapping.Name!, memberValue);
+                    }
 #if NANOFRAMEWORK_1_0
                 }
 #endif
@@ -166,34 +166,34 @@ internal static void SetMappingsValues(Type targetType, object targetObject, Has
             foreach (var memberMapping in memberMappings)
             {
 #if NANOFRAMEWORK_1_0
-                if(!memberMapping.OriginalName!.StartsWith(MemberMapping.GET_))
+                if (!memberMapping.OriginalName!.StartsWith(MemberMapping.GET_))
                 {
 #endif
-                if (objectValuesMap.Contains(memberMapping.Name!))
-                {
-                    var memberMpToken = (ArraySegment)objectValuesMap[memberMapping.Name!]!;
-                    if (memberMpToken != null)
+                    if (objectValuesMap.Contains(memberMapping.Name!))
                     {
-                        var memberValueMapType = memberMapping.GetMemberType();
-                        var converter = GetConverter(memberValueMapType!);
-                        if (converter != null)
+                        var memberMpToken = (ArraySegment)objectValuesMap[memberMapping.Name!]!;
+                        if (memberMpToken != null)
                         {
-                            memberMapping.SetValue(targetObject, converter.Read(memberMpToken)!);
-                        }
-                        else
-                        {
-                            if (memberValueMapType!.IsArray)
+                            var memberValueMapType = memberMapping.GetMemberType();
+                            var converter = GetConverter(memberValueMapType!);
+                            if (converter != null)
                             {
-                                memberMapping.SetValue(targetObject, ArrayConverter.Read(memberMpToken, memberValueMapType)!);
+                                memberMapping.SetValue(targetObject, converter.Read(memberMpToken)!);
                             }
                             else
                             {
-
-                                memberMapping.SetValue(targetObject, DeserializeObject(memberValueMapType!, memberMpToken)!);
+                                if (memberValueMapType!.IsArray)
+                                {
+                                    memberMapping.SetValue(targetObject, ArrayConverter.Read(memberMpToken, memberValueMapType)!);
+                                }
+                                else
+                                {
+
+                                    memberMapping.SetValue(targetObject, DeserializeObject(memberValueMapType!, memberMpToken)!);
+                                }
                             }
                         }
                     }
-                }
 #if NANOFRAMEWORK_1_0
                 }
 #endif
@@ -318,14 +318,14 @@ private static void ThreadSafeAddItemCache(Hashtable hashtable, object key, obje
         {
             if (!hashtable.Contains(key))
             {
-                lock(s_mappingDictionary)
+                lock (s_mappingDictionary)
                 {
                     try
                     {
-                         if (!hashtable.Contains(key))
-                         {
+                        if (!hashtable.Contains(key))
+                        {
                             hashtable.Add(key, value);
-                         }
+                        }
                     }
                     catch (Exception ex)
                     {
diff --git a/Shared/MessagePack/Dto/ArraySegment.cs b/Shared/MessagePack/Dto/ArraySegment.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.Collections;
-using System.Diagnostics;
-using System.IO;
 using nanoFramework.MessagePack.Stream;
 using nanoFramework.MessagePack.Utility;
 
diff --git a/Shared/MessagePack/Extensions/DataTypesExtension.cs b/Shared/MessagePack/Extensions/DataTypesExtension.cs
@@ -14,7 +14,7 @@ internal static byte GetHighBits(this DataTypes type, byte bitsCount)
 
         internal static string JoinToString(this DataTypes[] types, string separator)
         {
-            StringBuilder sb = new ();
+            StringBuilder sb = new();
 
             foreach (var item in types)
             {
diff --git a/Shared/MessagePack/MessagePackSerializer.cs b/Shared/MessagePack/MessagePackSerializer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.IO;
 using nanoFramework.MessagePack.Stream;
 
 namespace nanoFramework.MessagePack
diff --git a/Shared/MessagePack/Stream/BaseReader.cs b/Shared/MessagePack/Stream/BaseReader.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.IO;
 using nanoFramework.MessagePack.Dto;
 using nanoFramework.MessagePack.Extensions;
 using nanoFramework.MessagePack.Utility;
diff --git a/Shared/MessagePack/Stream/ByteArrayReader.cs b/Shared/MessagePack/Stream/ByteArrayReader.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.IO;
 using nanoFramework.MessagePack.Dto;
 
 namespace nanoFramework.MessagePack.Stream
diff --git a/Shared/MessagePack/Stream/IMessagePackReader.cs b/Shared/MessagePack/Stream/IMessagePackReader.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.IO;
 using nanoFramework.MessagePack.Dto;
 
 namespace nanoFramework.MessagePack.Stream
diff --git a/Shared/MessagePack/Stream/MemoryStreamReader.cs b/Shared/MessagePack/Stream/MemoryStreamReader.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections;
-using System.IO;
 using nanoFramework.MessagePack.Dto;
 using nanoFramework.MessagePack.Utility;
 
diff --git a/Shared/MessagePack/Stream/MemoryStreamWriter.cs b/Shared/MessagePack/Stream/MemoryStreamWriter.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.IO;
 using nanoFramework.MessagePack.Extensions;
 
 namespace nanoFramework.MessagePack.Stream
diff --git a/UnitTestShared/Helpers/TestsHelper.cs b/UnitTestShared/Helpers/TestsHelper.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections;
 using System.Text;
 using UnitTestShared.TestData;
@@ -170,7 +169,7 @@ internal static bool CheckTwoDimensionalLongArray(this long[][] source, long[][]
                 errorMessage = $"Source array length {source.Length} not equal destination array length {destination.Length}";
                 return false;
             }
-            for(int y = 0; y < source.Length; y++)
+            for (int y = 0; y < source.Length; y++)
             {
                 if (source[y].Length != destination[y].Length)
                 {
@@ -179,7 +178,7 @@ internal static bool CheckTwoDimensionalLongArray(this long[][] source, long[][]
                 }
                 else
                 {
-                    if(!source[y].ArrayEqual(destination[y]))
+                    if (!source[y].ArrayEqual(destination[y]))
                     {
                         errorMessage = $"Source array item index {y} not equal destination array item index {y}\nSource array items:\n{source[y].JoinToString(", ")}\nDestination array items:\n{destination[y].JoinToString(", ")}";
                         return false;
diff --git a/UnitTestShared/TestData/SecureMessageConverter.cs b/UnitTestShared/TestData/SecureMessageConverter.cs
@@ -6,7 +6,6 @@
 using nanoFramework.MessagePack;
 using nanoFramework.MessagePack.Converters;
 using nanoFramework.MessagePack.Stream;
-using System;
 
 namespace UnitTestShared.TestData
 {
diff --git a/UnitTestShared/TestData/TestClass.cs b/UnitTestShared/TestData/TestClass.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections;
 using UnitTestShared.Helpers;
 
diff --git a/UnitTestShared/TestData/TestSubClass.cs b/UnitTestShared/TestData/TestSubClass.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections;
 using UnitTestShared.Helpers;
 
diff --git a/UnitTestShared/UnitTests.cs b/UnitTestShared/UnitTests.cs
@@ -2,13 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-using System;
 using System.Collections;
 using System.Diagnostics;
 using nanoFramework.MessagePack;
 using UnitTestShared.Helpers;
 using UnitTestShared.TestData;
-using System.IO;
 #if NANOFRAMEWORK_1_0
 using nanoFramework.TestFramework;
 #endif
@@ -296,7 +294,7 @@ public void ArrayAndHashtableTest()
             arrayBytes = MessagePackSerializer.Serialize(testHashtable);
             var hashtableValue = (Hashtable)MessagePackSerializer.Deserialize(typeof(Hashtable), arrayBytes)!;
             Assert.AreEqual(testHashtable.Count, hashtableValue.Count);
-            foreach(DictionaryEntry entry in testHashtable)
+            foreach (DictionaryEntry entry in testHashtable)
             {
                 Assert.AreEqual(entry.Value, hashtableValue[entry.Key]);
             }

Original file line number	Diff line number	Diff line change
`@@ -145,13 +145,13 @@ internal static Hashtable GetMappingsValues(Type targetType, object value)`
`145`	`145`	`foreach (var memberMapping in memberMappings)`
`146`	`146`	`{`
`147`	`147`	`#if NANOFRAMEWORK_1_0`
`148`		`- if(!memberMapping.OriginalName!.StartsWith(MemberMapping.SET_))`
	`148`	`+ if (!memberMapping.OriginalName!.StartsWith(MemberMapping.SET_))`
`149`	`149`	`{`
`150`	`150`	`#endif`
`151`		`- if (memberMapping.TryGetValue(value, out var memberValue) && memberValue != null)`
`152`		`- {`
`153`		`- result.Add(memberMapping.Name!, memberValue);`
`154`		`- }`
	`151`	`+ if (memberMapping.TryGetValue(value, out var memberValue) && memberValue != null)`
	`152`	`+ {`
	`153`	`+ result.Add(memberMapping.Name!, memberValue);`
	`154`	`+ }`
`155`	`155`	`#if NANOFRAMEWORK_1_0`
`156`	`156`	`}`
`157`	`157`	`#endif`
`@@ -166,34 +166,34 @@ internal static void SetMappingsValues(Type targetType, object targetObject, Has`
`166`	`166`	`foreach (var memberMapping in memberMappings)`
`167`	`167`	`{`
`168`	`168`	`#if NANOFRAMEWORK_1_0`
`169`		`- if(!memberMapping.OriginalName!.StartsWith(MemberMapping.GET_))`
	`169`	`+ if (!memberMapping.OriginalName!.StartsWith(MemberMapping.GET_))`
`170`	`170`	`{`
`171`	`171`	`#endif`
`172`		`- if (objectValuesMap.Contains(memberMapping.Name!))`
`173`		`- {`
`174`		`- var memberMpToken = (ArraySegment)objectValuesMap[memberMapping.Name!]!;`
`175`		`- if (memberMpToken != null)`
	`172`	`+ if (objectValuesMap.Contains(memberMapping.Name!))`
`176`	`173`	`{`
`177`		`- var memberValueMapType = memberMapping.GetMemberType();`
`178`		`- var converter = GetConverter(memberValueMapType!);`
`179`		`- if (converter != null)`
	`174`	`+ var memberMpToken = (ArraySegment)objectValuesMap[memberMapping.Name!]!;`
	`175`	`+ if (memberMpToken != null)`
`180`	`176`	`{`
`181`		`- memberMapping.SetValue(targetObject, converter.Read(memberMpToken)!);`
`182`		`- }`
`183`		`- else`
`184`		`- {`
`185`		`- if (memberValueMapType!.IsArray)`
	`177`	`+ var memberValueMapType = memberMapping.GetMemberType();`
	`178`	`+ var converter = GetConverter(memberValueMapType!);`
	`179`	`+ if (converter != null)`
`186`	`180`	`{`
`187`		`- memberMapping.SetValue(targetObject, ArrayConverter.Read(memberMpToken, memberValueMapType)!);`
	`181`	`+ memberMapping.SetValue(targetObject, converter.Read(memberMpToken)!);`
`188`	`182`	`}`
`189`	`183`	`else`
`190`	`184`	`{`
`191`		`-`
`192`		`- memberMapping.SetValue(targetObject, DeserializeObject(memberValueMapType!, memberMpToken)!);`
	`185`	`+ if (memberValueMapType!.IsArray)`
	`186`	`+ {`
	`187`	`+ memberMapping.SetValue(targetObject, ArrayConverter.Read(memberMpToken, memberValueMapType)!);`
	`188`	`+ }`
	`189`	`+ else`
	`190`	`+ {`
	`191`	`+`
	`192`	`+ memberMapping.SetValue(targetObject, DeserializeObject(memberValueMapType!, memberMpToken)!);`
	`193`	`+ }`
`193`	`194`	`}`
`194`	`195`	`}`
`195`	`196`	`}`
`196`		`- }`
`197`	`197`	`#if NANOFRAMEWORK_1_0`
`198`	`198`	`}`
`199`	`199`	`#endif`
`@@ -318,14 +318,14 @@ private static void ThreadSafeAddItemCache(Hashtable hashtable, object key, obje`
`318`	`318`	`{`
`319`	`319`	`if (!hashtable.Contains(key))`
`320`	`320`	`{`
`321`		`- lock(s_mappingDictionary)`
	`321`	`+ lock (s_mappingDictionary)`
`322`	`322`	`{`
`323`	`323`	`try`
`324`	`324`	`{`
`325`		`- if (!hashtable.Contains(key))`
`326`		`- {`
	`325`	`+ if (!hashtable.Contains(key))`
	`326`	`+ {`
`327`	`327`	`hashtable.Add(key, value);`
`328`		`- }`
	`328`	`+ }`
`329`	`329`	`}`
`330`	`330`	`catch (Exception ex)`
`331`	`331`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal static byte GetHighBits(this DataTypes type, byte bitsCount)`
`14`	`14`
`15`	`15`	`internal static string JoinToString(this DataTypes[] types, string separator)`
`16`	`16`	`{`
`17`		`- StringBuilder sb = new ();`
	`17`	`+ StringBuilder sb = new();`
`18`	`18`
`19`	`19`	`foreach (var item in types)`
`20`	`20`	`{`