associating schemas with their respective resources

Author: thefringeninja

src/SqlStreamStore.HAL/ResourceMethods.cs

@@ -3,6 +3,7 @@
     using System.Linq;
     using System.Net.Http;
     using System.Reflection;
+    using System.Threading.Tasks;
 
     internal static class ResourceMethods
     {
@@ -11,7 +12,8 @@ public static HttpMethod[] Discover<TResource>()
         {
             var httpMethods = typeof(TResource)
                 .GetMethods(
-                    (BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
+                    BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)
+                .Where(method => method.ReturnType == typeof(Response) || method.ReturnType == typeof(Task<Response>))
                 .Select(method => new HttpMethod(method.Name.ToUpperInvariant()))
                 .Concat(new[] { HttpMethod.Options })
                 .ToList();

…/SqlStreamStore.HAL/Resources/Schemas.cs src/SqlStreamStore.HAL/Schema.cssrc/SqlStreamStore.HAL/Resources/Schemas.cs renamed to src/SqlStreamStore.HAL/Schema.cs src/SqlStreamStore.HAL/Resources/Schemas.cs renamed to src/SqlStreamStore.HAL/Schema.cs

@@ -1,4 +1,4 @@
-namespace SqlStreamStore.HAL.Resources
+namespace SqlStreamStore.HAL
 {
     using System;
     using System.Collections.Concurrent;
@@ -8,23 +8,18 @@
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
-    internal static class Schemas
+    internal class SchemaSet<TResource> where TResource : IResource
     {
         private static readonly ConcurrentDictionary<string, HALResponse> s_schemas
             = new ConcurrentDictionary<string, HALResponse>();
 
-        public static HALResponse AppendToStream => GetSchema(nameof(AppendToStream));
-        public static HALResponse SetStreamMetadata => GetSchema(nameof(SetStreamMetadata));
-        public static HALResponse DeleteStream => GetSchema(nameof(DeleteStream));
-        public static HALResponse DeleteStreamMessage => GetSchema(nameof(DeleteStreamMessage));
-
-        private static HALResponse GetSchema(string name) => s_schemas.GetOrAdd(name, ReadSchema);
+        public HALResponse GetSchema(string name) => s_schemas.GetOrAdd(name, ReadSchema);
 
         private static HALResponse ReadSchema(string name)
         {
-            using(Stream stream = typeof(Schemas)
+            using(Stream stream = typeof(TResource)
                 .GetTypeInfo().Assembly
-                .GetManifestResourceStream(typeof(Schemas), $"Schema.{name}.json"))
+                .GetManifestResourceStream(typeof(TResource), $"Schema.{name}.json"))
             {
                 if(stream == null)
                 {

src/SqlStreamStore.HAL/SqlStreamStore.HAL.csproj

@@ -17,6 +17,8 @@
     <PackageReference Include="SqlStreamStore" Version="1.2.0-*" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Schema\*.json" />
+    <EmbeddedResource Include="**\Schema\*.json">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>

…esources/Schema/DeleteStreamMessage.json …mMessage/Schema/DeleteStreamMessage.jsonsrc/SqlStreamStore.HAL/Resources/Schema/DeleteStreamMessage.json renamed to src/SqlStreamStore.HAL/StreamMessage/Schema/DeleteStreamMessage.json src/SqlStreamStore.HAL/Resources/Schema/DeleteStreamMessage.json renamed to src/SqlStreamStore.HAL/StreamMessage/Schema/DeleteStreamMessage.json

@@ -4,12 +4,12 @@ namespace SqlStreamStore.HAL.StreamMessage
     using System.Threading;
     using System.Threading.Tasks;
     using Halcyon.HAL;
-    using SqlStreamStore.HAL.Resources;
     using SqlStreamStore.Streams;
 
     internal class StreamMessageResource : IResource
     {
         private readonly IStreamStore _streamStore;
+        private readonly SchemaSet<StreamMessageResource> _schema = new SchemaSet<StreamMessageResource>();
 
         public StreamMessageResource(IStreamStore streamStore)
         {
@@ -18,6 +18,8 @@ public StreamMessageResource(IStreamStore streamStore)
             _streamStore = streamStore;
         }
 
+        private HALResponse DeleteStreamMessage => _schema.GetSchema(nameof(DeleteStreamMessage));
+
         public async Task<Response> Get(
             ReadStreamMessageByStreamVersionOperation operation,
             CancellationToken cancellationToken)
@@ -71,7 +73,7 @@ public async Task<Response> Get(
                     })
                     .AddEmbeddedResource(
                         Constants.Relations.Delete,
-                        Schemas.DeleteStreamMessage)
+                        DeleteStreamMessage)
                     .AddLinks(links))
             {
                 Headers =

src/SqlStreamStore.HAL/StreamMessage/StreamMessageResource.cs

@@ -4,19 +4,22 @@ namespace SqlStreamStore.HAL.StreamMetadata
     using System.Threading;
     using System.Threading.Tasks;
     using Halcyon.HAL;
-    using SqlStreamStore.HAL.Resources;
 
     internal class StreamMetadataResource : IResource
     {
         private readonly IStreamStore _streamStore;
+        private readonly SchemaSet<StreamMetadataResource> _schema;
 
         public StreamMetadataResource(IStreamStore streamStore)
         {
             if(streamStore == null)
                 throw new ArgumentNullException(nameof(streamStore));
             _streamStore = streamStore;
+            _schema = new SchemaSet<StreamMetadataResource>();
         }
 
+        private HALResponse SetStreamMetadata => _schema.GetSchema(nameof(SetStreamMetadata));
+
         public async Task<Response> Get(
             GetStreamMetadataOperation operation,
             CancellationToken cancellationToken)
@@ -39,7 +42,7 @@ public async Task<Response> Get(
                             .MetadataNavigation(operation))
                     .AddEmbeddedResource(
                         Constants.Relations.Metadata,
-                        Schemas.SetStreamMetadata),
+                        SetStreamMetadata),
                 result.MetadataStreamVersion >= 0 ? 200 : 404)
             {
                 Headers =

…/Resources/Schema/SetStreamMetadata.json …amMetadata/Schema/SetStreamMetadata.jsonsrc/SqlStreamStore.HAL/Resources/Schema/SetStreamMetadata.json renamed to src/SqlStreamStore.HAL/StreamMetadata/Schema/SetStreamMetadata.json src/SqlStreamStore.HAL/Resources/Schema/SetStreamMetadata.json renamed to src/SqlStreamStore.HAL/StreamMetadata/Schema/SetStreamMetadata.json

@@ -12,15 +12,20 @@ internal class StreamResource : IResource
     {
         private readonly IStreamStore _streamStore;
         private readonly string _relativePathToRoot;
+        private readonly SchemaSet<StreamResource> _schema;
 
         public StreamResource(IStreamStore streamStore)
         {
             if(streamStore == null)
                 throw new ArgumentNullException(nameof(streamStore));
             _streamStore = streamStore;
             _relativePathToRoot = "../";
+            _schema = new SchemaSet<StreamResource>();
         }
 
+        private HALResponse AppendToStream => _schema.GetSchema(nameof(AppendToStream));
+        private HALResponse DeleteStream => _schema.GetSchema(nameof(DeleteStream));
+
         public async Task<Response> Post(
             AppendStreamOperation operation,
             CancellationToken cancellationToken)
@@ -81,10 +86,10 @@ public async Task<Response> Get(ReadStreamOperation operation, CancellationToken
                         .StreamsNavigation(page, operation))
                     .AddEmbeddedResource(
                         Constants.Relations.AppendToStream,
-                        Schemas.AppendToStream)
+                        AppendToStream)
                     .AddEmbeddedResource(
                         Constants.Relations.Delete,
-                        Schemas.DeleteStream)
+                        DeleteStream)
                     .AddEmbeddedCollection(
                         Constants.Relations.Message,
                         streamMessages.Zip(