From eba08c09dea30887e1570d8aa8ca3d64b111309a Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Wed, 18 Nov 2020 20:44:04 +0100
Subject: [PATCH] Fix nullable warnings

---
 .../Services/Models/ActivityExecutionContext.cs             | 6 +++---
 .../Elsa.Abstractions/Triggers/ActivityBlueprintWrapper.cs  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs b/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs
index e2ceeab39..d659f24d2 100644
--- a/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs
+++ b/src/core/Elsa.Abstractions/Services/Models/ActivityExecutionContext.cs
@@ -41,7 +41,7 @@ namespace Elsa.Services.Models
         public object? GetVariable(string name) => WorkflowExecutionContext.GetVariable(name);
         public T GetVariable<T>(string name) => WorkflowExecutionContext.GetVariable<T>(name);
         public T GetVariable<T>() => GetVariable<T>(typeof(T).Name);
-        public T GetService<T>() => WorkflowExecutionContext.ServiceProvider.GetService<T>();
+        public T GetService<T>() where T : notnull => WorkflowExecutionContext.ServiceProvider.GetRequiredService<T>();
 
         public async ValueTask<IActivity> ActivateActivityAsync(CancellationToken cancellationToken = default)
         {
@@ -66,9 +66,9 @@ namespace Elsa.Services.Models
             return activity;
         }
 
-        public T GetInput<T>() => (T)Input!; 
+        public T GetInput<T>() => (T) Input!;
         public object? GetOutputFrom(string activityName) => WorkflowExecutionContext.GetOutputFrom(activityName);
-        public T GetOutputFrom<T>(string activityName) => (T)GetOutputFrom(activityName)!;
+        public T GetOutputFrom<T>(string activityName) => (T) GetOutputFrom(activityName)!;
         public void SetWorkflowContext(object? value) => WorkflowExecutionContext.SetWorkflowContext(value);
         public T GetWorkflowContext<T>() => WorkflowExecutionContext.GetWorkflowContext<T>();
     }
diff --git a/src/core/Elsa.Abstractions/Triggers/ActivityBlueprintWrapper.cs b/src/core/Elsa.Abstractions/Triggers/ActivityBlueprintWrapper.cs
index 907bdcab4..8edf448e2 100644
--- a/src/core/Elsa.Abstractions/Triggers/ActivityBlueprintWrapper.cs
+++ b/src/core/Elsa.Abstractions/Triggers/ActivityBlueprintWrapper.cs
@@ -23,7 +23,7 @@ namespace Elsa.Triggers
             return await workflowBlueprint.GetActivityPropertyValue(activityId, propertyExpression, _activityExecutionContext, cancellationToken);
         }
         
-        public T GetState<T>(Expression<Func<TActivity, T>> propertyExpression)
+        public T? GetState<T>(Expression<Func<TActivity, T>> propertyExpression)
         {
             var workflowBlueprint = _activityExecutionContext.WorkflowExecutionContext.WorkflowBlueprint;
             return workflowBlueprint.GetActivityState(propertyExpression, _activityExecutionContext);