use nameof to get method names

ra0o0f · Oct 15, 2016 · 62953d9 · 62953d9
1 parent adbdd32
commit 62953d9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 29 deletions.
diff --git a/src/ArangoDB.Client/ArangoDB.Client.Portable.csproj b/src/ArangoDB.Client/ArangoDB.Client.Portable.csproj
@@ -184,7 +184,6 @@
     <Compile Include="Query\LinqUtility.cs" />
     <Compile Include="Query\NamedExpression.cs" />
     <Compile Include="Query\SupportedMethodSpecifications.cs" />
-    <Compile Include="Query\VisitorModificationData.cs" />
     <Compile Include="Serialization\Converters\DateTimeConverter.cs" />
     <Compile Include="Serialization\Converters\QueryParameterConverter.cs" />
     <Compile Include="Serialization\Converters\EnumValueConverter.cs" />

diff --git a/src/ArangoDB.Client/Query/ArangoExpressionTreeVisitor.cs b/src/ArangoDB.Client/Query/ArangoExpressionTreeVisitor.cs
@@ -384,8 +384,8 @@ protected override Expression VisitSubQuery(SubQueryExpression expression)
             if (HandleLet)
                 visitor.DefaultAssociatedIdentifier = QueryModel.MainFromClause.ItemName;
 
-            visitor.QueryText = this.ModelVisitor.QueryText;
-            visitor.ParnetModelVisitor = this.ModelVisitor;
+            visitor.QueryText = ModelVisitor.QueryText;
+            visitor.ParnetModelVisitor = ModelVisitor;
             visitor.IgnoreFromClause = HandleLet;
 
             visitor.VisitQueryModel(expression.QueryModel);

diff --git a/src/ArangoDB.Client/Query/ArangoModelVisitor.cs b/src/ArangoDB.Client/Query/ArangoModelVisitor.cs
@@ -33,9 +33,6 @@ public class ArangoModelVisitor : QueryModelVisitorBase
 
         public int GroupByNameCounter { get; set; }
 
-        //public VisitorCrudState CrudState { get; set; }
-        //public VisitorModificationData ModificationData { get; set; }
-
         public bool DontReturn { get; set; }
 
         public bool IgnoreFromClause { get; set; }
@@ -63,13 +60,13 @@ static ArangoModelVisitor()
                 {typeof(AverageResultOperator),"average"}
             };
         }
-
+        
         public override void VisitQueryModel(QueryModel queryModel)
         {
             if (DefaultAssociatedIdentifier != null)
                 queryModel.MainFromClause.ItemName = DefaultAssociatedIdentifier;
 
-            this.QueryModel = queryModel;
+            QueryModel = queryModel;
 
             var resultOperator = queryModel.ResultOperators.Count != 0 ? queryModel.ResultOperators[0] : null;
             var aggregateFunction = resultOperator != null && aggregateResultOperatorFunctions.ContainsKey(resultOperator.GetType())

diff --git a/src/ArangoDB.Client/Query/Clause/GraphDirectionExpressionNode.cs b/src/ArangoDB.Client/Query/Clause/GraphDirectionExpressionNode.cs
@@ -35,13 +35,13 @@ public GraphDirectionExpressionNode(MethodCallExpressionParseInfo parseInfo,
             {
                 switch(parseInfo.ParsedExpression.Method.Name)
                 {
-                    case "InBound":
+                    case nameof(QueryableExtensions.InBound):
                         Direction = Expression.Constant(Utils.EdgeDirectionToString(EdgeDirection.Inbound));
                         break;
-                    case "OutBound":
+                    case nameof(QueryableExtensions.OutBound):
                         Direction = Expression.Constant(Utils.EdgeDirectionToString(EdgeDirection.Outbound));
                         break;
-                    case "AnyDirection":
+                    case nameof(QueryableExtensions.AnyDirection):
                         Direction = Expression.Constant(Utils.EdgeDirectionToString(EdgeDirection.Any));
                         break;
                 }

diff --git a/src/ArangoDB.Client/Query/Clause/GraphExpressionNode.cs b/src/ArangoDB.Client/Query/Clause/GraphExpressionNode.cs
@@ -33,8 +33,6 @@ public GraphExpressionNode(MethodCallExpressionParseInfo parseInfo,
             ConstantExpression edgeType)
             : base(parseInfo)
         {
-
-
             GraphName = graphName;
             if(vertexType != null && edgeType != null)
             {

diff --git a/src/ArangoDB.Client/Query/LinqUtility.cs b/src/ArangoDB.Client/Query/LinqUtility.cs
@@ -78,7 +78,7 @@ public static string ResolvePropertyName(string name)
             return AddBacktickToName(ResolvePropertyNameRaw(name));
         }
 
-        public static string AddBacktickToName(string name)
+        private static string AddBacktickToName(string name)
         {
             return string.Format("`{0}`", name);
         }

diff --git a/src/ArangoDB.Client/Query/VisitorModificationData.cs b/src/ArangoDB.Client/Query/VisitorModificationData.cs