[ReleasePrep][2018.09.10]RI of dev into master

build.ps1

@@ -9,7 +9,7 @@ param (
     [string]$SemanticVersion = '1.0.0-zlocal',
     [string]$Branch,
     [string]$CommitSHA,
-    [string]$BuildBranch = '37ff6e758c38b3f513af39f881399ce85f4ff20b'
+    [string]$BuildBranch = '306fec22edac68336d7e32124d51248734c3a395'
 )
 
 # For TeamCity - If any issue occurs, this script fails the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail

src/Catalog/CatalogWriterBase.cs

@@ -96,7 +96,7 @@ public virtual async Task<IEnumerable<Uri>> Commit(DateTime commitTimeStamp, IGr
             return newItemEntries.Keys.Select(s => new Uri(s));
         }
 
-        async Task<IDictionary<string, CatalogItemSummary>> SaveItems(Guid commitId, DateTime commitTimeStamp, CancellationToken cancellationToken)
+        private async Task<IDictionary<string, CatalogItemSummary>> SaveItems(Guid commitId, DateTime commitTimeStamp, CancellationToken cancellationToken)
         {
             ConcurrentDictionary<string, CatalogItemSummary> pageItems = new ConcurrentDictionary<string, CatalogItemSummary>();
 
@@ -156,7 +156,7 @@ protected virtual ResourceSaveOperation CreateSaveOperationForItem(IStorage stor
 
             if (content != null)
             {
-                operation.SaveTask = storage.Save(resourceUri, content, cancellationToken);
+                operation.SaveTask = storage.SaveAsync(resourceUri, content, cancellationToken);
             }
 
             return operation;
@@ -320,27 +320,27 @@ protected async Task SaveIndexResource(Uri resourceUri, Uri typeUri, Guid commit
             return entries;
         }
 
-        async Task SaveGraph(Uri resourceUri, IGraph graph, Uri typeUri, CancellationToken cancellationToken)
+        private async Task SaveGraph(Uri resourceUri, IGraph graph, Uri typeUri, CancellationToken cancellationToken)
         {
             if (GraphPersistence != null)
             {
                 await GraphPersistence.SaveGraph(resourceUri, graph, typeUri, cancellationToken);
             }
             else
             {
-                await Storage.Save(resourceUri, CreateIndexContent(graph, typeUri), cancellationToken);
+                await Storage.SaveAsync(resourceUri, CreateIndexContent(graph, typeUri), cancellationToken);
             }
         }
 
-        async Task<IGraph> LoadGraph(Uri resourceUri, CancellationToken cancellationToken)
+        private async Task<IGraph> LoadGraph(Uri resourceUri, CancellationToken cancellationToken)
         {
             if (GraphPersistence != null)
             {
                 return await GraphPersistence.LoadGraph(resourceUri, cancellationToken);
             }
             else
             {
-                return Utils.CreateGraph(await Storage.LoadString(resourceUri, cancellationToken));
+                return Utils.CreateGraph(await Storage.LoadStringAsync(resourceUri, cancellationToken));
             }
         }
 
@@ -356,7 +356,7 @@ protected Uri CreatePageUri(Uri baseAddress, string relativeAddress)
             }
         }
 
-        void CheckScheme(Uri resourceUri, IGraph graph)
+        private void CheckScheme(Uri resourceUri, IGraph graph)
         {
             INode typePredicate = graph.CreateUriNode(Schema.Predicates.Type);
 
@@ -378,4 +378,4 @@ void CheckScheme(Uri resourceUri, IGraph graph)
             }
         }
     }
-}
+}

src/Catalog/CollectorBase.cs

@@ -27,21 +27,19 @@ public abstract class CollectorBase
             Index = index ?? throw new ArgumentNullException(nameof(index));
         }
 
-        public Uri Index { get; private set; }
+        public Uri Index { get; }
 
-        public int RequestCount { get; private set; }
-
-        public async Task<bool> Run(CancellationToken cancellationToken)
+        public async Task<bool> RunAsync(CancellationToken cancellationToken)
         {
-            return await Run(MemoryCursor.CreateMin(), MemoryCursor.CreateMax(), cancellationToken);
+            return await RunAsync(MemoryCursor.CreateMin(), MemoryCursor.CreateMax(), cancellationToken);
         }
 
-        public async Task<bool> Run(DateTime front, DateTime back, CancellationToken cancellationToken)
+        public async Task<bool> RunAsync(DateTime front, DateTime back, CancellationToken cancellationToken)
         {
-            return await Run(new MemoryCursor(front), new MemoryCursor(back), cancellationToken);
+            return await RunAsync(new MemoryCursor(front), new MemoryCursor(back), cancellationToken);
         }
 
-        public async Task<bool> Run(ReadWriteCursor front, ReadCursor back, CancellationToken cancellationToken)
+        public async Task<bool> RunAsync(ReadWriteCursor front, ReadCursor back, CancellationToken cancellationToken)
         {
             await Task.WhenAll(front.Load(cancellationToken), back.Load(cancellationToken));
 
@@ -63,13 +61,16 @@ public async Task<bool> Run(ReadWriteCursor front, ReadCursor back, Cancellation
                     client.Timeout = _httpClientTimeout.Value;
                 }
 
-                result = await Fetch(client, front, back, cancellationToken);
-                RequestCount = client.RequestCount;
+                result = await FetchAsync(client, front, back, cancellationToken);
             }
-            
+
             return result;
         }
 
-        protected abstract Task<bool> Fetch(CollectorHttpClient client, ReadWriteCursor front, ReadCursor back, CancellationToken cancellationToken);
+        protected abstract Task<bool> FetchAsync(
+            CollectorHttpClient client,
+            ReadWriteCursor front,
+            ReadCursor back,
+            CancellationToken cancellationToken);
     }
-}
+}

src/Catalog/CommitCollector.cs

@@ -23,7 +23,11 @@ public abstract class CommitCollector : CollectorBase
         {
         }
 
-        protected override async Task<bool> Fetch(CollectorHttpClient client, ReadWriteCursor front, ReadCursor back, CancellationToken cancellationToken)
+        protected override async Task<bool> FetchAsync(
+            CollectorHttpClient client,
+            ReadWriteCursor front,
+            ReadCursor back,
+            CancellationToken cancellationToken)
         {
             JObject root;
 
@@ -48,7 +52,7 @@ protected override async Task<bool> Fetch(CollectorHttpClient client, ReadWriteC
                 JToken context = null;
                 page.TryGetValue("@context", out context);
 
-                var batches = await CreateBatches(page["items"]
+                var batches = await CreateBatchesAsync(page["items"]
                     .Select(item => new CatalogItem(item))
                     .Where(item => item.CommitTimeStamp > front.Value && item.CommitTimeStamp <= back.Value));
 
@@ -76,7 +80,7 @@ protected override async Task<bool> Fetch(CollectorHttpClient client, ReadWriteC
                         { TelemetryConstants.BatchItemCount, batch.Items.Count.ToString() }
                     }))
                     {
-                        acceptNextBatch = await OnProcessBatch(
+                        acceptNextBatch = await OnProcessBatchAsync(
                             client,
                             batch.Items.Select(item => item.Value),
                             context,
@@ -112,7 +116,7 @@ protected override async Task<bool> Fetch(CollectorHttpClient client, ReadWriteC
             return acceptNextBatch;
         }
 
-        protected virtual Task<IEnumerable<CatalogItemBatch>> CreateBatches(IEnumerable<CatalogItem> catalogItems)
+        protected virtual Task<IEnumerable<CatalogItemBatch>> CreateBatchesAsync(IEnumerable<CatalogItem> catalogItems)
         {
             var batches = catalogItems
                 .GroupBy(item => item.CommitTimeStamp)
@@ -122,7 +126,13 @@ protected virtual Task<IEnumerable<CatalogItemBatch>> CreateBatches(IEnumerable<
             return Task.FromResult(batches);
         }
 
-        protected abstract Task<bool> OnProcessBatch(CollectorHttpClient client, IEnumerable<JToken> items, JToken context, DateTime commitTimeStamp, bool isLastBatch, CancellationToken cancellationToken);
+        protected abstract Task<bool> OnProcessBatchAsync(
+            CollectorHttpClient client,
+            IEnumerable<JToken> items,
+            JToken context,
+            DateTime commitTimeStamp,
+            bool isLastBatch,
+            CancellationToken cancellationToken);
 
         protected class CatalogItemBatch : IComparable
         {
@@ -133,8 +143,8 @@ public CatalogItemBatch(DateTime commitTimeStamp, IEnumerable<CatalogItem> items
                 Items.Sort();
             }
 
-            public DateTime CommitTimeStamp { get; private set; }
-            public List<CatalogItem> Items { get; private set; }
+            public DateTime CommitTimeStamp { get; }
+            public List<CatalogItem> Items { get; }
 
             public int CompareTo(object obj)
             {
@@ -151,9 +161,9 @@ public CatalogItem(JToken jtoken)
                 Value = jtoken;
             }
 
-            public DateTime CommitTimeStamp { get; private set; }
-            public Uri Uri { get; private set; }
-            public JToken Value { get; private set; }
+            public DateTime CommitTimeStamp { get; }
+            public Uri Uri { get; }
+            public JToken Value { get; }
 
             public int CompareTo(object obj)
             {