Requested changes

Milos · Milos · commit d97affd130cd · 2018-10-15T10:25:42.000+02:00
diff --git a/src/JsonApiDotNetCore/Internal/Query/AttrFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/AttrFilterQuery.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 
@@ -10,11 +9,7 @@ public class AttrFilterQuery : BaseFilterQuery
         public AttrFilterQuery(
             IJsonApiContext jsonApiContext,
             FilterQuery filterQuery)
-            : base(jsonApiContext, 
-                  null,
-                  filterQuery.Attribute, 
-                  filterQuery.Value, 
-                  filterQuery.OperationType)
+            : base(jsonApiContext, filterQuery)
         {
             if (Attribute == null)
                 throw new JsonApiException(400, $"'{filterQuery.Attribute}' is not a valid attribute.");
@@ -25,7 +20,7 @@ public AttrFilterQuery(
             FilteredAttribute = Attribute;
         }
 
-        [Obsolete("Use " + nameof(Attribute) + " property of " + nameof(BaseAttrQuery) + "class. This property is shared for all AttrQuery and RelatedAttrQuery (filter,sort..) implementations.")]
+        [Obsolete("Use " + nameof(BaseAttrQuery.Attribute) + " insetad.")]
         public AttrAttribute FilteredAttribute { get; set; }
     }
 }
diff --git a/src/JsonApiDotNetCore/Internal/Query/AttrSortQuery.cs b/src/JsonApiDotNetCore/Internal/Query/AttrSortQuery.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 
 namespace JsonApiDotNetCore.Internal.Query
@@ -10,7 +7,7 @@ public class AttrSortQuery : BaseAttrQuery
         public AttrSortQuery(
             IJsonApiContext jsonApiContext,
             SortQuery sortQuery)
-            :base(jsonApiContext, null, sortQuery.Attribute)
+            :base(jsonApiContext, sortQuery)
         {
             if (Attribute == null)
                 throw new JsonApiException(400, $"'{sortQuery.Attribute}' is not a valid attribute.");
diff --git a/src/JsonApiDotNetCore/Internal/Query/BaseAttrQuery.cs b/src/JsonApiDotNetCore/Internal/Query/BaseAttrQuery.cs
@@ -13,15 +13,17 @@ public abstract class BaseAttrQuery
     {
         private readonly IJsonApiContext _jsonApiContext;
 
-        public BaseAttrQuery(IJsonApiContext jsonApiContext, string relationship, string attribute)
+        public BaseAttrQuery(IJsonApiContext jsonApiContext, BaseQuery baseQuery)
         {
             _jsonApiContext = jsonApiContext;
-            if (string.IsNullOrEmpty(relationship))
-                Attribute = GetAttribute(attribute);           
+            if (baseQuery.IsAttributeOfRelationship)
+            {
+                Relationship = GetRelationship(baseQuery.Relationship);
+                Attribute = GetAttribute(Relationship, baseQuery.Attribute);
+            }
             else
             {
-                Relationship = GetRelationship(relationship);
-                Attribute = GetAttribute(Relationship, attribute);
+                Attribute = GetAttribute(baseQuery.Attribute);
             }
             
         }
diff --git a/src/JsonApiDotNetCore/Internal/Query/BaseFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/BaseFilterQuery.cs
@@ -1,4 +1,3 @@
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using System;
 
@@ -8,17 +7,14 @@ public class BaseFilterQuery : BaseAttrQuery
     {
         public BaseFilterQuery(
             IJsonApiContext jsonApiContext,
-            string relationship,
-            string attribute,
-            string value,
-            FilterOperations op)
-        : base(jsonApiContext, relationship, attribute)
+            FilterQuery filterQuery)
+        : base(jsonApiContext, filterQuery)
         {
-            PropertyValue = value;
-            FilterOperation = op;
+            PropertyValue = filterQuery.Value;
+            FilterOperation = filterQuery.OperationType;
         }
 
-        [Obsolete("To resolve operation use enum typed " + nameof(FilterQuery.OperationType) + " property of "+ nameof(FilterQuery) +" class")]
+        [Obsolete("Use " + nameof(FilterQuery.OperationType) + " instead.")]
         protected FilterOperations GetFilterOperation(string prefix)
         {
             if (prefix.Length == 0) return FilterOperations.eq;
diff --git a/src/JsonApiDotNetCore/Internal/Query/FilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/FilterQuery.cs
@@ -31,7 +31,7 @@ public FilterQuery(string attribute, string value, FilterOperations operationTyp
         [Obsolete("Key has been replaced by '" + nameof(Attribute) + "'. Members should be located by their public name, not by coercing the provided value to the internal name.")]
         public string Key { get; set; }
         public string Value { get; set; }
-        [Obsolete("Operation has been replaced by '" + nameof(OperationType) + "'. OperationType is typed enum value for Operation property. This should be default property for providing operation type, because of unsustainable string (not typed) value.")]
+        [Obsolete("Use '" + nameof(OperationType) + "' instead.")]
         public string Operation { get; set; }
 
         public FilterOperations OperationType { get; set; }
diff --git a/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 
@@ -10,7 +9,7 @@ public class RelatedAttrFilterQuery : BaseFilterQuery
         public RelatedAttrFilterQuery(
             IJsonApiContext jsonApiContext,
             FilterQuery filterQuery)
-            :base(jsonApiContext, filterQuery.Relationship, filterQuery.Attribute, filterQuery.Value, filterQuery.OperationType)
+            :base(jsonApiContext, filterQuery)
         {
             if (Relationship == null)
                 throw new JsonApiException(400, $"{filterQuery.Relationship} is not a valid relationship on {jsonApiContext.RequestEntity.EntityName}.");
@@ -25,10 +24,10 @@ public RelatedAttrFilterQuery(
             FilteredAttribute = Attribute;
         }
 
-        [Obsolete("Use " + nameof(Attribute) + " property. It's shared for all implementations of BaseAttrQuery(better sort, filter) handling")]
+        [Obsolete("Use " + nameof(Attribute) + " instead.")]
         public AttrAttribute FilteredAttribute { get; set; }
 
-        [Obsolete("Use " + nameof(Relationship) + " property. It's shared for all implementations of BaseAttrQuery(better sort, filter) handling")]
+        [Obsolete("Use " + nameof(Relationship) + " instead.")]
         public RelationshipAttribute FilteredRelationship { get; set; }
     }
 }
diff --git a/src/JsonApiDotNetCore/Internal/Query/RelatedAttrSortQuery.cs b/src/JsonApiDotNetCore/Internal/Query/RelatedAttrSortQuery.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 
 namespace JsonApiDotNetCore.Internal.Query
@@ -10,7 +7,7 @@ public class RelatedAttrSortQuery : BaseAttrQuery
         public RelatedAttrSortQuery(
             IJsonApiContext jsonApiContext,
             SortQuery sortQuery)
-            :base(jsonApiContext, sortQuery.Relationship, sortQuery.Attribute)
+            :base(jsonApiContext, sortQuery)
         {
             if (Relationship == null)
                 throw new JsonApiException(400, $"{sortQuery.Relationship} is not a valid relationship on {jsonApiContext.RequestEntity.EntityName}.");
diff --git a/src/JsonApiDotNetCore/Services/QueryParser.cs b/src/JsonApiDotNetCore/Services/QueryParser.cs
@@ -101,8 +101,7 @@ protected virtual List<FilterQuery> ParseFilterQuery(string key, string value)
             return queries;
         }
 
-        [Obsolete("This method is not used anymore! Use " + nameof(ParseFilterOperationAndValue) + " method with FilterOperations operation return value." +
-            "Operation as string is not used at all.")]
+        [Obsolete("Use " + nameof(ParseFilterOperationAndValue) + " method instead.")]
         protected virtual (string operation, string value) ParseFilterOperation(string value)
         {
             if (value.Length < 3)
@@ -129,7 +128,7 @@ protected virtual (string operation, string value) ParseFilterOperation(string v
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public static (FilterOperations operation, string value) ParseFilterOperationAndValue(string input)
+        protected virtual (FilterOperations operation, string value) ParseFilterOperationAndValue(string input)
         {
             // value is empty
             if (input.Length == 0)
@@ -170,7 +169,7 @@ public static (FilterOperations operation, string value) ParseFilterOperationAnd
         /// </summary>
         /// <param name="operation">String represented operation</param>
         /// <returns></returns>
-        public static (FilterOperations operation, bool succeeded) GetFilterOperation(string operation)
+        private static (FilterOperations operation, bool succeeded) GetFilterOperation(string operation)
         {
             var success = Enum.TryParse(operation, out FilterOperations opertion);
             return (opertion, success);
@@ -256,7 +255,6 @@ protected virtual List<string> ParseFieldsQuery(string key, string value)
             return includedFields;
         }
 
-        [Obsolete("Delete also when " + nameof(ParseFilterOperation) + " deleted.")]
         private string GetFilterOperationOld(string value)
         {
             var values = value.Split(QueryConstants.COLON);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Linq;`
`3`	`2`	`using JsonApiDotNetCore.Models;`
`4`	`3`	`using JsonApiDotNetCore.Services;`
`5`	`4`
`@@ -10,11 +9,7 @@ public class AttrFilterQuery : BaseFilterQuery`
`10`	`9`	`public AttrFilterQuery(`
`11`	`10`	`IJsonApiContext jsonApiContext,`
`12`	`11`	`FilterQuery filterQuery)`
`13`		`- : base(jsonApiContext,`
`14`		`- null,`
`15`		`- filterQuery.Attribute,`
`16`		`- filterQuery.Value,`
`17`		`- filterQuery.OperationType)`
	`12`	`+ : base(jsonApiContext, filterQuery)`
`18`	`13`	`{`
`19`	`14`	`if (Attribute == null)`
`20`	`15`	`throw new JsonApiException(400, $"'{filterQuery.Attribute}' is not a valid attribute.");`
`@@ -25,7 +20,7 @@ public AttrFilterQuery(`
`25`	`20`	`FilteredAttribute = Attribute;`
`26`	`21`	`}`
`27`	`22`
`28`		`- [Obsolete("Use " + nameof(Attribute) + " property of " + nameof(BaseAttrQuery) + "class. This property is shared for all AttrQuery and RelatedAttrQuery (filter,sort..) implementations.")]`
	`23`	`+ [Obsolete("Use " + nameof(BaseAttrQuery.Attribute) + " insetad.")]`
`29`	`24`	`public AttrAttribute FilteredAttribute { get; set; }`
`30`	`25`	`}`
`31`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,17 @@ public abstract class BaseAttrQuery`
`13`	`13`	`{`
`14`	`14`	`private readonly IJsonApiContext _jsonApiContext;`
`15`	`15`
`16`		`- public BaseAttrQuery(IJsonApiContext jsonApiContext, string relationship, string attribute)`
	`16`	`+ public BaseAttrQuery(IJsonApiContext jsonApiContext, BaseQuery baseQuery)`
`17`	`17`	`{`
`18`	`18`	`_jsonApiContext = jsonApiContext;`
`19`		`- if (string.IsNullOrEmpty(relationship))`
`20`		`- Attribute = GetAttribute(attribute);`
	`19`	`+ if (baseQuery.IsAttributeOfRelationship)`
	`20`	`+ {`
	`21`	`+ Relationship = GetRelationship(baseQuery.Relationship);`
	`22`	`+ Attribute = GetAttribute(Relationship, baseQuery.Attribute);`
	`23`	`+ }`
`21`	`24`	`else`
`22`	`25`	`{`
`23`		`- Relationship = GetRelationship(relationship);`
`24`		`- Attribute = GetAttribute(Relationship, attribute);`
	`26`	`+ Attribute = GetAttribute(baseQuery.Attribute);`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,7 @@ protected virtual List<FilterQuery> ParseFilterQuery(string key, string value)`
`101`	`101`	`return queries;`
`102`	`102`	`}`
`103`	`103`
`104`		`- [Obsolete("This method is not used anymore! Use " + nameof(ParseFilterOperationAndValue) + " method with FilterOperations operation return value." +`
`105`		`- "Operation as string is not used at all.")]`
	`104`	`+ [Obsolete("Use " + nameof(ParseFilterOperationAndValue) + " method instead.")]`
`106`	`105`	`protected virtual (string operation, string value) ParseFilterOperation(string value)`
`107`	`106`	`{`
`108`	`107`	`if (value.Length < 3)`
`@@ -129,7 +128,7 @@ protected virtual (string operation, string value) ParseFilterOperation(string v`
`129`	`128`	`/// </summary>`
`130`	`129`	`/// <param name="input"></param>`
`131`	`130`	`/// <returns></returns>`
`132`		`- public static (FilterOperations operation, string value) ParseFilterOperationAndValue(string input)`
	`131`	`+ protected virtual (FilterOperations operation, string value) ParseFilterOperationAndValue(string input)`
`133`	`132`	`{`
`134`	`133`	`// value is empty`
`135`	`134`	`if (input.Length == 0)`
`@@ -170,7 +169,7 @@ public static (FilterOperations operation, string value) ParseFilterOperationAnd`
`170`	`169`	`/// </summary>`
`171`	`170`	`/// <param name="operation">String represented operation</param>`
`172`	`171`	`/// <returns></returns>`
`173`		`- public static (FilterOperations operation, bool succeeded) GetFilterOperation(string operation)`
	`172`	`+ private static (FilterOperations operation, bool succeeded) GetFilterOperation(string operation)`
`174`	`173`	`{`
`175`	`174`	`var success = Enum.TryParse(operation, out FilterOperations opertion);`
`176`	`175`	`return (opertion, success);`
`@@ -256,7 +255,6 @@ protected virtual List<string> ParseFieldsQuery(string key, string value)`
`256`	`255`	`return includedFields;`
`257`	`256`	`}`
`258`	`257`
`259`		`- [Obsolete("Delete also when " + nameof(ParseFilterOperation) + " deleted.")]`
`260`	`258`	`private string GetFilterOperationOld(string value)`
`261`	`259`	`{`
`262`	`260`	`var values = value.Split(QueryConstants.COLON);`