clean up unused changes

Author: jaredcnance

benchmarks/LinkBuilder/LinkBuilder_ GetNamespaceFromPath_Benchmarks.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Text;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Attributes.Exporters;
 using BenchmarkDotNet.Attributes.Jobs;
-using JsonApiDotNetCore.Extensions;
 
 namespace Benchmarks.LinkBuilder
 {
@@ -16,9 +13,6 @@ public class LinkBuilder_GetNamespaceFromPath_Benchmarks
         [Benchmark]
         public void UsingSplit() => GetNamespaceFromPath_BySplitting(PATH, ENTITY_NAME);
 
-        [Benchmark]
-        public void UsingSpanWithStringBuilder() => GetNamespaceFromPath_Using_Span_With_StringBuilder(PATH, ENTITY_NAME);
-
         [Benchmark]
         public void Current() => GetNameSpaceFromPath_Current(PATH, ENTITY_NAME);
 
@@ -40,21 +34,5 @@ public static string GetNamespaceFromPath_BySplitting(string path, string entity
 
         public static string GetNameSpaceFromPath_Current(string path, string entityName)
             => JsonApiDotNetCore.Builders.LinkBuilder.GetNamespaceFromPath(path, entityName);
-
-        public static string GetNamespaceFromPath_Using_Span_With_StringBuilder(string path, string entityName)
-        {
-            var sb = new StringBuilder();
-            var entityNameSpan = entityName.AsSpan();
-            var subSpans = path.SpanSplit('/');
-            for (var i = 1; i < subSpans.Count; i++)
-            {
-                var span = subSpans[i];
-                if (entityNameSpan.SequenceEqual(span)) 
-                    break;
-
-                sb.Append($"/{span.ToString()}");
-            }
-            return sb.ToString();
-        }
     }
 }

src/JsonApiDotNetCore/Extensions/StringExtensions.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Text;
-using JsonApiDotNetCore.Internal;
 
 namespace JsonApiDotNetCore.Extensions
 {
@@ -53,21 +50,5 @@ public static string Dasherize(this string str)
             }
             return str;
         }
-
-        public static IEnumerable<int> IndexesOf(this string str, char delimeter)
-        {
-            var indexes = new List<int>();
-            for (var i = str.IndexOf(delimeter); i > -1 ; i = str.IndexOf(delimeter, i+1))
-            {
-                indexes.Add(i);
-            }
-            return indexes;
-        }
-
-        public static SpanSplitter SpanSplit(this string str, char delimeter)
-        {
-            return SpanSplitter.Split(str, delimeter);
-        }
-        
     }
 }

src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs

@@ -11,20 +11,17 @@ public class RelatedAttrFilterQuery : BaseFilterQuery
         private readonly IJsonApiContext _jsonApiContext;
 
         public RelatedAttrFilterQuery(
-            IJsonApiContext jsonApiCopntext,
+            IJsonApiContext jsonApiContext,
             FilterQuery filterQuery)
         {
-            _jsonApiContext = jsonApiCopntext;
-            var filterQueryAttribute = filterQuery.Attribute;
-            var filterQuerySubSpans = filterQueryAttribute.SpanSplit('.');
-            var subSpan1 = filterQuerySubSpans[0].ToString();
-            var subSpan2 = filterQuerySubSpans[1].ToString();
-            var relationship = GetRelationship(subSpan1);
-            if (relationship == null)
-                throw new JsonApiException(400, $"{subSpan2} is not a valid relationship on {subSpan1}.");
+            _jsonApiContext = jsonApiContext;
 
-            var attribute = GetAttribute(relationship, subSpan2);
+            var relationshipArray = filterQuery.Attribute.Split('.');
+            var relationship = GetRelationship(relationshipArray[0]);
+            if (relationship == null)
+                throw new JsonApiException(400, $"{relationshipArray[1]} is not a valid relationship on {relationshipArray[0]}.");
 
+            var attribute = GetAttribute(relationship, relationshipArray[1]);
             if (attribute == null)
                 throw new JsonApiException(400, $"'{filterQuery.Attribute}' is not a valid attribute.");
 

src/JsonApiDotNetCore/Internal/SpanSplitter.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Query;
 using JsonApiDotNetCore.Models;
@@ -94,16 +93,16 @@ protected virtual List<FilterQuery> ParseFilterQuery(string key, string value)
             // expected input = filter[id]=1
             // expected input = filter[id]=eq:1
             var queries = new List<FilterQuery>();
-            var openBracketIndex = key.IndexOf(OPEN_BRACKET);
-            var closedBracketIndex = key.IndexOf(CLOSE_BRACKET);
-            var propertyNameSlice = key.AsSpan().Slice(openBracketIndex + 1, closedBracketIndex - openBracketIndex - 1);
-            var propertyName = propertyNameSlice.ToString();
 
-            var spanSplitter = value.SpanSplit(COMMA);
-            for (var i = 0; i < spanSplitter.Count; i++)
+            var propertyName = key.Split(OPEN_BRACKET, CLOSE_BRACKET)[1];
+
+            var values = value.Split(COMMA);
+            foreach (var val in values)
             {
-                queries.Add(BuildFilterQuery(spanSplitter[i], propertyName));
+                (var operation, var filterValue) = ParseFilterOperation(val);
+                queries.Add(new FilterQuery(propertyName, filterValue, operation));
             }
+
             return queries;
         }