From 6050c99c239799dd1cedca456898fdaa223c9100 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Sat, 19 Jun 2021 11:41:02 +0200
Subject: [PATCH] Resolve warnings

---
 .../Elsa.Activities.Http/Bookmarks/HttpEndpointBookmark.cs | 2 +-
 .../Builders/ICompositeActivityBuilder.cs                  | 7 -------
 src/core/Elsa.Abstractions/Models/WorkflowInstance.cs      | 2 +-
 .../Services/Models/ActivityExecutionContext.cs            | 4 ++--
 .../Services/Models/WorkflowExecutionContext.cs            | 6 +++---
 src/core/Elsa.Abstractions/Services/Workflows/Activity.cs  | 2 +-
 src/core/Elsa.Abstractions/Services/Workflows/IActivity.cs | 2 +-
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/activities/Elsa.Activities.Http/Bookmarks/HttpEndpointBookmark.cs b/src/activities/Elsa.Activities.Http/Bookmarks/HttpEndpointBookmark.cs
index 1063ff403..447d80849 100644
--- a/src/activities/Elsa.Activities.Http/Bookmarks/HttpEndpointBookmark.cs
+++ b/src/activities/Elsa.Activities.Http/Bookmarks/HttpEndpointBookmark.cs
@@ -22,6 +22,6 @@ namespace Elsa.Activities.Http.Bookmarks
             return methods.Select(CreateBookmark);
         }
 
-        private static string? ToLower(string? s) => s?.ToLowerInvariant();
+        private static string ToLower(string s) => s.ToLowerInvariant();
     }
 }
\ No newline at end of file
diff --git a/src/core/Elsa.Abstractions/Builders/ICompositeActivityBuilder.cs b/src/core/Elsa.Abstractions/Builders/ICompositeActivityBuilder.cs
index effd47d0f..75fab5e28 100644
--- a/src/core/Elsa.Abstractions/Builders/ICompositeActivityBuilder.cs
+++ b/src/core/Elsa.Abstractions/Builders/ICompositeActivityBuilder.cs
@@ -34,13 +34,6 @@ namespace Elsa.Builders
 
         IActivityBuilder StartWith<T>(string activityTypeName, Action<IActivityBuilder>? branch = default, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) where T : class, IActivity;
 
-        IActivityBuilder Add<T>(
-            string activityTypeName, 
-            Action<ISetupActivity<T>>? setup,
-            Action<IActivityBuilder>? branch = default,
-            [CallerLineNumber] int lineNumber = default,
-            [CallerFilePath] string? sourceFile = default) where T : class, IActivity;
-
         IActivityBuilder Add<T>(
             string activityTypeName, 
             Action<IActivityBuilder>? branch = default,
diff --git a/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs b/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs
index e94f5757b..6372847f2 100644
--- a/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs
+++ b/src/core/Elsa.Abstractions/Models/WorkflowInstance.cs
@@ -31,7 +31,7 @@ namespace Elsa.Models
         public Instant? FaultedAt { get; set; }
         public Variables Variables { get; set; }
         public WorkflowOutputReference? Output { get; set; }
-        public IDictionary<string, IDictionary<string, object>> ActivityData { get; set; } = new Dictionary<string, IDictionary<string, object>>();
+        public IDictionary<string, IDictionary<string, object?>> ActivityData { get; set; } = new Dictionary<string, IDictionary<string, object?>>();
 
         public HashSet<BlockingActivity> BlockingActivities
         {
diff --git a/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs b/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs
index 00f5b05b2..f65dc4429 100644
--- a/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs
+++ b/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs
@@ -179,8 +179,8 @@ namespace Elsa.Services.Models
         public void SetWorkflowContext(object? value) => WorkflowExecutionContext.SetWorkflowContext(value);
         public object? GetWorkflowContext() => WorkflowExecutionContext.GetWorkflowContext();
         public T GetWorkflowContext<T>() => WorkflowExecutionContext.GetWorkflowContext<T>();
-        public IDictionary<string, object> GetActivityData() => GetActivityData(ActivityId);
-        public IDictionary<string, object> GetActivityData(string activityId) => WorkflowExecutionContext.GetActivityData(activityId);
+        public IDictionary<string, object?> GetActivityData() => GetActivityData(ActivityId);
+        public IDictionary<string, object?> GetActivityData(string activityId) => WorkflowExecutionContext.GetActivityData(activityId);
         public Task<T?> GetActivityPropertyAsync<TActivity, T>(Expression<Func<TActivity, T>> propertyExpression, CancellationToken cancellationToken = default) where TActivity : IActivity => WorkflowExecutionContext.GetActivityPropertyAsync<TActivity, T>(ActivityId, propertyExpression, cancellationToken);
         public void Fault(Exception exception) => WorkflowExecutionContext.Fault(exception, ActivityId, Input, Resuming);
     }
diff --git a/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs b/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs
index 9e8827ad6..371c3da29 100644
--- a/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs
+++ b/src/core/Elsa.Abstractions/Services/Models/WorkflowExecutionContext.cs
@@ -66,7 +66,7 @@ namespace Elsa.Services.Models
         public ScheduledActivity PopScheduledActivity() => WorkflowInstance.ScheduledActivities.Pop();
         public ScheduledActivity PeekScheduledActivity() => WorkflowInstance.ScheduledActivities.Peek();
 
-        public string? CorrelationId
+        public string CorrelationId
         {
             get => WorkflowInstance.CorrelationId;
             set => WorkflowInstance.CorrelationId = value;
@@ -240,7 +240,7 @@ namespace Elsa.Services.Models
         public object? GetWorkflowContext() => WorkflowContext;
         public T GetWorkflowContext<T>() => (T) WorkflowContext!;
         
-        public IDictionary<string, object> GetActivityData(string activityId)
+        public IDictionary<string, object?> GetActivityData(string activityId)
         {
             var activityData = WorkflowInstance.ActivityData;
             var state = activityData.ContainsKey(activityId) ? activityData[activityId] : default;
@@ -248,7 +248,7 @@ namespace Elsa.Services.Models
             if (state != null) 
                 return state;
             
-            state = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            state = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
             activityData[activityId] = state;
 
             return state;
diff --git a/src/core/Elsa.Abstractions/Services/Workflows/Activity.cs b/src/core/Elsa.Abstractions/Services/Workflows/Activity.cs
index f55040d90..2173b823f 100644
--- a/src/core/Elsa.Abstractions/Services/Workflows/Activity.cs
+++ b/src/core/Elsa.Abstractions/Services/Workflows/Activity.cs
@@ -51,7 +51,7 @@ namespace Elsa.Services
         protected virtual RegisterTaskResult RegisterTask(Func<WorkflowExecutionContext, CancellationToken, ValueTask> task) => new(task);
 
         protected virtual T? GetState<T>([CallerMemberName] string name = null!) => Data.GetState<T>(name);
-        protected virtual T GetState<T>(Func<T> defaultValue, [CallerMemberName] string name = null!) => Data.GetState(name, defaultValue);
+        protected virtual T? GetState<T>(Func<T> defaultValue, [CallerMemberName] string name = null!) => Data.GetState(name, defaultValue);
         protected virtual void SetState(object? value, [CallerMemberName] string name = null!) => Data.SetState(name, value);
     }
 }
\ No newline at end of file
diff --git a/src/core/Elsa.Abstractions/Services/Workflows/IActivity.cs b/src/core/Elsa.Abstractions/Services/Workflows/IActivity.cs
index 77ba9424f..ecb8d1093 100644
--- a/src/core/Elsa.Abstractions/Services/Workflows/IActivity.cs
+++ b/src/core/Elsa.Abstractions/Services/Workflows/IActivity.cs
@@ -50,7 +50,7 @@ namespace Elsa.Services
         /// <summary>
         /// A data store for the activity to store information that needs to be persisted as part of the workflow instance.
         /// </summary>
-        IDictionary<string, object> Data { get; set; }
+        IDictionary<string, object?> Data { get; set; }
 
         /// <summary>
         /// Returns a value of whether the specified activity can execute.