WatchStaticMappingsInSubdirectories (#374)

* WatchStaticMappingsInSubdirectories

* 37

* IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);

* reloadStaticMappings

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -47,6 +47,7 @@ namespace WireMock.Net.StandAlone
                 StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
                 ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
                 WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
+                WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
                 AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping"),
                 AdminUsername = parser.GetStringValue("AdminUsername"),
                 AdminPassword = parser.GetStringValue("AdminPassword"),

src/WireMock.Net/Client/IFluentMockServerAdmin.cs

@@ -75,8 +75,9 @@ namespace WireMock.Client
         /// <summary>
         /// Delete (reset) all mappings.
         /// </summary>
+        /// <param name="reloadStaticMappings">A value indicating whether to reload the static mappings after the reset.</param>
         [Post("__admin/mappings/reset")]
-        Task<StatusModel> ResetMappingsAsync();
+        Task<StatusModel> ResetMappingsAsync(bool? reloadStaticMappings = false);
 
         /// <summary>
         /// Get a mapping based on the guid

src/WireMock.Net/Handlers/IFileSystemHandler.cs

@@ -31,8 +31,9 @@ namespace WireMock.Handlers
         ///  Returns an enumerable collection of file names in a specified path.
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory specified by path.</returns>
-        IEnumerable<string> EnumerateFiles([NotNull] string path);
+        /// <param name="includeSubdirectories">A value indicating whether subdirectories should also included when enumerating files.</param>
+        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory (and optionally subdirectories) specified by path.</returns>
+        IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);
 
         /// <summary>
         /// Read a static mapping file as text.

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -46,11 +46,11 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public IEnumerable<string> EnumerateFiles(string path)
+        public IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
         {
             Check.NotNullOrEmpty(path, nameof(path));
 
-            return Directory.EnumerateFiles(path);
+            return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
         }
 
         /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -39,6 +39,7 @@ namespace WireMock.Server
         private const string AdminRequests = "/__admin/requests";
         private const string AdminSettings = "/__admin/settings";
         private const string AdminScenarios = "/__admin/scenarios";
+        private const string QueryParamReloadStaticMappings = "reloadStaticMappings";
 
         private readonly RegexMatcher _adminRequestContentTypeJson = new ContentTypeMatcher(ContentTypeJson, true);
         private readonly RegexMatcher _adminMappingsGuidPathMatcher = new RegexMatcher(@"^\/__admin\/mappings\/([0-9A-Fa-f]{8}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{12})$");
@@ -69,7 +70,7 @@ namespace WireMock.Server
             Given(Request.Create().WithPath(AdminMappings).UsingDelete()).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsDelete));
 
             // __admin/mappings/reset
-            Given(Request.Create().WithPath(AdminMappings + "/reset").UsingPost()).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsDelete));
+            Given(Request.Create().WithPath(AdminMappings + "/reset").UsingPost()).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsReset));
 
             // __admin/mappings/{guid}
             Given(Request.Create().WithPath(_adminMappingsGuidPathMatcher).UsingGet()).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingGet));
@@ -141,7 +142,7 @@ namespace WireMock.Server
                 return;
             }
 
-            foreach (string filename in _settings.FileSystemHandler.EnumerateFiles(folder).OrderBy(f => f))
+            foreach (string filename in _settings.FileSystemHandler.EnumerateFiles(folder, _settings.WatchStaticMappingsInSubdirectories == true).OrderBy(f => f))
             {
                 _settings.Logger.Info("Reading Static MappingFile : '{0}'", filename);
 
@@ -173,9 +174,14 @@ namespace WireMock.Server
                 return;
             }
 
-            _settings.Logger.Info("Watching folder '{0}' for new, updated and deleted MappingFiles.", folder);
+            bool includeSubdirectories = _settings.WatchStaticMappingsInSubdirectories == true;
+            string includeSubdirectoriesText = includeSubdirectories ? " and Subdirectories" : string.Empty;
+
+            _settings.Logger.Info($"Watching folder '{folder}'{includeSubdirectoriesText} for new, updated and deleted MappingFiles.");
 
             var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs);
+            watcher.IncludeSubdirectories = includeSubdirectories;
+
             watcher.Created += (sender, args) =>
             {
                 _settings.Logger.Info("MappingFile created : '{0}', reading file.", args.FullPath);
@@ -551,6 +557,24 @@ namespace WireMock.Server
 
             return ResponseMessageBuilder.Create("Mappings deleted");
         }
+
+        private ResponseMessage MappingsReset(RequestMessage requestMessage)
+        {
+            ResetMappings();
+
+            ResetScenarios();
+
+            string message = "Mappings reset";
+            if (requestMessage.Query.ContainsKey(QueryParamReloadStaticMappings) &&
+                bool.TryParse(requestMessage.Query[QueryParamReloadStaticMappings].ToString(), out bool reloadStaticMappings)
+                && reloadStaticMappings)
+            {
+                ReadStaticMappings();
+                message = $"{message} and static mappings reloaded";
+            }
+
+            return ResponseMessageBuilder.Create(message);
+        }
         #endregion Mappings
 
         #region Request/{guid}

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -33,6 +33,10 @@ namespace WireMock.Settings
         [PublicAPI]
         public bool? WatchStaticMappings { get; set; }
 
+        /// <inheritdoc cref="IFluentMockServerSettings.WatchStaticMappingsInSubdirectories"/>
+        [PublicAPI]
+        public bool? WatchStaticMappingsInSubdirectories { get; set; }
+
         /// <inheritdoc cref="IFluentMockServerSettings.ProxyAndRecordSettings"/>
         [PublicAPI]
         public IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -42,6 +42,12 @@ namespace WireMock.Settings
         [PublicAPI]
         bool? WatchStaticMappings { get; set; }
 
+        /// <summary>
+        /// A value indicating whether subdirectories within the static mappings path should be monitored.
+        /// </summary>
+        [PublicAPI]
+        bool? WatchStaticMappingsInSubdirectories { get; set; }
+
         /// <summary>
         /// Gets or sets if the proxy and record settings.
         /// </summary>