Remove Get and Set, just use indexer.

Author: Tratcher

src/Microsoft.AspNet.Http.Features/FeatureCollection.cs

@@ -34,33 +34,29 @@ public virtual int Revision
 
         public object this[[NotNull] Type key]
         {
-            get { return Get(key); }
-            set { Set(key, value); }
-        }
-
-        public object Get([NotNull] Type key)
-        {
-            object result;
-            return _features != null && _features.TryGetValue(key, out result) ? result : _defaults?.Get(key);
-        }
-
-        public void Set([NotNull] Type key, object value)
-        {
-            if (value == null)
+            get
             {
-                if (_features != null && _features.Remove(key))
+                object result;
+                return _features != null && _features.TryGetValue(key, out result) ? result : _defaults?[key];
+            }
+            set
+            {
+                if (value == null)
                 {
-                    _containerRevision++;
+                    if (_features != null && _features.Remove(key))
+                    {
+                        _containerRevision++;
+                    }
+                    return;
                 }
-                return;
-            }
 
-            if (_features == null)
-            {
-                _features = new Dictionary<Type, object>();
+                if (_features == null)
+                {
+                    _features = new Dictionary<Type, object>();
+                }
+                _features[key] = value;
+                _containerRevision++;
             }
-            _features[key] = value;
-            _containerRevision++;
         }
 
         IEnumerator IEnumerable.GetEnumerator()

src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs

@@ -25,20 +25,5 @@ public interface IFeatureCollection : IEnumerable<KeyValuePair<Type, object>>, I
         /// <param name="key"></param>
         /// <returns>The requested feature, or null if it is not present.</returns>
         object this[[NotNull] Type key] { get; set; }
-
-        /// <summary>
-        /// Gets the requested feature, or null if it is not present.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        object Get([NotNull] Type key);
-
-        /// <summary>
-        /// Sets the given feature, overriding the existing feature if any. If a null value is
-        /// provided then any existing feature is removed.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        void Set([NotNull] Type key, object value);
     }
 }

test/Microsoft.AspNet.Http.Features.Tests/FeatureCollectionTests.cs

@@ -13,11 +13,9 @@ public void AddedInterfaceIsReturned()
             var interfaces = new FeatureCollection();
             var thing = new Thing();
 
-            interfaces.Set(typeof(IThing), thing);
-
-            Assert.Equal(interfaces[typeof(IThing)], thing);
+            interfaces[typeof(IThing)] = thing;
 
-            object thing2 = interfaces.Get(typeof(IThing));
+            object thing2 = interfaces[typeof(IThing)];
             Assert.Equal(thing2, thing);
         }
 
@@ -30,9 +28,6 @@ public void IndexerAlsoAddsItems()
             interfaces[typeof(IThing)] = thing;
 
             Assert.Equal(interfaces[typeof(IThing)], thing);
-
-            object thing2 = interfaces.Get(typeof(IThing));
-            Assert.Equal(thing2, thing);
         }
 
         [Fact]
@@ -41,12 +36,12 @@ public void SetNullValueRemoves()
             var interfaces = new FeatureCollection();
             var thing = new Thing();
 
-            interfaces.Set(typeof(IThing), thing);
+            interfaces[typeof(IThing)] = thing;
             Assert.Equal(interfaces[typeof(IThing)], thing);
 
             interfaces[typeof(IThing)] = null;
 
-            object thing2 = interfaces.Get(typeof(IThing));
+            object thing2 = interfaces[typeof(IThing)];
             Assert.Null(thing2);
         }
     }

test/Microsoft.AspNet.Http.Tests/QueryFeatureTests.cs

@@ -14,7 +14,7 @@ public void QueryReturnsParsedQueryCollection()
             var features = new FeatureCollection();
             var request = new HttpRequestFeature();
             request.QueryString = "foo=bar";
-            features.Set(typeof(IHttpRequestFeature), request);
+            features[typeof(IHttpRequestFeature)] = request;
 
             var provider = new QueryFeature(features);
 

test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs

@@ -12,7 +12,7 @@ public class OwinHttpEnvironmentTests
     {
         private T Get<T>(IFeatureCollection features)
         {
-            return (T)features.Get(typeof(T));
+            return (T)features[typeof(T)];
         }
 
         private T Get<T>(IDictionary<string, object> env, string key)