fix #66 - MapContext should be public

MapsterMapper · Jun 22, 2016 · 0ac3cfa · 0ac3cfa
1 parent db42b8e
commit 0ac3cfa
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 84 deletions.
diff --git a/src/Mapster/Adapter.cs b/src/Mapster/Adapter.cs
@@ -4,7 +4,7 @@ namespace Mapster
 {
     public interface IAdapter
     {
-        TypeAdapter<TSource> BuildAdapter<TSource>(TSource source);
+        TypeAdapterBuiler<TSource> BuildAdapter<TSource>(TSource source);
         TDestination Adapt<TDestination>(object source);
         TDestination Adapt<TSource, TDestination>(TSource source);
         TDestination Adapt<TSource, TDestination>(TSource source, TDestination destination);
@@ -23,9 +23,9 @@ public Adapter(TypeAdapterConfig config)
             _config = config;
         }
 
-        public TypeAdapter<TSource> BuildAdapter<TSource>(TSource source)
+        public TypeAdapterBuiler<TSource> BuildAdapter<TSource>(TSource source)
         {
-            return new TypeAdapter<TSource>(source).UseConfig(_config);
+            return new TypeAdapterBuiler<TSource>(source, _config);
         }
 
         public TDestination Adapt<TDestination>(object source)

diff --git a/src/Mapster/MapContext.cs b/src/Mapster/MapContext.cs
@@ -27,7 +27,7 @@ public int GetHashCode(object obj)
     /// You can get context by MapContext.Current
     /// And all mapping processes will having only one context
     /// </remarks>
-    internal class MapContext
+    public class MapContext
     {
         [ThreadStatic]
         private static MapContext _current;
@@ -49,7 +49,7 @@ public Dictionary<string, object> Parameters
             get { return _parameters ?? (_parameters = new Dictionary<string, object>(ReferenceComparer.Default)); }
         }
     }
-    internal class MapContextScope : IDisposable
+    public class MapContextScope : IDisposable
     {
         public MapContext Context { get; }
 

diff --git a/src/Mapster/Mapster.csproj b/src/Mapster/Mapster.csproj
@@ -65,6 +65,7 @@
     <Compile Include="IRegister.cs" />
     <Compile Include="MapContext.cs" />
     <Compile Include="NameMatchingStrategy.cs" />
+    <Compile Include="TypeAdapterBuiler.cs" />
     <Compile Include="ValueAccessingStrategy.cs" />
     <Compile Include="Models\AccessModifier.cs" />
     <Compile Include="Utils\BlockExpressionDetector.cs" />

diff --git a/src/Mapster/Mapster.nuget.targets b/src/Mapster/Mapster.nuget.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
+    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
+  </Target>
+</Project>
diff --git a/src/Mapster/QueryableExtensions.cs b/src/Mapster/QueryableExtensions.cs
@@ -19,6 +19,6 @@ public static IQueryable<TDestination> ProjectToType<TDestination>(this IQueryab
             var mockCall = config.GetProjectionCallExpression(source.ElementType, typeof(TDestination));
             var sourceCall = Expression.Call(mockCall.Method, source.Expression, mockCall.Arguments[1]);
             return source.Provider.CreateQuery<TDestination>(sourceCall);
-        } 
+        }
     }
 }
diff --git a/src/Mapster/TypeAdapter.cs b/src/Mapster/TypeAdapter.cs
@@ -1,13 +1,17 @@
 using System;
-using System.Collections.Generic;
 
 namespace Mapster
 {
     public static class TypeAdapter
     {
-        public static TypeAdapter<TSource> BuildAdapter<TSource>(this TSource source)
+        public static TypeAdapterBuiler<TSource> BuildAdapter<TSource>(this TSource source)
         {
-            return new TypeAdapter<TSource>(source);
+            return BuildAdapter(source, TypeAdapterConfig.GlobalSettings);
+        }
+
+        public static TypeAdapterBuiler<TSource> BuildAdapter<TSource>(this TSource source, TypeAdapterConfig config)
+        {
+            return new TypeAdapterBuiler<TSource>(source, config);
         }
 
         /// <summary>
@@ -159,78 +163,4 @@ internal static class TypeAdapter<TSource, TDestination>
     {
         public static Func<TSource, TDestination> Map = TypeAdapterConfig.GlobalSettings.GetMapFunction<TSource, TDestination>();
     }
-
-    public class TypeAdapter<TSource>
-    {
-        TSource Source { get; }
-        TypeAdapterConfig Config { get; set; }
-
-        private Dictionary<string, object> _parameters;
-        Dictionary<string, object> Parameters
-        {
-            get { return _parameters ?? (_parameters = new Dictionary<string, object>(ReferenceComparer.Default)); }
-        }
-
-        public TypeAdapter(TSource source)
-        {
-            this.Source = source;
-            this.Config = TypeAdapterConfig.GlobalSettings;
-        }
-
-        public TypeAdapter<TSource> UseConfig(TypeAdapterConfig config)
-        {
-            this.Config = config;
-            return this;
-        }
-
-        public TypeAdapter<TSource> AddParameters(string name, object value)
-        {
-            this.Parameters.Add(name, value);
-            return this;
-        }
-
-        public TDestination AdaptToType<TDestination>()
-        {
-            if (_parameters == null)
-                return Map<TDestination>();
-
-            using (var scope = new MapContextScope())
-            {
-                var parameters = scope.Context.Parameters;
-                foreach (var kvp in _parameters)
-                {
-                    parameters[kvp.Key] = kvp.Value;
-                }
-                return Map<TDestination>();
-            }
-        }
-
-        private TDestination Map<TDestination>()
-        {
-            var fn = this.Config.GetMapFunction<TSource, TDestination>();
-            return fn(this.Source);
-        }
-
-        public TDestination AdaptTo<TDestination>(TDestination destination)
-        {
-            if (_parameters == null)
-                return MapToTarget(destination);
-
-            using (var scope = new MapContextScope())
-            {
-                var parameters = scope.Context.Parameters;
-                foreach (var kvp in _parameters)
-                {
-                    parameters[kvp.Key] = kvp.Value;
-                }
-                return MapToTarget(destination);
-            }
-        }
-
-        private TDestination MapToTarget<TDestination>(TDestination destination)
-        {
-            var fn = this.Config.GetMapToTargetFunction<TSource, TDestination>();
-            return fn(this.Source, destination);
-        }
-    }
 }
diff --git a/src/Mapster/TypeAdapterBuiler.cs b/src/Mapster/TypeAdapterBuiler.cs
@@ -0,0 +1,72 @@
+using System.Collections.Generic;
+
+namespace Mapster
+{
+    public class TypeAdapterBuiler<TSource>
+    {
+        TSource Source { get; }
+        TypeAdapterConfig Config { get; }
+
+        private Dictionary<string, object> _parameters;
+        Dictionary<string, object> Parameters
+        {
+            get { return _parameters ?? (_parameters = new Dictionary<string, object>(ReferenceComparer.Default)); }
+        }
+
+        internal TypeAdapterBuiler(TSource source, TypeAdapterConfig config)
+        {
+            this.Source = source;
+            this.Config = config;
+        }
+
+        public TypeAdapterBuiler<TSource> AddParameters(string name, object value)
+        {
+            this.Parameters.Add(name, value);
+            return this;
+        }
+
+        public TDestination AdaptToType<TDestination>()
+        {
+            if (_parameters == null)
+                return Map<TDestination>();
+
+            using (var scope = new MapContextScope())
+            {
+                var parameters = scope.Context.Parameters;
+                foreach (var kvp in _parameters)
+                {
+                    parameters[kvp.Key] = kvp.Value;
+                }
+                return Map<TDestination>();
+            }
+        }
+
+        private TDestination Map<TDestination>()
+        {
+            var fn = this.Config.GetMapFunction<TSource, TDestination>();
+            return fn(this.Source);
+        }
+
+        public TDestination AdaptTo<TDestination>(TDestination destination)
+        {
+            if (_parameters == null)
+                return MapToTarget(destination);
+
+            using (var scope = new MapContextScope())
+            {
+                var parameters = scope.Context.Parameters;
+                foreach (var kvp in _parameters)
+                {
+                    parameters[kvp.Key] = kvp.Value;
+                }
+                return MapToTarget(destination);
+            }
+        }
+
+        private TDestination MapToTarget<TDestination>(TDestination destination)
+        {
+            var fn = this.Config.GetMapToTargetFunction<TSource, TDestination>();
+            return fn(this.Source, destination);
+        }
+    }
+}
diff --git a/src/Mapster/project.json b/src/Mapster/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.4.0",
+    "version": "2.4.1",
     "description": "A fast, fun and stimulating object to object mapper.  Kind of like AutoMapper, just simpler and way, way faster.",
     "packOptions": {
         "summary": "A fast, fun and stimulating object to object mapper.  Kind of like AutoMapper, but simpler and way faster.",