Simplify Trippin namespace

OData · Sep 2, 2020 · 8f5c88e · 8f5c88e
1 parent b50c304
commit 8f5c88e
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 20 deletions.
diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Api/TrippinApi.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Api/TrippinApi.cs
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.OData.Builder;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Service.Sample.TrippinInMemory.Models;
+using Trippin;
 using Microsoft.Restier.AspNet.Model;
 using Microsoft.Restier.Core;
 using Microsoft.Restier.Core.Model;
@@ -346,7 +346,7 @@ internal class ModelBuilder : IModelBuilder
             public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken cancellationToken)
             {
                 var modelBuilder = new ODataConventionModelBuilder();
-                modelBuilder.Namespace = "Microsoft.OData.Service.Sample.TrippinInMemory.Models";
+                modelBuilder.Namespace = "Trippin";
                 modelBuilder.EntitySet<Person>("People");
                 modelBuilder.EntitySet<Airline>("Airlines");
                 modelBuilder.EntitySet<Airport>("Airports");

diff --git a/.../TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/App_Start/WebApiConfig.cs b/.../TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/App_Start/WebApiConfig.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
-using System.Configuration;
 using System.Web.Http;
 using System.Web.Http.Cors;
 using Microsoft.AspNet.OData;
@@ -11,7 +10,7 @@
 using Microsoft.AspNet.OData.Query;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OData.Service.Sample.TrippinInMemory.Api;
-using Microsoft.OData.Service.Sample.TrippinInMemory.Models;
+using Trippin;
 using Microsoft.Restier.Core;
 using Microsoft.Restier.Core.Model;
 using Microsoft.Restier.Core.Submit;

diff --git a/...nInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Controllers/TrippinController.cs b/...nInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Controllers/TrippinController.cs
@@ -9,7 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OData.Service.Sample.TrippinInMemory.Api;
 using Microsoft.Restier.Core;
-using Microsoft.OData.Service.Sample.TrippinInMemory.Models;
+using Trippin;
 using System;
 using System.Net.Http;
 using System.Web.Http.Routing;

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Airline.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Airline.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Airline
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Airport.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Airport.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Airport
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/City.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/City.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class City
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Employee.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Employee.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Employee : Person
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Event.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Event.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Event : PlanItem
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Flight.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Flight.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Flight : PublicTransportation
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Location.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Location.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Spatial;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Location
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Manager.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Manager.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Manager : Person
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Person.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Person.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public enum PersonGender
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/PlanItem.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/PlanItem.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class PlanItem
     {

diff --git a/...PinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/PublicTransportation.cs b/...PinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/PublicTransportation.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class PublicTransportation : PlanItem
     {

diff --git a/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Trip.cs b/RESTier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/Trip.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class Trip
     {

diff --git a/...ripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/TripPinDataSource.cs b/...ripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/Models/TripPinDataSource.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using Microsoft.Spatial;
 
-namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
+namespace Trippin
 {
     public class TripPinDataSource
     {

diff --git a/...ier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/TrippinBatchHandler.cs b/...ier/TripPinInMemory/Microsoft.OData.Service.Sample.TrippinInMemory/TrippinBatchHandler.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web.Http;