Rename to SendFile to avoid conflicts with new UploadFile class

mythz · mythz · commit ca2cff728ce9 · 2016-07-12T15:27:42.000-04:00
diff --git a/src/Client.Sl5/MainPage.xaml.cs b/src/Client.Sl5/MainPage.xaml.cs
@@ -75,8 +75,8 @@ private async void btnTest_Click(object sender, RoutedEventArgs e)
                         ShareCookiesWithBrowser = false
                     };
                     var fileStream = new MemoryStream("content body".ToUtf8Bytes());
-                    var response = client.PostFileWithRequest<UploadFileResponse>(
-                        fileStream, "file.txt", new UploadFile { Name = name });
+                    var response = client.PostFileWithRequest<SendFileResponse>(
+                        fileStream, "file.txt", new SendFile { Name = name });
 
                     Deployment.Current.Dispatcher.BeginInvoke(() =>
                     {
diff --git a/src/Server.AspNet/Global.asax.cs b/src/Server.AspNet/Global.asax.cs
@@ -32,9 +32,9 @@ public object Any(Hello request)
             return new HelloResponse { Result = "Hello, " + request.Name };
         }
 
-        public object Any(UploadFile request)
+        public object Any(SendFile request)
         {
-            var response = new UploadFileResponse
+            var response = new SendFileResponse
             {
                 Name = request.Name,
             };
diff --git a/src/Server.HttpListener/Program.cs b/src/Server.HttpListener/Program.cs
@@ -43,9 +43,9 @@ public object Any(Hello request)
             return response;
         }
 
-        public object Any(UploadFile request)
+        public object Any(SendFile request)
         {
-            var response = new UploadFileResponse {
+            var response = new SendFileResponse {
                 Name = request.Name,
             };
 
diff --git a/src/ServiceModel/SendFile.cs b/src/ServiceModel/SendFile.cs
@@ -2,14 +2,16 @@
 
 namespace ServiceModel
 {
-    public class UploadFile
+    public class SendFile
     {
         public string Name { get; set; }
     }
 
-    public class UploadFileResponse : IReturn<UploadFile>
+    public class SendFileResponse : IReturn<SendFile>
     {
         public string Name { get; set; }
         public long FileSize { get; set; }
+
+        public ResponseStatus ResponseStatus { get; set; }
     }
 }
diff --git a/src/ServiceModel/ServiceModel.csproj b/src/ServiceModel/ServiceModel.csproj
@@ -35,7 +35,7 @@
   <ItemGroup>
     <Compile Include="Hello.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UploadFile.cs" />
+    <Compile Include="SendFile.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public object Any(Hello request)`
`32`	`32`	`return new HelloResponse { Result = "Hello, " + request.Name };`
`33`	`33`	`}`
`34`	`34`
`35`		`- public object Any(UploadFile request)`
	`35`	`+ public object Any(SendFile request)`
`36`	`36`	`{`
`37`		`- var response = new UploadFileResponse`
	`37`	`+ var response = new SendFileResponse`
`38`	`38`	`{`
`39`	`39`	`Name = request.Name,`
`40`	`40`	`};`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ public object Any(Hello request)`
`43`	`43`	`return response;`
`44`	`44`	`}`
`45`	`45`
`46`		`- public object Any(UploadFile request)`
	`46`	`+ public object Any(SendFile request)`
`47`	`47`	`{`
`48`		`- var response = new UploadFileResponse {`
	`48`	`+ var response = new SendFileResponse {`
`49`	`49`	`Name = request.Name,`
`50`	`50`	`};`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,16 @@`
`2`	`2`
`3`	`3`	`namespace ServiceModel`
`4`	`4`	`{`
`5`		`- public class UploadFile`
	`5`	`+ public class SendFile`
`6`	`6`	`{`
`7`	`7`	`public string Name { get; set; }`
`8`	`8`	`}`
`9`	`9`
`10`		`- public class UploadFileResponse : IReturn<UploadFile>`
	`10`	`+ public class SendFileResponse : IReturn<SendFile>`
`11`	`11`	`{`
`12`	`12`	`public string Name { get; set; }`
`13`	`13`	`public long FileSize { get; set; }`
	`14`	`+`
	`15`	`+ public ResponseStatus ResponseStatus { get; set; }`
`14`	`16`	`}`
`15`	`17`	`}`