SharpRepository · behzad888 · Jan 14, 2014 · Jan 14, 2014 · Jan 14, 2014 · Jan 14, 2014
diff --git a/SharpRepository.AzureBlobRepository/AzureBlobConfigRepositoryFactory.cs b/SharpRepository.AzureBlobRepository/AzureBlobConfigRepositoryFactory.cs
@@ -0,0 +1,32 @@
+using System;
+using SharpRepository.Repository;
+using SharpRepository.Repository.Configuration;
+
+namespace SharpRepository.AzureBlobRepository
+{
+    public class AzureBlobConfigRepositoryFactory : ConfigRepositoryFactory
+    {
+        public AzureBlobConfigRepositoryFactory(IRepositoryConfiguration config)
+            : base(config)
+        {
+        }
+
+        public override IRepository<T> GetInstance<T>()
+        {
+            throw new NotImplementedException("AzureBlobRepository does not support using IRepository<T> directly to reference a IRepository<T, string>");           
+        }
+
+        public override IRepository<T, TKey> GetInstance<T, TKey>()
+        {
+            var createIfNotExists = false;
+            Boolean.TryParse(RepositoryConfiguration["createIfNotExists"], out createIfNotExists);
+
+            return new AzureBlobRepository<T, TKey>(RepositoryConfiguration["connectionString"], RepositoryConfiguration["container"], createIfNotExists);
+        }
+
+        public override ICompoundKeyRepository<T, TKey, TKey2> GetInstance<T, TKey, TKey2>()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/SharpRepository.AzureBlobRepository/AzureBlobRepository.cs b/SharpRepository.AzureBlobRepository/AzureBlobRepository.cs
@@ -4,7 +4,7 @@ namespace SharpRepository.AzureBlobRepository
 {
     public class AzureBlobRepository<T, TKey> : AzureBlobRepositoryBase<T, TKey> where T: class, new()
     {
-        public AzureBlobRepository(string connectionString, string containerName = null, bool createIfNotExists = true, ICachingStrategy<T, TKey> cachingStrategy = null)
+        public AzureBlobRepository(string connectionString, string containerName = null, bool createIfNotExists = false, ICachingStrategy<T, TKey> cachingStrategy = null)
             : base(connectionString, containerName, createIfNotExists, cachingStrategy)
         {
 
@@ -13,7 +13,7 @@ public AzureBlobRepository(string connectionString, string containerName = null,
 
     public class AzureBlobRepository<T> : AzureBlobRepositoryBase<T, string> where T : class, new()
     {
-        public AzureBlobRepository(string connectionString, string containerName = null, bool createIfNotExists = true, ICachingStrategy<T, string> cachingStrategy = null)
+        public AzureBlobRepository(string connectionString, string containerName = null, bool createIfNotExists = false, ICachingStrategy<T, string> cachingStrategy = null)
             : base(connectionString, containerName, createIfNotExists, cachingStrategy)
         {
 

diff --git a/SharpRepository.AzureBlobRepository/AzureBlobRepositoryBase.cs b/SharpRepository.AzureBlobRepository/AzureBlobRepositoryBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 using Newtonsoft.Json;
 using SharpRepository.Repository;
@@ -30,13 +31,12 @@ internal AzureBlobRepositoryBase(string connectionString, string containerName,
 
             CreateIfNotExists = createIfNotExists;
             BlobClient = storageAccount.CreateCloudBlobClient();
-            SetContainer(containerName);
+            SetContainer();
         }
 
-        protected void SetContainer(string containerName)
+        protected void SetContainer()
         {
-            ContainerName = containerName;
-            BlobContainer = BlobClient.GetContainerReference(containerName);
+            BlobContainer = BlobClient.GetContainerReference(ContainerName);
 
             if (CreateIfNotExists)
             {
@@ -46,9 +46,23 @@ protected void SetContainer(string containerName)
 
         protected override T GetQuery(TKey key)
         {
-            var blob = BlobContainer.GetBlockBlobReference(key.ToString());
+            try
+            {
+                var blob = BlobContainer.GetBlockBlobReference(key.ToString());
+
+                return blob == null ? null : JsonConvert.DeserializeObject<T>(blob.DownloadText());
+            }
+            catch (StorageException storageException)
+            {
+                // check for 404 and return null in that case only, let others bubble up
+                if (storageException.RequestInformation.HttpStatusCode == 404)
+                {
+                    return null;
+                }
 
-            return blob == null ? null : JsonConvert.DeserializeObject<T>(blob.DownloadText());
+                throw;
+            }
+
         }
 
         protected override IQueryable<T> BaseQuery(IFetchStrategy<T> fetchStrategy = null)
@@ -66,8 +80,7 @@ private CloudBlockBlob GetBlobReference(T entity)
 
         protected override void AddItem(T entity)
         {
-            var blob = GetBlobReference(entity);
-            blob.UploadText(JsonConvert.SerializeObject(entity));
+            AddOrUpdateItem(entity);
         }
 
         protected override void DeleteItem(T entity)
@@ -77,6 +90,11 @@ protected override void DeleteItem(T entity)
         }
 
         protected override void UpdateItem(T entity)
+        {
+            AddOrUpdateItem(entity);
+        }
+
+        private void AddOrUpdateItem(T entity)
         {
             var blob = GetBlobReference(entity);
             blob.UploadText(JsonConvert.SerializeObject(entity));

diff --git a/SharpRepository.AzureBlobRepository/AzureBlobRepositoryConfiguration.cs b/SharpRepository.AzureBlobRepository/AzureBlobRepositoryConfiguration.cs
@@ -0,0 +1,43 @@
+using System;
+using SharpRepository.Repository.Configuration;
+
+namespace SharpRepository.AzureBlobRepository
+{
+    public class AzureBlobRepositoryConfiguration : RepositoryConfiguration
+    {
+        public AzureBlobRepositoryConfiguration(string name) : this(name, null, null)
+        {
+        }
+
+        public AzureBlobRepositoryConfiguration(string name, string connectionString)
+            : this(name, connectionString, null)
+        {
+        }
+
+        public AzureBlobRepositoryConfiguration(string name, string connectionString, string container, bool createIfNotExists = false, string cachingStrategy = null, string cachingProvider = null)
+            : base(name)
+        {
+            ConnectionString = connectionString;
+            Container = container;
+            CreateIfNotExists = createIfNotExists;
+            CachingStrategy = cachingStrategy;
+            CachingProvider = cachingProvider;
+            Factory = typeof(AzureBlobConfigRepositoryFactory);
+        }
+
+        public string ConnectionString
+        {
+            set { Attributes["connectionString"] = value; }
+        }
+
+        public string Container
+        {
+            set { Attributes["container"] = String.IsNullOrEmpty(value) ? null : value; }
+        }
+
+        public bool CreateIfNotExists
+        {
+            set { Attributes["createIfNotExists"] = value.ToString(); }
+        }
+    }
+}
diff --git a/SharpRepository.AzureBlobRepository/SharpRepository.AzureBlobRepository.csproj b/SharpRepository.AzureBlobRepository/SharpRepository.AzureBlobRepository.csproj
@@ -31,27 +31,34 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Data.Edm, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Edm.5.2.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
+    <Reference Include="Microsoft.Data.Edm, Version=5.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Data.Edm.5.6.1\lib\net40\Microsoft.Data.Edm.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.OData, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.OData.5.2.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
+    <Reference Include="Microsoft.Data.OData, Version=5.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Data.OData.5.6.1\lib\net40\Microsoft.Data.OData.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Data.Services.Client, Version=5.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Data.Services.Client.5.6.1\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=2.1.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=3.1.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\WindowsAzure.Storage.2.1.0.4\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\packages\WindowsAzure.Storage.3.1.0.1\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Services.Client" />
-    <Reference Include="System.Spatial, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Spatial.5.2.0\lib\net40\System.Spatial.dll</HintPath>
+    <Reference Include="System.Spatial, Version=5.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Spatial.5.6.1\lib\net40\System.Spatial.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -62,6 +69,8 @@
   <ItemGroup>
     <Compile Include="AzureBlobRepository.cs" />
     <Compile Include="AzureBlobRepositoryBase.cs" />
+    <Compile Include="AzureBlobConfigRepositoryFactory.cs" />
+    <Compile Include="AzureBlobRepositoryConfiguration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -71,6 +80,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/SharpRepository.AzureBlobRepository/app.config b/SharpRepository.AzureBlobRepository/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/SharpRepository.AzureBlobRepository/packages.config b/SharpRepository.AzureBlobRepository/packages.config
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Data.Edm" version="5.2.0" targetFramework="net40" />
-  <package id="Microsoft.Data.OData" version="5.2.0" targetFramework="net40" />
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net40" />
+  <package id="Microsoft.Data.Edm" version="5.6.1" targetFramework="net40" />
+  <package id="Microsoft.Data.OData" version="5.6.1" targetFramework="net40" />
+  <package id="Microsoft.Data.Services.Client" version="5.6.1" targetFramework="net40" />
+  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
-  <package id="System.Spatial" version="5.2.0" targetFramework="net40" />
-  <package id="WindowsAzure.Storage" version="2.1.0.4" targetFramework="net40" />
+  <package id="System.Spatial" version="5.6.1" targetFramework="net40" />
+  <package id="WindowsAzure.Storage" version="3.1.0.1" targetFramework="net40" />
 </packages>
diff --git a/SharpRepository.AzureTableRepository/AzureTableRepositoryBase.cs b/SharpRepository.AzureTableRepository/AzureTableRepositoryBase.cs
@@ -48,7 +48,7 @@ protected override IQueryable<T> BaseQuery(IFetchStrategy<T> fetchStrategy = nul
 
         protected override void AddItem(T entity)
         {
-            Table.Execute(TableOperation.Insert(entity));
+            Table.Execute(TableOperation.InsertOrReplace(entity));
         }
 
         // TODO: override Add(IEnumerable<T> entities) to use the TableSet.Add(entities) isntead of looping ourselves and having AddItem() called multiple times