Remove subnamespaces under Microsoft.OData.Core.UriParser - Related O…

…Data#491
Zoe-ms · Apr 22, 2016 · 1c4d117 · 1c4d117
1 parent 9647e1e
commit 1c4d117
Show file tree

Hide file tree

Showing 620 changed files with 1,692 additions and 2,728 deletions.
diff --git a/src/Microsoft.OData.Core/AnnotationFilter.cs b/src/Microsoft.OData.Core/AnnotationFilter.cs
@@ -4,11 +4,11 @@
 // </copyright>
 //---------------------------------------------------------------------
 
+using System.Diagnostics;
+using System.Linq;
+
 namespace Microsoft.OData.Core
 {
-    using System.Diagnostics;
-    using System.Linq;
-
     /// <summary>
     /// Filter class to determine whether or not to read an annotation.
     /// </summary>

diff --git a/src/Microsoft.OData.Core/AnnotationFilterPattern.cs b/src/Microsoft.OData.Core/AnnotationFilterPattern.cs
@@ -8,7 +8,6 @@ namespace Microsoft.OData.Core
 {
     using System;
     using System.Diagnostics;
-    using System.Linq;
 
     /// <summary>
     /// Filter pattern class to determine whether an annotation name matches the pattern.

diff --git a/src/Microsoft.OData.Core/Build.Net35/Microsoft.OData.Core.NetFX35.csproj b/src/Microsoft.OData.Core/Build.Net35/Microsoft.OData.Core.NetFX35.csproj
@@ -1015,21 +1015,6 @@
     <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\LiteralUtils.cs">
       <Link>Microsoft\OData\Core\UriParser\LiteralUtils.cs</Link>
     </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Metadata\AlternateKeysODataUriResolver.cs">
-      <Link>Microsoft\OData\Core\UriParser\Metadata\AlternateKeysODataUriResolver.cs</Link>
-    </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Metadata\StringAsEnumResolver.cs">
-      <Link>Microsoft\OData\Core\UriParser\Metadata\StringAsEnumResolver.cs</Link>
-    </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Metadata\ODataUriResolver.cs">
-      <Link>Microsoft\OData\Core\UriParser\Metadata\ODataUriResolver.cs</Link>
-    </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Metadata\UnqualifiedODataUriResolver.cs">
-      <Link>Microsoft\OData\Core\UriParser\Metadata\UnqualifiedODataUriResolver.cs</Link>
-    </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Metadata\UriEdmHelpers.cs">
-      <Link>Microsoft\OData\Core\UriParser\Metadata\UriEdmHelpers.cs</Link>
-    </Compile>
     <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\NamedValue.cs">
       <Link>Microsoft\OData\Core\UriParser\NamedValue.cs</Link>
     </Compile>
@@ -1090,9 +1075,6 @@
     <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Parsers\OpenTypeMethods.cs">
       <Link>Microsoft\OData\Core\UriParser\Parsers\OpenTypeMethods.cs</Link>
     </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Metadata\PathParserModelUtils.cs">
-      <Link>Microsoft\OData\Core\UriParser\Metadata\PathParserModelUtils.cs</Link>
-    </Compile>
     <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Parsers\PathReverser.cs">
       <Link>Microsoft\OData\Core\UriParser\Parsers\PathReverser.cs</Link>
     </Compile>
@@ -1468,9 +1450,6 @@
     <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\UriQueryConstants.cs">
       <Link>Microsoft\OData\Core\UriParser\UriQueryConstants.cs</Link>
     </Compile>
-    <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\UriUtils.cs">
-      <Link>Microsoft\OData\Core\UriParser\UriUtils.cs</Link>
-    </Compile>
     <Compile Include="$(ODataCrossTargettingSourcePath)\UriParser\Visitors\IPathSegmentTokenVisitor.cs">
       <Link>Microsoft\OData\Core\UriParser\Visitors\IPathSegmentTokenVisitor.cs</Link>
     </Compile>
@@ -1599,6 +1578,39 @@
     <Compile Include="..\UriParser\FunctionSignatureWithReturnType.cs">
       <Link>Microsoft\OData\Core\UriParser\FunctionSignatureWithReturnType.cs</Link>
     </Compile>
+    <Compile Include="..\UriParser\Parsers\CustomUriLiteralParsers.cs">
+      <Link>Microsoft\OData\Core\UriParser\Parsers\CustomUriLiteralParsers.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Parsers\DefaultUriLiteralParser.cs">
+      <Link>Microsoft\OData\Core\UriParser\Parsers\DefaultUriLiteralParser.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Parsers\IUriLiteralParser.cs">
+      <Link>Microsoft\OData\Core\UriParser\Parsers\IUriLiteralParser.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Parsers\PathParserModelUtils.cs">
+      <Link>Microsoft\OData\Core\UriParser\Parsers\PathParserModelUtils.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Parsers\UriLiteralParsingException.cs">
+      <Link>Microsoft\OData\Core\UriParser\Parsers\UriLiteralParsingException.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Parsers\UriPrimitiveTypeParser.cs">
+      <Link>Microsoft\OData\Core\UriParser\Parsers\UriPrimitiveTypeParser.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Resolver\AlternateKeysODataUriResolver.cs">
+      <Link>Microsoft\OData\Core\UriParser\Resolver\AlternateKeysODataUriResolver.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Resolver\ODataUriResolver.cs">
+      <Link>Microsoft\OData\Core\UriParser\Resolver\ODataUriResolver.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Resolver\StringAsEnumResolver.cs">
+      <Link>Microsoft\OData\Core\UriParser\Resolver\StringAsEnumResolver.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\Resolver\UnqualifiedODataUriResolver.cs">
+      <Link>Microsoft\OData\Core\UriParser\Resolver\UnqualifiedODataUriResolver.cs</Link>
+    </Compile>
+    <Compile Include="..\UriParser\UriEdmHelpers.cs">
+      <Link>Microsoft\OData\Core\UriParser\UriEdmHelpers.cs</Link>
+    </Compile>
     <Compile Include="..\UriParser\Visitors\PathSegmentToResourcePathTranslator.cs">
       <Link>Microsoft\OData\Core\UriParser\Visitors\PathSegmentToResourcePathTranslator.cs</Link>
     </Compile>
@@ -1638,21 +1650,6 @@
     <Compile Include="..\UriParser\CustomUriLiteralPrefixes.cs">
       <Link>Microsoft\OData\Core\UriParser\CustomUriLiteralPrefixes.cs</Link>
     </Compile>
-    <Compile Include="..\UriParser\Parsers\LiteralParsers\Common\IUriLiteralParser.cs">
-      <Link>Microsoft\OData\Core\UriParser\Parsers\LiteralParsers\Common\IUriLiteralParser.cs</Link>
-    </Compile>
-    <Compile Include="..\UriParser\Parsers\LiteralParsers\Common\UriLiteralParsingException.cs">
-      <Link>Microsoft\OData\Core\UriParser\Parsers\LiteralParsers\Common\UriLiteralParsingException.cs</Link>
-    </Compile>
-    <Compile Include="..\UriParser\Parsers\LiteralParsers\DefaultUriLiteralParser.cs">
-      <Link>Microsoft\OData\Core\UriParser\Parsers\LiteralParsers\DefaultUriLiteralParser.cs</Link>
-    </Compile>
-    <Compile Include="..\UriParser\Parsers\LiteralParsers\CustomUriLiteralParsers.cs">
-      <Link>Microsoft\OData\Core\UriParser\Parsers\LiteralParsers\CustomUriLiteralParsers.cs</Link>
-    </Compile>
-    <Compile Include="..\UriParser\Parsers\LiteralParsers\UriPrimitiveTypeParser.cs">
-      <Link>Microsoft\OData\Core\UriParser\Parsers\LiteralParsers\UriPrimitiveTypeParser.cs</Link>
-    </Compile>
     <Compile Include="..\UriParser\Parsers\UriParserHelper.cs">
       <Link>Microsoft\OData\Core\UriParser\Parsers\UriParserHelper.cs</Link>
     </Compile>

diff --git a/src/Microsoft.OData.Core/Evaluation/ODataConventionalResourceMetadataBuilder.cs b/src/Microsoft.OData.Core/Evaluation/ODataConventionalResourceMetadataBuilder.cs
@@ -16,7 +16,6 @@ namespace Microsoft.OData.Core.Evaluation
     using Microsoft.OData.Core.JsonLight;
     using Microsoft.OData.Core.Metadata;
     using Microsoft.OData.Core.UriParser;
-    using Microsoft.OData.Core.UriParser.Semantic;
     using Microsoft.OData.Edm;
     #endregion
 
@@ -574,7 +573,7 @@ private Uri ComputeIdForContainment()
                     ODataResourceTypeContext.ODataResourceTypeContextWithModel typeContextWithModel = typeContext as ODataResourceTypeContext.ODataResourceTypeContextWithModel;
                     if (typeContextWithModel == null || typeContextWithModel.NavigationSourceEntityType.FindProperty(this.resourceMetadataContext.TypeContext.NavigationSourceName) == null)
                     {
-                        uri = new Uri(Core.UriUtils.EnsureTaillingSlash(uri), parent.resourceMetadataContext.ActualEntityTypeName);    
+                        uri = new Uri(UriUtils.EnsureTaillingSlash(uri), parent.resourceMetadataContext.ActualEntityTypeName);    
                     }
                 }
             }

diff --git a/src/Microsoft.OData.Core/Evaluation/ODataConventionalUriBuilder.cs b/src/Microsoft.OData.Core/Evaluation/ODataConventionalUriBuilder.cs
@@ -13,9 +13,7 @@ namespace Microsoft.OData.Core.Evaluation
     using System.Linq;
     using System.Text;
     using Microsoft.OData.Core.JsonLight;
-    using Microsoft.OData.Edm;
-    using Microsoft.OData.Edm.Values;
-    using Microsoft.OData.Core.Metadata;
+
     #endregion
 
     /// <summary>

diff --git a/src/Microsoft.OData.Core/Evaluation/ODataEdmValueUtils.cs b/src/Microsoft.OData.Core/Evaluation/ODataEdmValueUtils.cs
@@ -7,11 +7,9 @@
 namespace Microsoft.OData.Core.Evaluation
 {
     #region Namespaces
-    using System;
+
     using System.Diagnostics;
-    using Microsoft.Spatial;
     using Microsoft.OData.Edm;
-    using Microsoft.OData.Edm.Library;
     using Microsoft.OData.Edm.Library.Values;
     using Microsoft.OData.Edm.Values;
     using ODataErrorStrings = Microsoft.OData.Core.Strings;

diff --git a/src/Microsoft.OData.Core/Evaluation/ODataMetadataContext.cs b/src/Microsoft.OData.Core/Evaluation/ODataMetadataContext.cs
@@ -11,7 +11,6 @@ namespace Microsoft.OData.Core.Evaluation
     using System.Diagnostics;
     using Microsoft.OData.Core.JsonLight;
     using Microsoft.OData.Core.Metadata;
-    using Microsoft.OData.Core.UriParser;
     using Microsoft.OData.Edm;
 
     /// <summary>

diff --git a/src/Microsoft.OData.Core/Evaluation/ODataUriBuilder.cs b/src/Microsoft.OData.Core/Evaluation/ODataUriBuilder.cs
@@ -4,19 +4,16 @@
 // </copyright>
 //---------------------------------------------------------------------
 
+using System;
+using System.Collections.Generic;
+using Microsoft.OData.Edm.Values;
+
 #if ASTORIA_CLIENT
 namespace Microsoft.OData.Client
 #else
 namespace Microsoft.OData.Core.Evaluation
 #endif
 {
-    #region Namespaces
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.OData.Edm;
-    using Microsoft.OData.Edm.Values;
-    #endregion
-
     /// <summary>
     /// Extensibility point for customizing how OData uri's are built.
     /// </summary>

diff --git a/src/Microsoft.OData.Core/Evaluation/UrlConvention.cs b/src/Microsoft.OData.Core/Evaluation/UrlConvention.cs
@@ -4,6 +4,20 @@
 // </copyright>
 //---------------------------------------------------------------------
 
+#if ASTORIA_DESIGN
+    using System.Xml.Linq;
+#endif
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.OData.Edm;
+using Microsoft.OData.Edm.Annotations;
+using Microsoft.OData.Edm.Library;
+using Microsoft.OData.Edm.Library.Annotations;
+using Microsoft.OData.Edm.Library.Values;
+using Microsoft.OData.Edm.Vocabularies;
+
 #if ASTORIA_CLIENT
 namespace Microsoft.OData.Client
 #else
@@ -18,21 +32,6 @@ namespace Microsoft.OData.Service.Design
 #endif
 #endif
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-#if ASTORIA_DESIGN
-    using System.Xml.Linq;
-#endif
-    using Microsoft.OData.Edm;
-    using Microsoft.OData.Edm.Annotations;
-    using Microsoft.OData.Edm.Vocabularies;
-    using Microsoft.OData.Edm.Library;
-    using Microsoft.OData.Edm.Library.Annotations;
-    using Microsoft.OData.Edm.Library.Values;
-
     /// <summary>
     /// Component for representing the url convention in use by the server, client, or codegen.
     /// </summary>

diff --git a/src/Microsoft.OData.Core/ExceptionUtils.cs b/src/Microsoft.OData.Core/ExceptionUtils.cs
@@ -14,11 +14,8 @@ namespace Microsoft.OData.Core
 {
     #region Namespaces
     using System;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
-    using Microsoft.OData.Core;
-    using Microsoft.OData.Edm;
 
     #endregion Namespaces