Add Session feature, object model, etc..

Author: Tratcher

src/Microsoft.AspNet.FeatureModel/FeatureCollection.cs

@@ -31,9 +31,8 @@ public object GetInterface()
             return GetInterface(null);
         }
 
-        public object GetInterface(Type type)
+        public object GetInterface([NotNull] Type type)
         {
-            if (type == null) throw new ArgumentNullException("type");
             object feature;
             if (_featureByFeatureType.TryGetValue(type, out feature))
             {
@@ -63,10 +62,8 @@ public object GetInterface(Type type)
             return null;
         }
 
-        void SetInterface(Type type, object feature)
+        void SetInterface([NotNull] Type type, object feature)
         {
-            if (type == null) throw new ArgumentNullException("type");
-
             if (feature == null)
             {
                 Remove(type);
@@ -153,27 +150,22 @@ public bool IsReadOnly
             get { return false; }
         }
 
-        public bool ContainsKey(Type key)
+        public bool ContainsKey([NotNull] Type key)
         {
-            if (key == null) throw new ArgumentNullException("key");
             return GetInterface(key) != null;
         }
 
-        public void Add(Type key, object value)
+        public void Add([NotNull] Type key, [NotNull] object value)
         {
-            if (key == null) throw new ArgumentNullException("key");
-            if (value == null) throw new ArgumentNullException("value");
             if (ContainsKey(key))
             {
                 throw new ArgumentException();
             }
             SetInterface(key, value);
         }
 
-        public bool Remove(Type key)
+        public bool Remove([NotNull] Type key)
         {
-            if (key == null) throw new ArgumentNullException("key");
-
             lock (_containerSync)
             {
                 Type priorFeatureType;
@@ -188,7 +180,7 @@ public bool Remove(Type key)
             }
         }
 
-        public bool TryGetValue(Type key, out object value)
+        public bool TryGetValue([NotNull] Type key, out object value)
         {
             value = GetInterface(key);
             return value != null;

src/Microsoft.AspNet.FeatureModel/NotNullAttribute.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNet.FeatureModel
+{
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
+    internal sealed class NotNullAttribute : Attribute
+    {
+    }
+}

src/Microsoft.AspNet.FeatureModel/project.json

@@ -1,6 +1,8 @@
 {
   "version": "1.0.0-*",
-  "dependencies": {},
+  "dependencies": {
+    "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
+  },
   "frameworks": {
     "aspnet50": {},
     "aspnetcore50": {

src/Microsoft.AspNet.Http.Extensions/SessionCollectionExtensions.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+
+namespace Microsoft.AspNet.Http
+{
+    public static class SessionCollectionExtensions
+    {
+        public static void SetInt(this ISessionCollection session, string key, int value)
+        {
+            var bytes = new byte[]
+            {
+                (byte)(value >> 24),
+                (byte)(0xFF & (value >> 16)),
+                (byte)(0xFF & (value >> 8)),
+                (byte)(0xFF & value)
+            };
+            session.Set(key, bytes);
+        }
+
+        public static int? GetInt(this ISessionCollection session, string key)
+        {
+            var data = session.Get(key);
+            if (data == null || data.Length < 4)
+            {
+                return null;
+            }
+            return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+        }
+
+        public static void SetString(this ISessionCollection session, string key, string value)
+        {
+            session.Set(key, Encoding.UTF8.GetBytes(value));
+        }
+
+        public static string GetString(this ISessionCollection session, string key)
+        {
+            var data = session.Get(key);
+            if (data == null)
+            {
+                return null;
+            }
+            return Encoding.UTF8.GetString(data);
+        }
+
+        public static byte[] Get(this ISessionCollection session, string key)
+        {
+            byte[] value = null;
+            session.TryGetValue(key, out value);
+            return value;
+        }
+
+        public static void Set(this ISessionCollection session, string key, byte[] value)
+        {
+            session.Set(key, new ArraySegment<byte>(value));
+        }
+    }
+}

src/Microsoft.AspNet.Http.Extensions/project.json

@@ -9,8 +9,6 @@
         },
         "aspnetcore50" : { 
             "dependencies": {
-                "System.Reflection": "4.0.10-beta-*",
-                "System.Reflection.Extensions": "4.0.0-beta-*",
                 "System.Reflection.TypeExtensions": "4.0.0-beta-*",
                 "System.Runtime": "4.0.20-beta-*"
             }

src/Microsoft.AspNet.Http/HttpContext.cs

@@ -28,6 +28,8 @@ public abstract class HttpContext : IDisposable
 
         public abstract CancellationToken RequestAborted { get; }
 
+        public abstract ISessionCollection Session { get; }
+
         public abstract bool IsWebSocketRequest { get; }
 
         public abstract IList<string> WebSocketRequestedProtocols { get; }

src/Microsoft.AspNet.Http/ISessionCollection.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNet.Http
+{
+    public interface ISessionCollection : IEnumerable<KeyValuePair<string, byte[]>>
+    {
+        byte[] this[string key] { get; set; }
+
+        bool TryGetValue(string key, out byte[] value);
+
+        void Set(string key, ArraySegment<byte> value);
+
+        void Remove(string key);
+
+        void Clear();
+    }
+}

src/Microsoft.AspNet.HttpFeature/ISession.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.HttpFeature
+{
+    [AssemblyNeutral]
+    public interface ISession
+    {
+        void Load();
+
+        void Commit();
+
+        bool TryGetValue(string key, out byte[] value);
+
+        void Set(string key, ArraySegment<byte> value);
+
+        void Remove(string key);
+
+        void Clear();
+
+        IEnumerable<string> Keys { get; }
+    }
+}

src/Microsoft.AspNet.HttpFeature/ISessionFactory.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.HttpFeature
+{
+    [AssemblyNeutral]
+    public interface ISessionFactory
+    {
+        bool IsAvailable { get; }
+
+        ISession Create();
+    }
+}

src/Microsoft.AspNet.HttpFeature/ISessionFeature.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.HttpFeature
+{
+    // TODO: Is there any reason not to flatten the Factory down into the Feature?
+    [AssemblyNeutral]
+    public interface ISessionFeature
+    {
+        ISessionFactory Factory { get; set; }
+
+        ISession Session { get; set; }
+    }
+}