upgrade: Changes resulting from upgrade to Vonk 3.0.0-beta1

Vonk.Plugin.ExampleOperation.Tests/VonkTestContext.cs

@@ -54,7 +54,7 @@ public class VonkTestResponse : IVonkResponse
         public Dictionary<VonkResultHeader, string> Headers { get; set; } = new Dictionary<VonkResultHeader, string>();
 
         public int HttpResult { get; set; }
-        public OperationOutcome Outcome { get; set; } = new OperationOutcome();
+        public VonkOutcome Outcome { get; set; } = new VonkOutcome();
         public IResource Payload { get; set; }
     }
 }

Vonk.Plugin.ExampleOperation/Vonk.Plugin.ExampleOperation.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Vonk.Core" Version="2.1.0" />
-    <PackageReference Include="Vonk.Fhir.R3" Version="2.1.0" />
+    <PackageReference Include="Vonk.Core" Version="3.0.0-beta1" />
+    <PackageReference Include="Vonk.Fhir.R3" Version="3.0.0-beta1" />
   </ItemGroup>
 
 </Project>

Vonk.Plugin.ExampleOperation/VonkPluginConfiguration.cs

@@ -1,8 +1,9 @@
-using System;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Vonk.Core.Common;
 using Vonk.Core.Context;
+using Vonk.Core.Metadata;
 using Vonk.Core.Pluggability;
 using Vonk.Core.Support;
 
@@ -18,22 +19,22 @@ Make sure to register services that you depend upon as well.
         public static IServiceCollection ConfigureServices(IServiceCollection services)
         {
             services.TryAddScoped<VonkPluginService>(); // Add the service implementation
-            services.AddIfNotExists<IConformanceContributor, VonkPluginConformanceContributor>(ServiceLifetime.Transient); // Add operation to Vonk's CapabilityStatement
+            services.AddIfNotExists<ICapabilityStatementContributor, VonkPluginConformanceContributor>(ServiceLifetime.Transient); // Add operation to Vonk's CapabilityStatement
             return services;
         }
 
         // Add middleware to the pipeline being built with the builder
         public static IApplicationBuilder Configure(IApplicationBuilder builder)
         {
             // Register Pre-Handler
-            builder.OnCustomInteraction(VonkInteraction.all_custom, "test").PreHandleAsyncWith<VonkPluginService>((svc, context) => svc.PrepareTest(context));
+            builder.OnCustomInteraction(VonkInteraction.all_custom, "test").AndInformationModel(VonkConstants.Model.FhirR3).PreHandleAsyncWith<VonkPluginService>((svc, context) => svc.PrepareTest(context));
 
             // Register Post-Handler, needs to be registered before the custom operation itself
-            builder.OnCustomInteraction(VonkInteraction.all_custom, "test").PostHandleAsyncWith<VonkPluginService>((svc, context) => svc.PostHandlerTest(context));
+            builder.OnCustomInteraction(VonkInteraction.all_custom, "test").AndInformationModel(VonkConstants.Model.FhirR3).PostHandleAsyncWith<VonkPluginService>((svc, context) => svc.PostHandlerTest(context));
 
             // Register interactions (Don't add a "$" sign to the name of the custom operation, it will be added by default)
-            builder.OnCustomInteraction(VonkInteraction.instance_custom, "test").AndMethod("GET").HandleAsyncWith<VonkPluginService>((svc, context) => svc.Test(context));
-            builder.OnCustomInteraction(VonkInteraction.type_custom, "test").AndMethod("POST").HandleAsyncWith<VonkPluginService>((svc, context) => svc.Test(context));
+            builder.OnCustomInteraction(VonkInteraction.instance_custom, "test").AndInformationModel(VonkConstants.Model.FhirR3).AndMethod("GET").HandleAsyncWith<VonkPluginService>((svc, context) => svc.Test(context));
+            builder.OnCustomInteraction(VonkInteraction.type_custom, "test").AndInformationModel(VonkConstants.Model.FhirR3).AndMethod("POST").HandleAsyncWith<VonkPluginService>((svc, context) => svc.Test(context));
             return builder;
         }
     }

Vonk.Plugin.ExampleOperation/VonkPluginConformanceContributor.cs

@@ -1,12 +1,15 @@
-using System;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
+using Vonk.Core.Common;
 using Vonk.Core.Context;
-using Vonk.Core.Pluggability;
+using Vonk.Core.Metadata;
+using Vonk.Core.Model.Capability;
+using Vonk.Core.Pluggability.ContextAware;
 using Vonk.Core.Support;
 
 namespace Vonk.Plugin.ExampleOperation
 {
-    internal class VonkPluginConformanceContributor : IConformanceContributor
+    [ContextAware(InformationModels = new[] { VonkConstants.Model.FhirR3 })]
+    internal class VonkPluginConformanceContributor : ICapabilityStatementContributor
     {
         private const string _operationName = "test";
         private readonly SupportedInteractionOptions _supportedInteractionOptions;
@@ -19,7 +22,7 @@ public VonkPluginConformanceContributor(IOptions<SupportedInteractionOptions> op
 
         // Make the $test operation appear in the CapabilityStatement, if it is declared as supported in the SupportedOperationsOptions 
         // See http://docs.simplifier.net/vonk/configuration/appsettings.html - Enable or disable interactions
-        public void Conformance(IConformanceBuilder builder)
+        public void ContributeToCapabilityStatement(ICapabilityStatementBuilder builder)
         {
             Check.NotNull(builder, nameof(builder));
             if (_supportedInteractionOptions.SupportsCustomOperation(_operationName))