make definitions readonly (#2447)

Co-authored-by: Michael Staib <michael@chillicream.com>
ChilliCream · Oct 16, 2020 · 2506498 · 2506498
2 parents b13a2f4 + e0e5fda
commit 2506498
Show file tree

Hide file tree

Showing 32 changed files with 122 additions and 70 deletions.
diff --git a/src/HotChocolate/Data/src/Data/Filters/Convention/FilterConvention.cs b/src/HotChocolate/Data/src/Data/Filters/Convention/FilterConvention.cs
@@ -200,8 +200,8 @@ public NameString GetOperationName(int operation)
 
         public bool TryGetHandler(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition,
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition,
             [NotNullWhen(true)] out IFilterFieldHandler? handler)
         {
             foreach (IFilterFieldHandler filterFieldHandler in _provider.FieldHandlers)

diff --git a/src/HotChocolate/Data/src/Data/Filters/Convention/IFilterConvention.cs b/src/HotChocolate/Data/src/Data/Filters/Convention/IFilterConvention.cs
@@ -114,8 +114,8 @@ public interface IFilterConvention : IConvention
 
         bool TryGetHandler(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition,
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition,
             [NotNullWhen(true)] out IFilterFieldHandler? handler);
 
         /// <summary>

diff --git a/...te/Data/src/Data/Filters/Expressions/Handlers/Boolean/QueryableBooleanOperationHandler.cs b/...te/Data/src/Data/Filters/Expressions/Handlers/Boolean/QueryableBooleanOperationHandler.cs
@@ -9,8 +9,8 @@ public abstract class QueryableBooleanOperationHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is BooleanOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/...a/src/Data/Filters/Expressions/Handlers/Comparable/QueryableComparableOperationHandler.cs b/...a/src/Data/Filters/Expressions/Handlers/Comparable/QueryableComparableOperationHandler.cs
@@ -22,8 +22,8 @@ public abstract class QueryableComparableOperationHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IComparableOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/...otChocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumEqualsHandler.cs b/...otChocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumEqualsHandler.cs
@@ -14,8 +14,8 @@ public class QueryableEnumEqualsHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IEnumOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumInHandler.cs b/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumInHandler.cs
@@ -14,8 +14,8 @@ public class QueryableEnumInHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IEnumOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/...hocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumNotEqualsHandler.cs b/...hocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumNotEqualsHandler.cs
@@ -14,8 +14,8 @@ public class QueryableEnumNotEqualsHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IEnumOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/...HotChocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumNotInHandler.cs b/...HotChocolate/Data/src/Data/Filters/Expressions/Handlers/Enum/QueryableEnumNotInHandler.cs
@@ -14,8 +14,8 @@ public class QueryableEnumNotInHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IEnumOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/...olate/Data/src/Data/Filters/Expressions/Handlers/List/QueryableListAnyOperationHandler.cs b/...olate/Data/src/Data/Filters/Expressions/Handlers/List/QueryableListAnyOperationHandler.cs
@@ -20,8 +20,8 @@ public class QueryableListAnyOperationHandler
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IListFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/...late/Data/src/Data/Filters/Expressions/Handlers/List/QueryableListOperationHandlerBase.cs b/...late/Data/src/Data/Filters/Expressions/Handlers/List/QueryableListOperationHandlerBase.cs
@@ -15,8 +15,8 @@ public abstract class QueryableListOperationHandlerBase
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is IListFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/QueryableDataOperationHandler.cs b/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/QueryableDataOperationHandler.cs
@@ -8,8 +8,8 @@ public class QueryableDataOperationHandler
     {
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return fieldDefinition is FilterOperationFieldDefinition def &&
                 def.Id == DefaultOperations.Data;

diff --git a/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/QueryableDefaultFieldHandler.cs b/src/HotChocolate/Data/src/Data/Filters/Expressions/Handlers/QueryableDefaultFieldHandler.cs
@@ -13,8 +13,8 @@ public class QueryableDefaultFieldHandler
     {
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition) =>
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition) =>
             !(fieldDefinition is FilterOperationFieldDefinition) &&
             fieldDefinition.Member is not null;
 

diff --git a/...late/Data/src/Data/Filters/Expressions/Handlers/String/QueryableStringOperationHandler.cs b/...late/Data/src/Data/Filters/Expressions/Handlers/String/QueryableStringOperationHandler.cs
@@ -8,8 +8,8 @@ public abstract class QueryableStringOperationHandler : QueryableOperationHandle
 
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition)
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition)
         {
             return context.Type is StringOperationFilterInput &&
                 fieldDefinition is FilterOperationFieldDefinition operationField &&

diff --git a/src/HotChocolate/Data/src/Data/Filters/FilterFieldDefinition.cs b/src/HotChocolate/Data/src/Data/Filters/FilterFieldDefinition.cs
@@ -7,6 +7,7 @@ namespace HotChocolate.Data.Filters
     public class FilterFieldDefinition
         : InputFieldDefinition
         , IHasScope
+        , IFilterFieldDefinition
     {
         public MemberInfo? Member { get; set; }
 

diff --git a/src/HotChocolate/Data/src/Data/Filters/FilterInputTypeDefinition.cs b/src/HotChocolate/Data/src/Data/Filters/FilterInputTypeDefinition.cs
@@ -7,6 +7,7 @@ namespace HotChocolate.Data.Filters
     public class FilterInputTypeDefinition
         : InputObjectTypeDefinition
         , IHasScope
+        , IFilterInputTypeDefinition
     {
         public Type? EntityType { get; set; }
 

diff --git a/src/HotChocolate/Data/src/Data/Filters/IFilterFieldDefinition.cs b/src/HotChocolate/Data/src/Data/Filters/IFilterFieldDefinition.cs
@@ -0,0 +1,13 @@
+using System.Reflection;
+
+namespace HotChocolate.Data.Filters
+{
+    public interface IFilterFieldDefinition
+    {
+        MemberInfo? Member { get; set; }
+
+        IFilterFieldHandler? Handler { get; set; }
+
+        string? Scope { get; set; }
+    }
+}
diff --git a/src/HotChocolate/Data/src/Data/Filters/IFilterInputTypeDefinition.cs b/src/HotChocolate/Data/src/Data/Filters/IFilterInputTypeDefinition.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace HotChocolate.Data.Filters
+{
+    public interface IFilterInputTypeDefinition
+    {
+        Type? EntityType { get; }
+
+        string? Scope { get; }
+
+        bool UseOr { get; }
+
+        bool UseAnd { get; }
+    }
+}
diff --git a/src/HotChocolate/Data/src/Data/Filters/Visitor/FilterFieldHandler.cs b/src/HotChocolate/Data/src/Data/Filters/Visitor/FilterFieldHandler.cs
@@ -34,7 +34,7 @@ public abstract class FilterFieldHandler<TContext, T>
         /// <inheritdoc />
         public abstract bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition);
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition);
     }
 }
diff --git a/src/HotChocolate/Data/src/Data/Filters/Visitor/IFilterFieldHandler.cs b/src/HotChocolate/Data/src/Data/Filters/Visitor/IFilterFieldHandler.cs
@@ -6,7 +6,7 @@ public interface IFilterFieldHandler
     {
         bool CanHandle(
             ITypeDiscoveryContext context,
-            FilterInputTypeDefinition typeDefinition,
-            FilterFieldDefinition fieldDefinition);
+            IFilterInputTypeDefinition typeDefinition,
+            IFilterFieldDefinition fieldDefinition);
     }
 }
diff --git a/src/HotChocolate/Data/src/Data/Sorting/Convention/ISortConvention.cs b/src/HotChocolate/Data/src/Data/Sorting/Convention/ISortConvention.cs
@@ -128,8 +128,8 @@ public interface ISortConvention : IConvention
 
         bool TryGetFieldHandler(
             ITypeDiscoveryContext context,
-            SortInputTypeDefinition typeDefinition,
-            SortFieldDefinition fieldDefinition,
+            ISortInputTypeDefinition typeDefinition,
+            ISortFieldDefinition fieldDefinition,
             [NotNullWhen(true)] out ISortFieldHandler? handler);
 
         bool TryGetOperationHandler(

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Convention/SortConvention.cs b/src/HotChocolate/Data/src/Data/Sorting/Convention/SortConvention.cs
@@ -246,8 +246,8 @@ public NameString GetOperationName(int operation)
 
         public bool TryGetFieldHandler(
             ITypeDiscoveryContext context,
-            SortInputTypeDefinition typeDefinition,
-            SortFieldDefinition fieldDefinition,
+            ISortInputTypeDefinition typeDefinition,
+            ISortFieldDefinition fieldDefinition,
             [NotNullWhen(true)] out ISortFieldHandler? handler)
         {
             foreach (ISortFieldHandler sortFieldHandler in _provider.FieldHandlers)

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Expressions/Handlers/QueryableDefaultFieldHandler.cs b/src/HotChocolate/Data/src/Data/Sorting/Expressions/Handlers/QueryableDefaultFieldHandler.cs
@@ -13,8 +13,8 @@ public class QueryableDefaultFieldHandler
     {
         public override bool CanHandle(
             ITypeDiscoveryContext context,
-            SortInputTypeDefinition typeDefinition,
-            SortFieldDefinition fieldDefinition) =>
+            ISortInputTypeDefinition typeDefinition,
+            ISortFieldDefinition fieldDefinition) =>
             fieldDefinition.Member is not null;
 
         public override bool TryHandleEnter(

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortObjectFieldDescriptorExtensions.cs b/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortObjectFieldDescriptorExtensions.cs
@@ -178,10 +178,10 @@ public static class SortObjectFieldDescriptorExtensions
                         LazyTypeConfigurationBuilder
                             .New<ObjectFieldDefinition>()
                             .Definition(definition)
-                            .Configure((context, defintion) =>
+                            .Configure((context, def) =>
                                 CompileMiddleware(
                                     context,
-                                    definition,
+                                    def,
                                     argumentTypeReference,
                                     placeholder,
                                     scope))
@@ -193,7 +193,7 @@ public static class SortObjectFieldDescriptorExtensions
                         LazyTypeConfigurationBuilder
                             .New<ObjectFieldDefinition>()
                             .Definition(definition)
-                            .Configure((context, defintion) =>
+                            .Configure((context, _) =>
                                 argumentDefinition.Name =
                                     context.GetSortConvention(scope).GetArgumentName())
                             .On(ApplyConfigurationOn.Naming)

diff --git a/src/HotChocolate/Data/src/Data/Sorting/ISortFieldDefinition.cs b/src/HotChocolate/Data/src/Data/Sorting/ISortFieldDefinition.cs
@@ -0,0 +1,13 @@
+using System.Reflection;
+using HotChocolate.Types;
+
+namespace HotChocolate.Data.Sorting
+{
+    public interface ISortFieldDefinition
+        : IHasScope
+    {
+        public MemberInfo? Member { get; }
+
+        public ISortFieldHandler? Handler { get; }
+    }
+}
diff --git a/src/HotChocolate/Data/src/Data/Sorting/ISortInputTypeDefinition.cs b/src/HotChocolate/Data/src/Data/Sorting/ISortInputTypeDefinition.cs
@@ -0,0 +1,12 @@
+using System;
+using HotChocolate.Types;
+using HotChocolate.Types.Descriptors.Definitions;
+
+namespace HotChocolate.Data.Sorting
+{
+    public interface ISortInputTypeDefinition
+        : IHasScope
+    {
+        Type? EntityType { get; }
+    }
+}
diff --git a/src/HotChocolate/Data/src/Data/Sorting/SortFieldDefinition.cs b/src/HotChocolate/Data/src/Data/Sorting/SortFieldDefinition.cs
@@ -1,12 +1,11 @@
 using System.Reflection;
-using HotChocolate.Types;
 using HotChocolate.Types.Descriptors.Definitions;
 
 namespace HotChocolate.Data.Sorting
 {
     public class SortFieldDefinition
         : InputFieldDefinition
-        , IHasScope
+        , ISortFieldDefinition
     {
         public MemberInfo? Member { get; set; }
 

diff --git a/src/HotChocolate/Data/src/Data/Sorting/SortInputTypeDefinition.cs b/src/HotChocolate/Data/src/Data/Sorting/SortInputTypeDefinition.cs
@@ -1,12 +1,11 @@
 using System;
-using HotChocolate.Types;
 using HotChocolate.Types.Descriptors.Definitions;
 
 namespace HotChocolate.Data.Sorting
 {
     public class SortInputTypeDefinition
         : InputObjectTypeDefinition
-        , IHasScope
+        , ISortInputTypeDefinition
     {
         public Type? EntityType { get; set; }
 

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Visitor/ISortFieldHandler.cs b/src/HotChocolate/Data/src/Data/Sorting/Visitor/ISortFieldHandler.cs
@@ -6,7 +6,7 @@ public interface ISortFieldHandler
     {
         bool CanHandle(
             ITypeDiscoveryContext context,
-            SortInputTypeDefinition typeDefinition,
-            SortFieldDefinition fieldDefinition);
+            ISortInputTypeDefinition typeDefinition,
+            ISortFieldDefinition fieldDefinition);
     }
 }
diff --git a/src/HotChocolate/Data/src/Data/Sorting/Visitor/SortFieldHandler.cs b/src/HotChocolate/Data/src/Data/Sorting/Visitor/SortFieldHandler.cs
@@ -34,7 +34,7 @@ public abstract class SortFieldHandler<TContext, T>
         /// <inheritdoc />
         public abstract bool CanHandle(
             ITypeDiscoveryContext context,
-            SortInputTypeDefinition typeDefinition,
-            SortFieldDefinition fieldDefinition);
+            ISortInputTypeDefinition typeDefinition,
+            ISortFieldDefinition fieldDefinition);
     }
 }