Create Warehouse Reports job is done!

src/Services/NuGet.Services.Platform.Client/Client/JsonFormat.cs

@@ -17,6 +17,7 @@ namespace NuGet.Services.Client
     public static class JsonFormat
     {
         private static JsonSerializerSettings _serializerSettings;
+        private static JsonSerializerSettings _nonCamelCasedSettings;
         private static JsonMediaTypeFormatter _formatter;
 
         public static JsonSerializerSettings SerializerSettings { get { return _serializerSettings; } }
@@ -38,6 +39,22 @@ static JsonFormat()
                 TypeNameHandling = TypeNameHandling.None
             };
             _serializerSettings.Converters.Add(new StringEnumConverter());
+
+            _nonCamelCasedSettings = new JsonSerializerSettings()
+            {
+                // ContractResolver = ...
+                DateFormatHandling = _serializerSettings.DateFormatHandling,
+                DateParseHandling = _serializerSettings.DateParseHandling,
+                DateTimeZoneHandling = _serializerSettings.DateTimeZoneHandling,
+                DefaultValueHandling = _serializerSettings.DefaultValueHandling,
+                Formatting = _serializerSettings.Formatting,
+                MissingMemberHandling = _serializerSettings.MissingMemberHandling,
+                NullValueHandling = _serializerSettings.NullValueHandling,
+                ReferenceLoopHandling = _serializerSettings.ReferenceLoopHandling,
+                TypeNameHandling = _serializerSettings.TypeNameHandling
+            };
+            _serializerSettings.Converters.Add(new StringEnumConverter());
+
             _formatter = new JsonMediaTypeFormatter()
             {
                 SerializerSettings = _serializerSettings
@@ -52,8 +69,10 @@ public static T Deserialize<T>(string content)
             return JsonConvert.DeserializeObject<T>(content, _serializerSettings);
         }
 
-        public static string Serialize(object data)
+        public static string Serialize(object data) { return Serialize(data, camelCase: true); }
+        public static string Serialize(object data, bool camelCase)
         {
+            var settings = camelCase ? _serializerSettings : _nonCamelCasedSettings;
             return JsonConvert.SerializeObject(data, _serializerSettings);
         }
 
@@ -62,9 +81,11 @@ public static Task<T> DeserializeAsync<T>(string content)
             return JsonConvert.DeserializeObjectAsync<T>(content, _serializerSettings);
         }
 
-        public static Task<string> SerializeAsync(object data)
+        public static Task<string> SerializeAsync(object data) { return SerializeAsync(data, camelCase: true); }
+        public static Task<string> SerializeAsync(object data, bool camelCase)
         {
-            return JsonConvert.SerializeObjectAsync(data, _serializerSettings.Formatting, _serializerSettings);
+            var settings = camelCase ? _serializerSettings : _nonCamelCasedSettings;
+            return JsonConvert.SerializeObjectAsync(data, settings.Formatting, settings);
         }
     }
 
@@ -77,5 +98,10 @@ protected override JsonDictionaryContract CreateDictionaryContract(Type objectTy
             contract.PropertyNameResolver = new Func<string, string>(s => s);
             return contract;
         }
+
+        protected override JsonObjectContract CreateObjectContract(Type objectType)
+        {
+            return base.CreateObjectContract(objectType);
+        }
     }
 }

src/Services/NuGet.Services.Platform.Client/Constants.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NuGet.Services
+{
+    public static class BlobContainerNames
+    {
+        public static readonly string LegacyPackages = "packages";
+        public static readonly string LegacyStats = "stats";
+
+        public static readonly string Backups = "ng-backups";
+    }
+
+    public static class MimeTypes
+    {
+        public static readonly string Json = "application/json";
+    }
+}

src/Services/NuGet.Services.Platform.Client/NuGet.Services.Platform.Client.csproj

@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AzureStorageReference.cs" />
     <Compile Include="Client\JsonFormat.cs" />
     <Compile Include="Client\ServiceResponse.cs" />
+    <Compile Include="Constants.cs" />
     <Compile Include="CredentialProviderHandler.cs" />
     <Compile Include="ICredentialProvider.cs" />
     <Compile Include="Models\AssemblyFullNameConverter.cs" />

src/Services/NuGet.Services.Platform/Configuration/StorageConfiguration.cs

@@ -11,6 +11,10 @@ public class StorageConfiguration : ICustomConfigurationSection
     {
         public Dictionary<KnownStorageAccount, CloudStorageAccount> Accounts { get; private set; }
 
+        public CloudStorageAccount Primary { get { return GetAccount(KnownStorageAccount.Primary); } }
+        public CloudStorageAccount Legacy { get { return GetAccount(KnownStorageAccount.Legacy); } }
+        public CloudStorageAccount Backup { get { return GetAccount(KnownStorageAccount.Backup); } }
+
         public CloudStorageAccount GetAccount(KnownStorageAccount account)
         {
             CloudStorageAccount connectionString;

src/Services/NuGet.Services.Platform/ServicePlatformEventSource.cs

@@ -9,7 +9,7 @@
 
 namespace NuGet.Services
 {
-    [EventSource("Outercurve-NuGet-Services")]
+    [EventSource(Name="Outercurve-NuGet-Services")]
     public class ServicePlatformEventSource : EventSource
     {
         public static readonly ServicePlatformEventSource Log = new ServicePlatformEventSource();

src/Services/NuGet.Services.Platform/Storage/StorageHub.cs

@@ -40,37 +40,6 @@ public StorageHub(StorageAccountHub primary, StorageAccountHub backup, StorageAc
             Legacy = legacy;
         }
 
-        public StorageAccountHub GetAccount(AzureStorageReference reference)
-        {
-            if (String.Equals(reference.AccountName, ".", StringComparison.OrdinalIgnoreCase))
-            {
-                // Emulator!
-                return new StorageAccountHub(CloudStorageAccount.DevelopmentStorageAccount);
-            }
-
-            Func<StorageHub, StorageAccountHub> handler;
-            if (!_knownAccounts.TryGetValue(reference.AccountName, out handler))
-            {
-                return new StorageAccountHub(
-                    new CloudStorageAccount(
-                        new StorageCredentials(
-                            reference.AccountName, 
-                            reference.AccountKey),
-                        useHttps: true));
-            }
-            return handler(this);
-        }
-
-        public CloudBlobContainer GetContainer(AzureStorageReference reference)
-        {
-            var account = GetAccount(reference);
-            if (account == null)
-            {
-                return null;
-            }
-            return account.Blobs.Client.GetContainerReference(reference.Container);
-        }
-
         private static StorageAccountHub TryLoadAccount(ConfigurationHub configuration, KnownStorageAccount account)
         {
             var connectionString = configuration.Storage.GetAccount(account);

src/Services/Work/NuGet.Services.Work/Helpers/PackageHelpers.cs

@@ -11,9 +11,6 @@ namespace NuGet.Services.Work
 {
     public static class PackageHelpers
     {
-        public static readonly string PackageBlobContainer = "packages";
-        public static readonly string BackupsBlobContainer = "ng-backups";
-
         private const string PackageBlobNameFormat = "{0}.{1}.nupkg";
         private const string PackageBackupBlobNameFormat = "packages/{0}/{1}/{2}.nupkg";
 

src/Services/Work/NuGet.Services.Work/Helpers/ResourceHelpers.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NuGet.Services.Work.Helpers
+{
+    public static class ResourceHelpers
+    {
+        public static Task<string> ReadResourceFile(string name)
+        {
+            return ReadResourceFile(name, typeof(ResourceHelpers).Assembly);
+        }
+
+        public static async Task<string> ReadResourceFile(string name, Assembly asm)
+        {
+            using (var stream = asm.GetManifestResourceStream(name))
+            using (var reader = new StreamReader(stream))
+            {
+                return await reader.ReadToEndAsync();
+            }
+        }
+    }
+}

src/Services/Work/NuGet.Services.Work/Infrastructure/JobHandlerBase.cs

@@ -12,6 +12,7 @@
 using System.Data.SqlClient;
 using System.IO;
 using System.Threading;
+using Microsoft.WindowsAzure.Storage;
 
 namespace NuGet.Services.Work
 {
@@ -135,7 +136,7 @@ protected virtual void BindProperty(PropertyDescriptor prop, string value)
 
         private IList<TypeConverter> _converters = new List<TypeConverter>() {
             new SqlConnectionStringBuilderConverter(),
-            new AzureStorageAccountConverter()
+            new CloudStorageAccountConverter()
         };
 
         protected virtual object ConvertPropertyValue(PropertyDescriptor prop, string value)
@@ -171,31 +172,26 @@ public override object ConvertFrom(ITypeDescriptorContext context, System.Global
             }
         }
 
-        private class AzureStorageAccountConverter : TypeConverter
+        private class CloudStorageAccountConverter : TypeConverter
         {
             public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
             {
-                return sourceType == typeof(string) || sourceType == typeof(Uri);
+                return sourceType == typeof(string);
             }
 
             public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
             {
-                return destinationType == typeof(AzureStorageReference);
+                return destinationType == typeof(CloudStorageAccount);
             }
 
             public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
             {
-                Uri url = value as Uri;
-                if (url == null)
+                string strVal = value as string;
+                if (strVal == null)
                 {
-                    string strVal = value as string;
-                    if (strVal == null)
-                    {
-                        return null;
-                    }
-                    url = new Uri(strVal);
+                    return null;
                 }
-                return AzureStorageReference.Create(url);
+                return CloudStorageAccount.Parse(strVal);
             }
         }
     }

src/Services/Work/NuGet.Services.Work/Jobs/AggregateStatisticsJob.cs

@@ -120,7 +120,7 @@ COMMIT TRANSACTION
 ";
     }
 
-    [EventSource("Outercurve-NuGet-Jobs-AggregateStatistics")]
+    [EventSource(Name="Outercurve-NuGet-Jobs-AggregateStatistics")]
     public class AggregateStatisticsEventSource : EventSource 
     {
         public static readonly AggregateStatisticsEventSource Log = new AggregateStatisticsEventSource();