Bladeren bron

Renamed method

develop
Robin Thoni 5 jaren geleden
bovenliggende
commit
36a79a74a4

+ 8
- 8
Luticate2.Auth.Tests/Business/ExpressionConverter/Objects.cs Bestand weergeven

67
     {
67
     {
68
         public LuOcdTest1()
68
         public LuOcdTest1()
69
         {
69
         {
70
-            AddMemberConverter(x => x.Id, y => y.id);
71
-            AddMemberConverter(x => x.Name, y => y.name);
72
-            AddMemberConverter(x => x.TestDbo2s, y => y.test_model2);
70
+            AddStaticMemberConverter(x => x.Id, y => y.id);
71
+            AddStaticMemberConverter(x => x.Name, y => y.name);
72
+            AddStaticMemberConverter(x => x.TestDbo2s, y => y.test_model2);
73
             AddStaticMethodConverter(
73
             AddStaticMethodConverter(
74
                 (Expression<Func<TestDbo1, string>>)(x => x.ToString()),
74
                 (Expression<Func<TestDbo1, string>>)(x => x.ToString()),
75
                 (Expression<Func<TestModel1, string>>)(x => x.id + ": " + x.name)
75
                 (Expression<Func<TestModel1, string>>)(x => x.id + ": " + x.name)
81
     {
81
     {
82
         public LuOcdTest2()
82
         public LuOcdTest2()
83
         {
83
         {
84
-            AddMemberConverter(x => x.Id, y => y.id);
85
-            AddMemberConverter(x => x.Name, y => y.name);
86
-            AddMemberConverter(x => x.NameVirtual, y => y.name == null ? "[no data]" : (y.name + " " + y.name));
87
-            AddMemberConverter(x => x.TestDbo1, y => y.test_model1);
88
-            AddMemberConverter(x => x.Parent, y => y.parent);
84
+            AddStaticMemberConverter(x => x.Id, y => y.id);
85
+            AddStaticMemberConverter(x => x.Name, y => y.name);
86
+            AddStaticMemberConverter(x => x.NameVirtual, y => y.name == null ? "[no data]" : (y.name + " " + y.name));
87
+            AddStaticMemberConverter(x => x.TestDbo1, y => y.test_model1);
88
+            AddStaticMemberConverter(x => x.Parent, y => y.parent);
89
         }
89
         }
90
     }
90
     }
91
 }
91
 }

+ 8
- 8
Luticate2.Auth.Tests/Business/ObjectConverter/Objects.cs Bestand weergeven

67
     {
67
     {
68
         public LuOcdTest1()
68
         public LuOcdTest1()
69
         {
69
         {
70
-            AddMemberConverter(x => x.Id, y => y.id);
71
-            AddMemberConverter(x => x.Name, y => y.name);
72
-            AddMemberConverter(x => x.TestDbo2s, y => y.test_model2);
70
+            AddStaticMemberConverter(x => x.Id, y => y.id);
71
+            AddStaticMemberConverter(x => x.Name, y => y.name);
72
+            AddStaticMemberConverter(x => x.TestDbo2s, y => y.test_model2);
73
             AddStaticMethodConverter(
73
             AddStaticMethodConverter(
74
                 (Expression<Func<TestDbo1, string>>)(x => x.ToString()),
74
                 (Expression<Func<TestDbo1, string>>)(x => x.ToString()),
75
                 (Expression<Func<TestModel1, string>>)(x => x.id + ": " + x.name)
75
                 (Expression<Func<TestModel1, string>>)(x => x.id + ": " + x.name)
81
     {
81
     {
82
         public LuOcdTest2()
82
         public LuOcdTest2()
83
         {
83
         {
84
-            AddMemberConverter(x => x.Id, y => y.id);
85
-            AddMemberConverter(x => x.Name, y => y.name);
86
-            AddMemberConverter(x => x.NameVirtual, y => y.name + " " + y.name);
87
-            AddMemberConverter(x => x.TestDbo1, y => y.test_model1);
88
-            AddMemberConverter(x => x.Parent, y => y.parent);
84
+            AddStaticMemberConverter(x => x.Id, y => y.id);
85
+            AddStaticMemberConverter(x => x.Name, y => y.name);
86
+            AddStaticMemberConverter(x => x.NameVirtual, y => y.name + " " + y.name);
87
+            AddStaticMemberConverter(x => x.TestDbo1, y => y.test_model1);
88
+            AddStaticMemberConverter(x => x.Parent, y => y.parent);
89
             AddNullMemberConverter<TestDbo1>(x => x.Unused);
89
             AddNullMemberConverter<TestDbo1>(x => x.Unused);
90
         }
90
         }
91
     }
91
     }

+ 4
- 4
Luticate2.Auth/Utils/Business/ObjectConverterDescriptor/LuObjectConverterDescriptor.cs Bestand weergeven

30
 
30
 
31
         private IDictionary<MethodInfo, DynamicMethodConverter> DynamicMethodConverters { get; } = new Dictionary<MethodInfo, DynamicMethodConverter>();
31
         private IDictionary<MethodInfo, DynamicMethodConverter> DynamicMethodConverters { get; } = new Dictionary<MethodInfo, DynamicMethodConverter>();
32
 
32
 
33
-        protected void AddMemberConverter(LambdaExpression memberFrom, LambdaExpression valueExpression)
33
+        protected void AddStaticMemberConverter(LambdaExpression memberFrom, LambdaExpression valueExpression)
34
         {
34
         {
35
             // TODO: check memberInfo != null
35
             // TODO: check memberInfo != null
36
             var memberInfo = LuExpressionUtils.GetSingleMemberFromExpression(memberFrom);
36
             var memberInfo = LuExpressionUtils.GetSingleMemberFromExpression(memberFrom);
117
 
117
 
118
     public class LuObjectConverterDescriptor<TTypeFrom, TTypeTo> : LuObjectConverterDescriptor, ILuObjectConverterDescriptor<TTypeFrom, TTypeTo>
118
     public class LuObjectConverterDescriptor<TTypeFrom, TTypeTo> : LuObjectConverterDescriptor, ILuObjectConverterDescriptor<TTypeFrom, TTypeTo>
119
     {
119
     {
120
-        protected void AddMemberConverter(Expression<Func<TTypeFrom, object>> memberFrom,
120
+        protected void AddStaticMemberConverter(Expression<Func<TTypeFrom, object>> memberFrom,
121
             Expression<Func<TTypeTo, object>> valueExpression)
121
             Expression<Func<TTypeTo, object>> valueExpression)
122
         {
122
         {
123
-            AddMemberConverter((LambdaExpression) memberFrom, valueExpression);
123
+            AddStaticMemberConverter((LambdaExpression) memberFrom, valueExpression);
124
         }
124
         }
125
 
125
 
126
         protected void AddNullMemberConverter<TType>(Expression<Func<TTypeFrom, object>> memberFrom)
126
         protected void AddNullMemberConverter<TType>(Expression<Func<TTypeFrom, object>> memberFrom)
128
             var nullExp = Expression.Constant(null, typeof(TType));
128
             var nullExp = Expression.Constant(null, typeof(TType));
129
             var param = Expression.Parameter(typeof(TTypeTo));
129
             var param = Expression.Parameter(typeof(TTypeTo));
130
             var lambda = Expression.Lambda(nullExp, param);
130
             var lambda = Expression.Lambda(nullExp, param);
131
-            AddMemberConverter(memberFrom, lambda);
131
+            AddStaticMemberConverter(memberFrom, lambda);
132
         }
132
         }
133
     }
133
     }
134
 }
134
 }

Laden…
Annuleren
Opslaan