Fixing lint errors

Author: hiranya911

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FirebaseMessageClientTest.cs

@@ -60,7 +60,7 @@ public async Task SendAsync()
         {
             var handler = new MockMessageHandler()
             {
-                Response = new SendResponse()
+                Response = new FirebaseMessagingClient.SendResponse()
                 {
                     Name = "test-response",
                 },
@@ -73,15 +73,17 @@ public async Task SendAsync()
             };
             var response = await client.SendAsync(message);
             Assert.Equal("test-response", response);
-            var req = JsonConvert.DeserializeObject<SendRequest>(handler.Request);
+            var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(
+                handler.Request);
             Assert.Equal("test-topic", req.Message.Topic);
             Assert.False(req.ValidateOnly);
             Assert.Equal(1, handler.Calls);
 
             // Send in dryRun mode.
             response = await client.SendAsync(message, dryRun: true);
             Assert.Equal("test-response", response);
-            req = JsonConvert.DeserializeObject<SendRequest>(handler.Request);
+            req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(
+                handler.Request);
             Assert.Equal("test-topic", req.Message.Topic);
             Assert.True(req.ValidateOnly);
             Assert.Equal(2, handler.Calls);
@@ -104,7 +106,8 @@ public async Task HttpErrorAsync()
             var ex = await Assert.ThrowsAsync<FirebaseException>(
                 async () => await client.SendAsync(message));
             Assert.Contains("not json", ex.Message);
-            var req = JsonConvert.DeserializeObject<SendRequest>(handler.Request);
+            var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(
+                handler.Request);
             Assert.Equal("test-topic", req.Message.Topic);
             Assert.False(req.ValidateOnly);
             Assert.Equal(1, handler.Calls);

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/MessageTest.cs

@@ -27,20 +27,20 @@ public class MessageTest
         [Fact]
         public void EmptyMessage()
         {
-            var message = new Message(){Token = "test-token"};
-            AssertJsonEquals(new JObject(){{"token", "test-token"}}, message);
+            var message = new Message() { Token = "test-token" };
+            AssertJsonEquals(new JObject() { { "token", "test-token" } }, message);
 
-            message = new Message(){Topic = "test-topic"};
-            AssertJsonEquals(new JObject(){{"topic", "test-topic"}}, message);
+            message = new Message() { Topic = "test-topic" };
+            AssertJsonEquals(new JObject() { { "topic", "test-topic" } }, message);
 
-            message = new Message(){Condition = "test-condition"};
-            AssertJsonEquals(new JObject(){{"condition", "test-condition"}}, message);
+            message = new Message() { Condition = "test-condition" };
+            AssertJsonEquals(new JObject() { { "condition", "test-condition" } }, message);
         }
 
         [Fact]
         public void PrefixedTopicName()
         {
-            var message = new Message(){Topic = "/topics/test-topic"};
+            var message = new Message() { Topic = "/topics/test-topic" };
             AssertJsonEquals(new JObject(){{"topic", "test-topic"}}, message);
         }
 

FirebaseAdmin/FirebaseAdmin/Extensions.cs

@@ -121,6 +121,7 @@ public static IReadOnlyDictionary<TKey, TValue> Copy<TKey, TValue>(
             {
                 copy[entry.Key] = entry.Value;
             }
+
             return copy;
         }
     }

FirebaseAdmin/FirebaseAdmin/Messaging/Action.cs

@@ -0,0 +1,54 @@
+// Copyright 2018, Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Newtonsoft.Json;
+
+namespace FirebaseAdmin.Messaging
+{
+    /// <summary>
+    /// Represents an action available to users when the notification is presented.
+    /// </summary>
+    public sealed class Action
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Action"/> class.
+        /// </summary>
+        public Action() { }
+
+        internal Action(Action action)
+        {
+            this.ActionName = action.ActionName;
+            this.Title = action.Title;
+            this.Icon = action.Icon;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the Action.
+        /// </summary>
+        [JsonProperty("action")]
+        public string ActionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title text.
+        /// </summary>
+        [JsonProperty("title")]
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets the icon URL.
+        /// </summary>
+        [JsonProperty("icon")]
+        public string Icon { get; set; }
+    }
+}

FirebaseAdmin/FirebaseAdmin/Messaging/AndroidConfig.cs

@@ -24,29 +24,58 @@ namespace FirebaseAdmin.Messaging
     public sealed class AndroidConfig
     {
         /// <summary>
-        /// A collapse key for the message. Collapse key serves as an identifier for a group of
-        /// messages that can be collapsed, so that only the last message gets sent when delivery can be
-        /// resumed. A maximum of 4 different collapse keys may be active at any given time.
+        /// Gets or sets a collapse key for the message. Collapse key serves as an identifier for a
+        /// group of messages that can be collapsed, so that only the last message gets sent when
+        /// delivery can be resumed. A maximum of 4 different collapse keys may be active at any
+        /// given time.
         /// </summary>
         [JsonProperty("collapse_key")]
         public string CollapseKey { get; set; }
 
         /// <summary>
-        /// The priority of the message.
+        /// Gets or sets the priority of the message.
         /// </summary>
         [JsonIgnore]
         public Priority? Priority { get; set; }
 
         /// <summary>
-        /// String representation of the <see cref="Priority"/> as accepted by the FCM backend
-        /// service.
+        /// Gets or sets the time-to-live duration of the message.
+        /// </summary>
+        [JsonIgnore]
+        public TimeSpan? TimeToLive { get; set; }
+
+        /// <summary>
+        /// Gets or sets the package name of the application where the registration tokens must
+        /// match in order to receive the message.
+        /// </summary>
+        [JsonProperty("restricted_package_name")]
+        public string RestrictedPackageName { get; set; }
+
+        /// <summary>
+        /// Gets or sets a collection of key-value pairs that will be added to the message as data
+        /// fields. Keys and the values must not be null. When set, overrides any data fields set
+        /// on the top-level
+        /// <see cref="Message"/>.
+        /// </summary>
+        [JsonProperty("data")]
+        public IReadOnlyDictionary<string, string> Data { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Android notification to be included in the message.
+        /// </summary>
+        [JsonProperty("notification")]
+        public AndroidNotification Notification { get; set; }
+
+        /// <summary>
+        /// Gets or sets the string representation of <see cref="Priority"/> as accepted by the FCM
+        /// backend service.
         /// </summary>
         [JsonProperty("priority")]
         private string PriorityString
         {
             get
             {
-                switch (Priority)
+                switch (this.Priority)
                 {
                     case Messaging.Priority.High:
                         return "high";
@@ -56,15 +85,16 @@ private string PriorityString
                         return null;
                 }
             }
+
             set
             {
                 switch (value)
                 {
                     case "high":
-                        Priority = Messaging.Priority.High;
+                        this.Priority = Messaging.Priority.High;
                         return;
                     case "normal":
-                        Priority = Messaging.Priority.High;
+                        this.Priority = Messaging.Priority.High;
                         return;
                     default:
                         throw new FirebaseException(
@@ -75,69 +105,46 @@ private string PriorityString
         }
 
         /// <summary>
-        /// The time-to-live duration of the message.
-        /// </summary>
-        [JsonIgnore]
-        public TimeSpan? TimeToLive { get; set; }
-
-        /// <summary>
-        /// String representation of <see cref="TimeToLive"/> as accepted by the FCM backend
-        /// service. The string ends in the suffix "s" (indicating seconds) and is preceded
-        /// by the number of seconds, with nanoseconds expressed as fractional seconds.
+        /// Gets or sets the string representation of <see cref="TimeToLive"/> as accepted by the
+        /// FCM backend service. The string ends in the suffix "s" (indicating seconds) and is
+        /// preceded by the number of seconds, with nanoseconds expressed as fractional seconds.
         /// </summary>
         [JsonProperty("ttl")]
         private string TtlString
         {
             get
             {
-                if (TimeToLive == null)
+                if (this.TimeToLive == null)
                 {
                     return null;
                 }
-                var totalSeconds = TimeToLive.Value.TotalSeconds;
-                var seconds = (long) Math.Floor(totalSeconds);
-                var subsecondNanos = (long) ((totalSeconds - seconds) * 1e9);
+
+                var totalSeconds = this.TimeToLive.Value.TotalSeconds;
+                var seconds = (long)Math.Floor(totalSeconds);
+                var subsecondNanos = (long)((totalSeconds - seconds) * 1e9);
                 if (subsecondNanos > 0)
                 {
-                    return String.Format("{0}.{1:D9}s", seconds, subsecondNanos);
+                    return string.Format("{0}.{1:D9}s", seconds, subsecondNanos);
                 }
-                return String.Format("{0}s", seconds);
+
+                return string.Format("{0}s", seconds);
             }
+
             set
             {
                 var segments = value.TrimEnd('s').Split('.');
-                var seconds = Int64.Parse(segments[0]);
+                var seconds = long.Parse(segments[0]);
                 var ttl = TimeSpan.FromSeconds(seconds);
                 if (segments.Length == 2)
                 {
-                    var subsecondNanos = Int64.Parse(segments[1].TrimStart('0'));
+                    var subsecondNanos = long.Parse(segments[1].TrimStart('0'));
                     ttl = ttl.Add(TimeSpan.FromMilliseconds(subsecondNanos / 1e6));
                 }
-                TimeToLive = ttl;
+
+                this.TimeToLive = ttl;
             }
         }
 
-        /// <summary>
-        /// The package name of the application where the registration tokens must match in order
-        /// to receive the message.
-        /// </summary>
-        [JsonProperty("restricted_package_name")]
-        public string RestrictedPackageName { get; set; }
-
-        /// <summary>
-        /// A collection of key-value pairs that will be added to the message as data fields. Keys
-        /// and the values must not be null. When set, overrides any data fields set on the top-level
-        /// <see cref="Message"/>.
-        /// </summary>
-        [JsonProperty("data")]
-        public IReadOnlyDictionary<string, string> Data { get; set; }
-
-        /// <summary>
-        /// The Android notification to be included in the message.
-        /// </summary>
-        [JsonProperty("notification")]
-        public AndroidNotification Notification { get; set; }
-
         /// <summary>
         /// Copies this Android config, and validates the content of it to ensure that it can be
         /// serialized into the JSON format expected by the FCM service.
@@ -164,20 +171,4 @@ internal AndroidConfig CopyAndValidate()
             return copy;
         }
     }
-
-    /// <summary>
-    /// Priority levels that can be set on an <see cref="AndroidConfig"/>.
-    /// </summary>
-    public enum Priority
-    {
-        /// <summary>
-        /// High priority message.
-        /// </summary>
-        High,
-
-        /// <summary>
-        /// Normal priority message.
-        /// </summary>
-        Normal,
-    }
 }