Modernize code

justkao · Jun 19, 2017 · 8770888 · 8770888
1 parent 59bf5a7
commit 8770888
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 104 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -11,6 +11,7 @@
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <Description>The automatic type-safe REST library for Xamarin and .NET</Description>
     <NoWarn>$(NoWarn);1701;1702;CS1591</NoWarn>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(NCrunch)' == '' and '$(SourceLinkEnabled)' != 'false'">

diff --git a/Refit.Tests/RestService.cs b/Refit.Tests/RestService.cs
@@ -14,12 +14,14 @@
 
 namespace Refit.Tests
 {
+#pragma warning disable IDE1006 // Naming Styles
     public class RootObject
     {
         public string _id { get; set; }
         public string _rev { get; set; }
-        public string name { get; set; } 
+        public string name { get; set; }
     }
+#pragma warning restore IDE1006 // Naming Styles
 
     [Headers("User-Agent: Refit Integration Tests")]
     public interface INpmJs
@@ -96,7 +98,7 @@ public async Task HitTheGitHubUserApi()
             var result = await fixture.GetUser("octocat");
 
             Assert.Equal("octocat", result.Login);
-            Assert.False(String.IsNullOrEmpty(result.AvatarUrl));
+            Assert.False(string.IsNullOrEmpty(result.AvatarUrl));
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -119,7 +121,7 @@ public async Task HitWithCamelCaseParameter()
             var result = await fixture.GetUserCamelCase("octocat");
 
             Assert.Equal("octocat", result.Login);
-            Assert.False(String.IsNullOrEmpty(result.AvatarUrl));
+            Assert.False(string.IsNullOrEmpty(result.AvatarUrl));
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -191,7 +193,7 @@ public async Task HitTheGitHubUserApiAsObservable()
                 .Timeout(TimeSpan.FromSeconds(10));
 
             Assert.Equal("octocat", result.Login);
-            Assert.False(String.IsNullOrEmpty(result.AvatarUrl));
+            Assert.False(string.IsNullOrEmpty(result.AvatarUrl));
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -219,16 +221,18 @@ public async Task HitTheGitHubUserApiAsObservableAndSubscribeAfterTheFact()
             await obs;
             var result2 = await obs;
             Assert.Equal("octocat", result2.Login);
-            Assert.False(String.IsNullOrEmpty(result2.AvatarUrl));
+            Assert.False(string.IsNullOrEmpty(result2.AvatarUrl));
         }
 
         [Fact]
         public async Task TwoSubscriptionsResultInTwoRequests()
         {
-            var input = new TestHttpMessageHandler();
+            var input = new TestHttpMessageHandler
+            {
 
-            // we need to use a factory here to ensure each request gets its own httpcontent instance
-            input.ContentFactory = () => new StringContent("test");
+                // we need to use a factory here to ensure each request gets its own httpcontent instance
+                ContentFactory = () => new StringContent("test")
+            };
 
             var client = new HttpClient(input) { BaseAddress = new Uri("http://foo") };
             var fixture = RestService.For<IGitHubApi>(client);

diff --git a/Refit/MultipartItem.cs b/Refit/MultipartItem.cs
@@ -13,13 +13,8 @@ public abstract class MultipartItem
     {
         public MultipartItem(string fileName, string contentType)
         {
-            if (fileName == null)
-            {
-                throw new ArgumentNullException("fileName");
-            }
-
-            this.FileName = fileName;
-            this.ContentType = contentType;
+            FileName = fileName ?? throw new ArgumentNullException("fileName");
+            ContentType = contentType;
         }
 
         public string FileName { get; private set; }
@@ -43,11 +38,7 @@ public class StreamPart : MultipartItem
         public StreamPart(Stream value, string fileName, string contentType = null) :
             base(fileName, contentType)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException("value");
-            }
-            Value = value;
+            Value = value ?? throw new ArgumentNullException("value");
         }
 
         public Stream Value { get; private set; }
@@ -63,11 +54,7 @@ public class ByteArrayPart : MultipartItem
         public ByteArrayPart(byte[] value, string fileName, string contentType = null) :
             base(fileName, contentType)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException("value");
-            }
-            Value = value;
+            Value = value ?? throw new ArgumentNullException("value");
         }
 
         public byte[] Value { get; private set; }
@@ -83,11 +70,7 @@ public class FileInfoPart : MultipartItem
         public FileInfoPart(FileInfo value, string fileName, string contentType = null) :
             base(fileName, contentType)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException("value");
-            }
-            Value = value;
+            Value = value ?? throw new ArgumentNullException("value");
         }
 
         public FileInfo Value { get; private set; }

diff --git a/Refit/RefitSettings.cs b/Refit/RefitSettings.cs
@@ -28,7 +28,7 @@ public class DefaultUrlParameterFormatter : IUrlParameterFormatter
     {
         public virtual string Format(object parameterValue, ParameterInfo parameterInfo)
         {
-            return parameterValue != null ? parameterValue.ToString() : null;
+            return parameterValue?.ToString();
         }
     }
 }