From fdc5f21428007948f3ce748483e098e328ce3cd0 Mon Sep 17 00:00:00 2001
From: Jass Bagga <jabagga@microsoft.com>
Date: Fri, 20 Oct 2017 13:24:00 -0700
Subject: [PATCH] Port PathTokenizer (#478)

---
 .../Internal/PathTokenizer.cs                                   | 2 +-
 src/Microsoft.AspNetCore.Routing/Dispatcher/TreeMatcher.cs      | 2 +-
 src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs    | 2 +-
 src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs             | 1 +
 .../Internal/PathTokenizerTest.cs                               | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{Microsoft.AspNetCore.Routing => Microsoft.AspNetCore.Dispatcher}/Internal/PathTokenizer.cs (99%)
 rename test/{Microsoft.AspNetCore.Routing.Tests => Microsoft.AspNetCore.Dispatcher.Test}/Internal/PathTokenizerTest.cs (98%)

diff --git a/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs b/src/Microsoft.AspNetCore.Dispatcher/Internal/PathTokenizer.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs
rename to src/Microsoft.AspNetCore.Dispatcher/Internal/PathTokenizer.cs
index 9418989fdb..b6e7aaf645 100644
--- a/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs
+++ b/src/Microsoft.AspNetCore.Dispatcher/Internal/PathTokenizer.cs
@@ -8,7 +8,7 @@ using System.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Routing.Internal
+namespace Microsoft.AspNetCore.Dispatcher.Internal
 {
     public struct PathTokenizer : IReadOnlyList<StringSegment>
     {
diff --git a/src/Microsoft.AspNetCore.Routing/Dispatcher/TreeMatcher.cs b/src/Microsoft.AspNetCore.Routing/Dispatcher/TreeMatcher.cs
index af8bfd0dfe..b1622dd3dc 100644
--- a/src/Microsoft.AspNetCore.Routing/Dispatcher/TreeMatcher.cs
+++ b/src/Microsoft.AspNetCore.Routing/Dispatcher/TreeMatcher.cs
@@ -8,8 +8,8 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Dispatcher;
+using Microsoft.AspNetCore.Dispatcher.Internal;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing.Internal;
 using Microsoft.AspNetCore.Routing.Logging;
 using Microsoft.AspNetCore.Routing.Template;
 using Microsoft.AspNetCore.Routing.Tree;
diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs
index d2bda6e6f9..a63eedd412 100644
--- a/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs
+++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs
@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.AspNetCore.Dispatcher.Internal;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing.Internal;
 
 namespace Microsoft.AspNetCore.Routing.Template
 {
diff --git a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs
index 31a1091093..c8426851ad 100644
--- a/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs
+++ b/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Dispatcher.Internal;
 using Microsoft.AspNetCore.Routing.Internal;
 using Microsoft.AspNetCore.Routing.Logging;
 using Microsoft.AspNetCore.Routing.Template;
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs b/test/Microsoft.AspNetCore.Dispatcher.Test/Internal/PathTokenizerTest.cs
similarity index 98%
rename from test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs
rename to test/Microsoft.AspNetCore.Dispatcher.Test/Internal/PathTokenizerTest.cs
index 78b9685e63..9877fb40f4 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs
+++ b/test/Microsoft.AspNetCore.Dispatcher.Test/Internal/PathTokenizerTest.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Routing.Internal
+namespace Microsoft.AspNetCore.Dispatcher.Internal
 {
     public class PathTokenizerTest
     {