Code cleanup

Author: Jon Nicholson

Code/Sif3Framework/Sif.Framework/Model/Settings/ConfigFileBasedFrameworkSettings.cs

@@ -383,31 +383,5 @@ public int JobTimeoutFrequency
         {
             get { return GetIntegerSetting(SettingsPrefix + ".job.timeout.frequency", 60); }
         }
-
-        /*
-        /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.EventsSupported"/>
-        /// </summary>
-        public bool EventsSupported
-        {
-            get { return GetBooleanSetting(SettingsPrefix + ".events.supported", false); }
-        }
-
-        /// <summary>
-        /// Frequency of events if it exists; 60 otherwise.
-        /// </summary>
-        public int EventsFrequency
-        {
-            get { return GetIntegerSetting(SettingsPrefix + ".events.frequency", 60); }
-        }
-
-        /// <summary>
-        /// Number of objects in an event if it exists; 60 otherwise.
-        /// </summary>
-        public int MaxObjectsInEvent
-        {
-            get { return GetIntegerSetting(SettingsPrefix + ".events.maxobjects", 10); }
-        }
-        */
     }
 }

Code/Sif3Framework/Sif.Framework/Model/Settings/IFrameworkSettings.cs

@@ -49,7 +49,7 @@ public interface IFrameworkSettings
         /// Data model namespace if it exists; null otherwise.
         /// </summary>
         string InfrastructureNamespace { get; }
-        
+
         /// <summary>
         /// Delete on unregister flag if it exists; false otherwise.
         /// </summary>
@@ -119,23 +119,5 @@ public interface IFrameworkSettings
         /// How often to check for timedout jobs in seconds. Default 60.
         /// </summary>
         int JobTimeoutFrequency { get; }
-
-        /*
-        /// <summary>
-        /// Intention to support events flag if it exists; false otherwise.
-        /// </summary>
-        bool EventsSupported { get; }
-
-        /// <summary>
-        /// Frequency of events if it exists; 60 otherwise.
-        /// </summary>
-        int EventsFrequency { get; }
-
-        /// <summary>
-        /// Number of objects in an event if it exists; 60 otherwise.
-        /// </summary>
-        int MaxObjectsInEvent { get; }
-        */
     }
-
 }

Code/Sif3Framework/Sif.Framework/Utils/ProviderUtils.cs

@@ -7,12 +7,8 @@
 using Sif.Framework.Service.Functional;
 using Sif.Specification.Infrastructure;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web.Http.Controllers;
 
 namespace Sif.Framework.Utils
@@ -61,12 +57,7 @@ public static Boolean isFunctionalService(Type type)
                 && type.IsVisible
                 && !type.IsAbstract
                 && typeof(IFunctionalService).IsAssignableFrom(type);
-            /*
-            if(isFService)
-            {
-                log.Debug("Found functional service: " + type.Name);
-            }
-            */
+
             return isFService;
         }
 
@@ -108,24 +99,7 @@ public static Boolean isController(Type type)
                 typeof(FunctionalServiceProvider).IsAssignableFrom(type)) &&
                 typeof(IHttpController).IsAssignableFrom(type) &&
                 type.Name.EndsWith("Provider");
-            /*
-            if (type.Name.Contains("FunctionalServiceProvider"))
-            {
-                log.Debug(type.Name + " (" + iscontroller + ")");
-                log.Debug("isClass: " + type.IsClass);
-                log.Debug("isVisible: " + type.IsVisible);
-                log.Debug("isNotAbstract: " + !type.IsAbstract);
-                log.Debug("isAssignable(IProvider): " + type.IsAssignableToGenericType(typeof(IProvider<,,>)));
-                log.Debug("isAssignable(SifController): " + type.IsAssignableToGenericType(typeof(SifController<,>)));
-                log.Debug("isAssignable(FSProvider): " + typeof(FunctionalServiceProvider).IsAssignableFrom(type));
-                log.Debug("isAssignable: " + (type.IsAssignableToGenericType(typeof(IProvider<,,>)) ||
-                type.IsAssignableToGenericType(typeof(SifController<,>)) ||
-                typeof(FunctionalServiceProvider).IsAssignableFrom(type)));
-                log.Debug("Is an IHttpController: " + typeof(IHttpController).IsAssignableFrom(type));
-                log.Debug("Name ends with 'Provider': " + type.Name.EndsWith("Provider"));
-
-            }
-            */
+            
             return iscontroller;
         }
 

Code/Sif3Framework/Sif.Framework/Utils/RightsUtils.cs

@@ -16,11 +16,7 @@
 
 using Sif.Framework.Model.Exceptions;
 using Sif.Framework.Model.Infrastructure;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sif.Framework.Utils
 {

Code/Sif3Framework/Sif.Framework/Utils/ZoneUtils.cs

@@ -1,4 +1,20 @@
-using Sif.Framework.Model.Infrastructure;
+/*
+ * Crown Copyright © Department for Education (UK) 2016
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Sif.Framework.Model.Infrastructure;
 using System.Linq;
 
 namespace Sif.Framework.Utils