Skip to content

Commit aff1b5d

Browse files
yfakariyayfakariya
committed
Code cleanup and refactor to simplification.
1 parent d91ac4c commit aff1b5d

50 files changed

Lines changed: 549 additions & 998 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/MsgPack.Net35/MsgPack.Net35.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@
212212
<Compile Include="..\MsgPack\Serialization\AbstractSerializers\SerializerMethod.cs">
213213
<Link>Serialization\AbstractSerializers\SerializerMethod.cs</Link>
214214
</Compile>
215-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
216-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
217-
</Compile>
218215
<Compile Include="..\MsgPack\Serialization\CodeDomSerializers\CodeDomConstruct.cs">
219216
<Link>Serialization\CodeDomSerializers\CodeDomConstruct.cs</Link>
220217
</Compile>
@@ -602,9 +599,6 @@
602599
<Compile Include="..\MsgPack\Serialization\Metadata\_DictionaryEntry.cs">
603600
<Link>Serialization\Metadata\_DictionaryEntry.cs</Link>
604601
</Compile>
605-
<Compile Include="..\MsgPack\Serialization\Metadata\_Enumerable.cs">
606-
<Link>Serialization\Metadata\_Enumerable.cs</Link>
607-
</Compile>
608602
<Compile Include="..\MsgPack\Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs">
609603
<Link>Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs</Link>
610604
</Compile>

‎src/MsgPack.Net40/MsgPack.Net40.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,6 @@
202202
<Compile Include="..\MsgPack\Serialization\AbstractSerializers\SerializerMethod.cs">
203203
<Link>Serialization\AbstractSerializers\SerializerMethod.cs</Link>
204204
</Compile>
205-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
206-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
207-
</Compile>
208205
<Compile Include="..\MsgPack\Serialization\CodeDomSerializers\CodeDomConstruct.cs">
209206
<Link>Serialization\CodeDomSerializers\CodeDomConstruct.cs</Link>
210207
</Compile>
@@ -559,6 +556,9 @@
559556
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeContext.cs">
560557
<Link>Serialization\ExpressionSerializers\ExpressionTreeContext.cs</Link>
561558
</Compile>
559+
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs">
560+
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs</Link>
561+
</Compile>
562562
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs">
563563
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs</Link>
564564
</Compile>
@@ -634,9 +634,6 @@
634634
<Compile Include="..\MsgPack\Serialization\Metadata\_DictionaryEntry.cs">
635635
<Link>Serialization\Metadata\_DictionaryEntry.cs</Link>
636636
</Compile>
637-
<Compile Include="..\MsgPack\Serialization\Metadata\_Enumerable.cs">
638-
<Link>Serialization\Metadata\_Enumerable.cs</Link>
639-
</Compile>
640637
<Compile Include="..\MsgPack\Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs">
641638
<Link>Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs</Link>
642639
</Compile>

‎src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,6 @@
226226
<Compile Include="..\MsgPack\Serialization\AbstractSerializers\SerializerMethod.cs">
227227
<Link>Serialization\AbstractSerializers\SerializerMethod.cs</Link>
228228
</Compile>
229-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
230-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
231-
</Compile>
232229
<Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
233230
<Link>Serialization\CollectionDetailedKind.cs</Link>
234231
</Compile>
@@ -553,6 +550,9 @@
553550
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeContext.cs">
554551
<Link>Serialization\ExpressionSerializers\ExpressionTreeContext.cs</Link>
555552
</Compile>
553+
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs">
554+
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs</Link>
555+
</Compile>
556556
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs">
557557
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs</Link>
558558
</Compile>
@@ -625,9 +625,6 @@
625625
<Compile Include="..\MsgPack\Serialization\Metadata\_DictionaryEntry.cs">
626626
<Link>Serialization\Metadata\_DictionaryEntry.cs</Link>
627627
</Compile>
628-
<Compile Include="..\MsgPack\Serialization\Metadata\_Enumerable.cs">
629-
<Link>Serialization\Metadata\_Enumerable.cs</Link>
630-
</Compile>
631628
<Compile Include="..\MsgPack\Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs">
632629
<Link>Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs</Link>
633630
</Compile>

‎src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,6 @@
265265
<Compile Include="..\MsgPack\Serialization\AbstractSerializers\SerializerMethod.cs">
266266
<Link>Serialization\AbstractSerializers\SerializerMethod.cs</Link>
267267
</Compile>
268-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
269-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
270-
</Compile>
271268
<Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
272269
<Link>Serialization\CollectionDetailedKind.cs</Link>
273270
</Compile>
@@ -487,6 +484,9 @@
487484
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeContext.cs">
488485
<Link>Serialization\ExpressionSerializers\ExpressionTreeContext.cs</Link>
489486
</Compile>
487+
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs">
488+
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs</Link>
489+
</Compile>
490490
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs">
491491
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs</Link>
492492
</Compile>
@@ -556,9 +556,6 @@
556556
<Compile Include="..\MsgPack\Serialization\Metadata\_DictionaryEntry.cs">
557557
<Link>Serialization\Metadata\_DictionaryEntry.cs</Link>
558558
</Compile>
559-
<Compile Include="..\MsgPack\Serialization\Metadata\_Enumerable.cs">
560-
<Link>Serialization\Metadata\_Enumerable.cs</Link>
561-
</Compile>
562559
<Compile Include="..\MsgPack\Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs">
563560
<Link>Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs</Link>
564561
</Compile>

‎src/MsgPack.Unity3D/MsgPack.Unity3D.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@
168168
<Compile Include="..\MsgPack\ReflectionAbstractions.cs">
169169
<Link>ReflectionAbstractions.cs</Link>
170170
</Compile>
171-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
172-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
173-
</Compile>
174171
<Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
175172
<Link>Serialization\CollectionDetailedKind.cs</Link>
176173
</Compile>

‎src/MsgPack.WinRT.Portable/MsgPack.WinRT.Portable.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,6 @@
208208
<Compile Include="..\MsgPack\Serialization\AbstractSerializers\SerializerMethod.cs">
209209
<Link>Serialization\AbstractSerializers\SerializerMethod.cs</Link>
210210
</Compile>
211-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
212-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
213-
</Compile>
214211
<Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
215212
<Link>Serialization\CollectionDetailedKind.cs</Link>
216213
</Compile>
@@ -430,6 +427,9 @@
430427
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeContext.cs">
431428
<Link>Serialization\ExpressionSerializers\ExpressionTreeContext.cs</Link>
432429
</Compile>
430+
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs">
431+
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs</Link>
432+
</Compile>
433433
<Compile Include="..\MsgPack\Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs">
434434
<Link>Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilder`1.cs</Link>
435435
</Compile>
@@ -499,9 +499,6 @@
499499
<Compile Include="..\MsgPack\Serialization\Metadata\_DictionaryEntry.cs">
500500
<Link>Serialization\Metadata\_DictionaryEntry.cs</Link>
501501
</Compile>
502-
<Compile Include="..\MsgPack\Serialization\Metadata\_Enumerable.cs">
503-
<Link>Serialization\Metadata\_Enumerable.cs</Link>
504-
</Compile>
505502
<Compile Include="..\MsgPack\Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs">
506503
<Link>Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs</Link>
507504
</Compile>

‎src/MsgPack.Xamarin.Android/MsgPack.Xamarin.Android.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@
160160
<Compile Include="..\MsgPack\ReflectionAbstractions.cs">
161161
<Link>ReflectionAbstractions.cs</Link>
162162
</Compile>
163-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
164-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
165-
</Compile>
166163
<Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
167164
<Link>Serialization\CollectionDetailedKind.cs</Link>
168165
</Compile>

‎src/MsgPack.Xamarin.iOS/MsgPack.Xamarin.iOS.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164
<Compile Include="..\MsgPack\ReflectionAbstractions.cs">
165165
<Link>ReflectionAbstractions.cs</Link>
166166
</Compile>
167-
<Compile Include="..\MsgPack\Serialization\BoxedEnumMemberSerializationMethod.cs">
168-
<Link>Serialization\BoxedEnumMemberSerializationMethod.cs</Link>
169-
</Compile>
170167
<Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
171168
<Link>Serialization\CollectionDetailedKind.cs</Link>
172169
</Compile>

‎src/MsgPack/MessagePackString.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
using System.Text;
3434
using System.Threading;
3535

36+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1065:DoNotRaiseExceptionsInUnexpectedLocations", Scope = "member", Target = "MsgPack.MessagePackString.#.cctor()", Justification = "Just create as marker" )]
37+
3638
namespace MsgPack
3739
{
3840
// Dictionary based approach is better from memory usage and stability.
@@ -50,7 +52,8 @@ namespace MsgPack
5052
internal sealed class MessagePackString
5153
{
5254
// TODO: CLOB support?
53-
private static readonly DecoderFallbackException IsBinary = new DecoderFallbackException();
55+
// marker to indicate this is definitively binary.
56+
private static readonly DecoderFallbackException IsBinary = new DecoderFallbackException( "This value is not string." );
5457
private byte[] _encoded;
5558
private string _decoded;
5659
private DecoderFallbackException _decodingError;

‎src/MsgPack/MsgPack.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
<Compile Include="Serialization\AbstractSerializers\ISerializerCodeGenerationContext.cs" />
167167
<Compile Include="Serialization\AbstractSerializers\ISerializerCodeGenerator.cs" />
168168
<Compile Include="Serialization\AbstractSerializers\SerializerBuilder`3.Collection.cs" />
169-
<Compile Include="Serialization\BoxedEnumMemberSerializationMethod.cs" />
170169
<Compile Include="Serialization\CollectionDetailedKind.cs" />
171170
<Compile Include="Serialization\CollectionSerializers\CollectionSerializerHelpers.cs" />
172171
<Compile Include="Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs" />
@@ -203,6 +202,7 @@
203202
<Compile Include="Serialization\ExpressionSerializers\ExpressionCallbackNonGenericDictionaryMessagePackSerializer`1.cs" />
204203
<Compile Include="Serialization\ExpressionSerializers\ExpressionCallbackNonGenericEnumerableMessagePackSerializer`1.cs" />
205204
<Compile Include="Serialization\ExpressionSerializers\ExpressionCallbackNonGenericListMessagePackSerializer`1.cs" />
205+
<Compile Include="Serialization\ExpressionSerializers\ExpressionTreeSerializerBuilderHelpers.cs" />
206206
<Compile Include="Serialization\INilImplicationHandlerOnUnpackedParameter.cs" />
207207
<Compile Include="Serialization\INilImplicationHandlerParameter.cs" />
208208
<Compile Include="Serialization\MessagePackRuntimeTypeAttributes.cs">
@@ -348,7 +348,6 @@
348348
<Compile Include="Serialization\SerializerTypeKeyRepository.cs" />
349349
<Compile Include="Serialization\LazyDelegatingMessagePackSerializer`1.cs" />
350350
<Compile Include="Serialization\MessagePackMemberAttribute.cs" />
351-
<Compile Include="Serialization\Metadata\_Enumerable.cs" />
352351
<Compile Include="Serialization\Metadata\_IDictionaryEnumerator.cs" />
353352
<Compile Include="Serialization\Metadata\_IEnumreator.cs" />
354353
<Compile Include="Serialization\Metadata\_MessagePackSerializer.cs" />

0 commit comments

Comments
 (0)