Skip to content

Commit f59c0d9

Browse files
mythzmythz
committed
Upgrade Northwind to v4.0.11
1 parent 9c2ccc9 commit f59c0d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+13041
-281
lines changed

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/CachedServices.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11

22

3+
34
namespace ServiceStack.Northwind.ServiceInterface
45
{
5-
using ServiceStack.CacheAccess;
6-
using ServiceStack.Common;
7-
using ServiceStack.Northwind.ServiceModel.Operations;
8-
using ServiceStack.ServiceHost;
9-
using ServiceStack.ServiceInterface;
6+
using Caching;
7+
using ServiceModel.Operations;
108

11-
public class CachedCustomersService : ServiceStack.ServiceInterface.Service
9+
public class CachedCustomersService : Service
1210
{
1311
public ICacheClient CacheClient { get; set; }
1412

1513
public object Get(CachedCustomers request)
1614
{
17-
return base.RequestContext.ToOptimizedResultUsingCache(
15+
return base.Request.ToOptimizedResultUsingCache(
1816
this.CacheClient, "urn:customers", () => {
1917
var service = this.ResolveService<CustomersService>();
20-
return (CustomersResponse) service.Get(new Customers());
18+
return service.Get(new Customers());
2119
});
2220
}
2321
}
@@ -29,9 +27,9 @@ public class CachedCustomerDetailsService : Service
2927
public object Get(CachedCustomerDetails request)
3028
{
3129
var cacheKey = UrnId.Create<CustomerDetails>(request.Id);
32-
return base.RequestContext.ToOptimizedResultUsingCache(
33-
this.CacheClient, cacheKey, () => (CustomerDetailsResponse)this.ResolveService<CustomerDetailsService>()
34-
.Get(new CustomerDetails { Id = request.Id }));
30+
return base.Request.ToOptimizedResultUsingCache(
31+
this.CacheClient, cacheKey, () =>
32+
this.ResolveService<CustomerDetailsService>().Get(new CustomerDetails { Id = request.Id }));
3533
}
3634
}
3735

@@ -42,7 +40,7 @@ public class CachedOrdersService : Service
4240
public object Get(CachedOrders request)
4341
{
4442
var cacheKey = UrnId.Create<Orders>(request.CustomerId ?? "all", request.Page.GetValueOrDefault(0).ToString());
45-
return base.RequestContext.ToOptimizedResultUsingCache(CacheClient, cacheKey,
43+
return base.Request.ToOptimizedResultUsingCache(CacheClient, cacheKey,
4644
() => (OrdersResponse) ResolveService<OrdersService>()
4745
.Get(new Orders { CustomerId = request.CustomerId, Page = request.Page }));
4846
}

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/CustomerDetailsService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
using System;
22
using System.Net;
3-
using ServiceStack.Common.Web;
43
using ServiceStack.Northwind.ServiceModel.Operations;
54
using ServiceStack.Northwind.ServiceModel.Types;
5+
66
using ServiceStack.OrmLite;
77

88
namespace ServiceStack.Northwind.ServiceInterface
99
{
10-
public class CustomerDetailsService : ServiceStack.ServiceInterface.Service
10+
public class CustomerDetailsService : Service
1111
{
1212
public CustomerDetailsResponse Get(CustomerDetails request)
1313
{
14-
var customer = Db.GetByIdOrDefault<Customer>(request.Id);
14+
var customer = Db.SingleById<Customer>(request.Id);
1515
if (customer == null)
1616
throw new HttpError(HttpStatusCode.NotFound,
17-
new ArgumentException("Customer does not exist: " + request.Id));
17+
new ArgumentException("Customer does not exist: " + request.Id));
1818

1919
var ordersService = base.ResolveService<OrdersService>();
2020
var ordersResponse = (OrdersResponse) ordersService.Get(new Orders {CustomerId = customer.Id});

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/CustomersService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace ServiceStack.Northwind.ServiceInterface
66
{
7-
public class CustomersService : ServiceStack.ServiceInterface.Service
7+
public class CustomersService : ServiceStack.Service
88
{
99
public CustomersResponse Get(Customers request)
1010
{

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/OrdersService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Linq;
2-
using ServiceStack.Common.Extensions;
32
using ServiceStack.Northwind.ServiceModel.Operations;
43
using ServiceStack.Northwind.ServiceModel.Types;
54
using ServiceStack.OrmLite;
65

76
namespace ServiceStack.Northwind.ServiceInterface
87
{
9-
public class OrdersService : ServiceStack.ServiceInterface.Service
8+
public class OrdersService : Service
109
{
1110
private const int PageCount = 20;
1211

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/ServiceStack.Northwind.ServiceInterface.csproj

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ServiceStack.Northwind.ServiceInterface</RootNamespace>
1212
<AssemblyName>ServiceStack.Northwind.ServiceInterface</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -33,6 +33,7 @@
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
3434
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
3535
<RestorePackages>true</RestorePackages>
36+
<TargetFrameworkProfile />
3637
</PropertyGroup>
3738
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3839
<DebugSymbols>true</DebugSymbols>
@@ -54,37 +55,23 @@
5455
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5556
</PropertyGroup>
5657
<ItemGroup>
57-
<Reference Include="ServiceStack, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.dll</HintPath>
58+
<Reference Include="ServiceStack">
59+
<HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
6060
</Reference>
61-
<Reference Include="ServiceStack.Common, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
61+
<Reference Include="ServiceStack.Client">
62+
<HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
6463
</Reference>
65-
<Reference Include="ServiceStack.Interfaces, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
64+
<Reference Include="ServiceStack.Common">
65+
<HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
6866
</Reference>
69-
<Reference Include="ServiceStack.OrmLite, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
67+
<Reference Include="ServiceStack.Interfaces">
68+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
7269
</Reference>
73-
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
74-
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
70+
<Reference Include="ServiceStack.OrmLite">
71+
<HintPath>..\packages\ServiceStack.OrmLite.4.0.11\lib\net40\ServiceStack.OrmLite.dll</HintPath>
7672
</Reference>
77-
<Reference Include="ServiceStack.Redis, Version=3.9.63.0, Culture=neutral, processorArchitecture=MSIL">
78-
<SpecificVersion>False</SpecificVersion>
79-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.63\lib\net35\ServiceStack.Redis.dll</HintPath>
80-
</Reference>
81-
<Reference Include="ServiceStack.ServiceInterface, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
82-
<SpecificVersion>False</SpecificVersion>
83-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
84-
</Reference>
85-
<Reference Include="ServiceStack.Text, Version=3.9.59.0, Culture=neutral, processorArchitecture=MSIL">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
73+
<Reference Include="ServiceStack.Text">
74+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
8875
</Reference>
8976
<Reference Include="System" />
9077
<Reference Include="System.Core">

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/VCardFormat.cs

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,65 @@
1+
using ServiceStack.Web;
2+
13
namespace ServiceStack.Northwind.ServiceInterface
24
{
3-
using System;
4-
using System.IO;
5-
using ServiceStack.Common.Web;
6-
using ServiceStack.Northwind.ServiceModel.Operations;
7-
using ServiceStack.Northwind.ServiceModel.Types;
8-
using ServiceStack.ServiceHost;
9-
using ServiceStack.Text;
10-
using ServiceStack.WebHost.Endpoints;
5+
using System;
6+
using System.IO;
7+
using ServiceModel.Operations;
8+
using ServiceModel.Types;
119

12-
public class VCardFormat
13-
{
14-
private const string VCardContentType = "text/x-vcard";
10+
public class VCardFormat
11+
{
12+
private const string VCardContentType = "text/x-vcard";
1513

16-
public static void Register(IAppHost appHost)
17-
{
18-
appHost.ContentTypeFilters.Register(VCardContentType, SerializeToStream, DeserializeFromStream);
14+
public static void Register(IAppHost appHost)
15+
{
16+
appHost.ContentTypes.Register(VCardContentType, SerializeToStream, DeserializeFromStream);
1917

20-
appHost.ResponseFilters.Add((req, res, dto) =>
21-
{
22-
if (req.ResponseContentType == VCardContentType)
23-
{
24-
res.AddHeader(HttpHeaders.ContentDisposition,
25-
string.Format("attachment;filename={0}.vcf", req.OperationName));
26-
}
27-
});
28-
}
18+
appHost.GlobalResponseFilters.Add((req, res, dto) =>
19+
{
20+
if (req.ResponseContentType == VCardContentType)
21+
{
22+
res.AddHeader(HttpHeaders.ContentDisposition,
23+
string.Format("attachment;filename={0}.vcf", req.OperationName));
24+
}
25+
});
26+
}
2927

30-
public static void SerializeToStream(IRequestContext requestContext, object response, Stream stream)
31-
{
32-
var customerResponse = response as CustomerDetailsResponse;
33-
using (var sw = new StreamWriter(stream))
34-
{
35-
if (customerResponse != null)
36-
{
37-
WriteCustomer(sw, customerResponse.Customer);
38-
}
39-
var customers = response as CustomersResponse;
40-
if (customers != null)
41-
{
42-
customers.Customers.ForEach(x => WriteCustomer(sw, x));
43-
}
44-
}
45-
}
28+
public static void SerializeToStream(IRequest req, object response, Stream stream)
29+
{
30+
var customerResponse = response as CustomerDetailsResponse;
31+
using (var sw = new StreamWriter(stream))
32+
{
33+
if (customerResponse != null)
34+
{
35+
WriteCustomer(sw, customerResponse.Customer);
36+
}
37+
var customers = response as CustomersResponse;
38+
if (customers != null)
39+
{
40+
customers.Customers.ForEach(x => WriteCustomer(sw, x));
41+
}
42+
}
43+
}
4644

47-
public static void WriteCustomer(StreamWriter sw, Customer customer)
48-
{
49-
sw.WriteLine("BEGIN:VCARD");
50-
sw.WriteLine("VERSION:2.1");
51-
sw.WriteLine("FN:" + customer.ContactName);
52-
sw.WriteLine("ORG:" + customer.CompanyName);
53-
sw.WriteLine("TITLE:" + customer.ContactTitle);
54-
sw.WriteLine("EMAIL;TYPE=PREF,INTERNET:" + customer.Email);
55-
sw.WriteLine("TEL;HOME;VOICE:" + customer.Phone);
56-
sw.WriteLine("TEL;WORK;FAX:" + customer.Fax);
57-
sw.WriteLine("ADR;TYPE=HOME;"
58-
+ new[] {customer.Address, customer.City, customer.PostalCode}.Join(";"));
59-
sw.WriteLine("END:VCARD");
60-
}
45+
public static void WriteCustomer(StreamWriter sw, Customer customer)
46+
{
47+
sw.WriteLine("BEGIN:VCARD");
48+
sw.WriteLine("VERSION:2.1");
49+
sw.WriteLine("FN:" + customer.ContactName);
50+
sw.WriteLine("ORG:" + customer.CompanyName);
51+
sw.WriteLine("TITLE:" + customer.ContactTitle);
52+
sw.WriteLine("EMAIL;TYPE=PREF,INTERNET:" + customer.Email);
53+
sw.WriteLine("TEL;HOME;VOICE:" + customer.Phone);
54+
sw.WriteLine("TEL;WORK;FAX:" + customer.Fax);
55+
sw.WriteLine("ADR;TYPE=HOME;"
56+
+ new[] { customer.Address, customer.City, customer.PostalCode }.Join(";"));
57+
sw.WriteLine("END:VCARD");
58+
}
6159

62-
public static object DeserializeFromStream(Type type, Stream stream)
63-
{
64-
throw new NotImplementedException();
65-
}
66-
}
60+
public static object DeserializeFromStream(Type type, Stream stream)
61+
{
62+
throw new NotImplementedException();
63+
}
64+
}
6765
}

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceInterface/packages.config

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack" version="3.9.63" targetFramework="net35" />
4-
<package id="ServiceStack.Common" version="3.9.63" targetFramework="net35" />
5-
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.63" targetFramework="net35" />
6-
<package id="ServiceStack.Redis" version="3.9.63" targetFramework="net35" />
7-
<package id="ServiceStack.Text" version="3.9.63" targetFramework="net35" />
3+
<package id="ServiceStack" version="4.0.11" targetFramework="net40" />
4+
<package id="ServiceStack.Client" version="4.0.11" targetFramework="net40" />
5+
<package id="ServiceStack.Common" version="4.0.11" targetFramework="net40" />
6+
<package id="ServiceStack.Interfaces" version="4.0.11" targetFramework="net40" />
7+
<package id="ServiceStack.OrmLite" version="4.0.11" targetFramework="net40" />
8+
<package id="ServiceStack.Text" version="4.0.11" targetFramework="net40" />
89
</packages>

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/Operations/CachedOperations.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
namespace ServiceStack.Northwind.ServiceModel.Operations
22
{
33
using System.Runtime.Serialization;
4-
using ServiceStack.ServiceHost;
54

6-
[DataContract]
5+
[DataContract]
76
[Route("/cached/customers")]
87
public class CachedCustomers
98
{

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/Operations/CustomerDetails.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ namespace ServiceStack.Northwind.ServiceModel.Operations
22
{
33
using System.Collections.Generic;
44
using System.Runtime.Serialization;
5-
using ServiceStack.Northwind.ServiceModel.Types;
6-
using ServiceStack.ServiceHost;
7-
using ServiceStack.ServiceInterface.ServiceModel;
5+
using Types;
86

9-
[DataContract]
7+
[DataContract]
108
[Route("/customers/{Id}")]
119
public class CustomerDetails
1210
{

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/Operations/Customers.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ namespace ServiceStack.Northwind.ServiceModel.Operations
22
{
33
using System.Collections.Generic;
44
using System.Runtime.Serialization;
5-
using ServiceStack.Northwind.ServiceModel.Types;
6-
using ServiceStack.ServiceHost;
7-
using ServiceStack.ServiceInterface.ServiceModel;
5+
using Types;
86

9-
[DataContract]
7+
[DataContract]
108
[Route("/customers")]
119
public class Customers
1210
{

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/Operations/Orders.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
namespace ServiceStack.Northwind.ServiceModel.Operations
22
{
33
using System.Collections.Generic;
4-
using ServiceStack.Northwind.ServiceModel.Types;
5-
using ServiceStack.ServiceHost;
6-
using ServiceStack.ServiceInterface.ServiceModel;
4+
using Types;
75

8-
[Route("/orders")]
6+
[Route("/orders")]
97
[Route("/orders/page/{Page}")]
108
[Route("/customers/{CustomerId}/orders")]
119
public class Orders

‎src/ServiceStack.Northwind/ServiceStack.Northwind.ServiceModel/ServiceStack.Northwind.ServiceModel.csproj

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ServiceStack.Northwind.ServiceModel</RootNamespace>
1212
<AssemblyName>ServiceStack.Northwind.ServiceModel</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -33,6 +33,7 @@
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
3434
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
3535
<RestorePackages>true</RestorePackages>
36+
<TargetFrameworkProfile />
3637
</PropertyGroup>
3738
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3839
<DebugSymbols>true</DebugSymbols>
@@ -54,17 +55,8 @@
5455
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5556
</PropertyGroup>
5657
<ItemGroup>
57-
<Reference Include="ServiceStack.Common, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
60-
</Reference>
61-
<Reference Include="ServiceStack.Interfaces, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
64-
</Reference>
65-
<Reference Include="ServiceStack.Text, Version=3.9.59.0, Culture=neutral, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
58+
<Reference Include="ServiceStack.Interfaces">
59+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
6860
</Reference>
6961
<Reference Include="System" />
7062
<Reference Include="System.Core">

0 commit comments

Comments
 (0)