IConfigurationSectionHandler is deprecated, a section handler should inherit from ConfigurationSection and implement the hiearchy via collections and elements

Author: obones

project/UnitTests/Core/Config/XslFilesSectionHandlerTest.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Configuration;
 using NUnit.Framework;
+using ThoughtWorks.CruiseControl.Core.Config;
 
 namespace ThoughtWorks.CruiseControl.UnitTests.Core.Config
 {
@@ -10,8 +11,10 @@ public class XslFilesSectionHandlerTest : CustomAssertion
         [Test]
         public void GetConfig()
         {
-            IList list = (IList) ConfigurationManager.GetSection("xslFiles");
-            Assert.IsNotNull(list);
+            var section = ConfigurationManager.GetSection("xslFiles") as XslFilesSectionHandler;
+            Assert.IsNotNull(section, "section should not be null");
+            IList list = section.FileNames;
+            Assert.IsNotNull(list, "file names list should not be null");
             Assert.AreEqual(5, list.Count);
             Assert.AreEqual(@"xsl\header.xsl", list[0]);
             Assert.AreEqual(@"xsl\compile.xsl", list[1]);

project/core/Config/XslFilesSectionHandler.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Xml;
 
@@ -7,29 +9,78 @@ namespace ThoughtWorks.CruiseControl.Core.Config
     /// <summary>
     /// 	
     /// </summary>
-	public class XslFilesSectionHandler : IConfigurationSectionHandler
+	public class XslFilesSectionHandler : ConfigurationSection
 	{
-        /// <summary>
-        /// Creates the specified parent.	
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        /// <param name="configContext">The config context.</param>
-        /// <param name="section">The section.</param>
-        /// <returns></returns>
-        /// <remarks></remarks>
-		public object Create(object parent, object configContext, XmlNode section)
-		{
-			ArrayList files = new ArrayList();
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        [ConfigurationCollection(typeof(XslFilesCollection), AddItemName = "file")]
+        public XslFilesCollection XslFiles
+        {
+            get
+            {
+                return  (XslFilesCollection)base[""];
+            }
+        }
+        
+        public List<string> FileNames 
+        {
+            get
+            {
+                var result = new List<string>();
+    			foreach (var file in XslFiles) 
+            		result.Add(((XslFileElement)file).Name);
+                    
+                return result;
+            }
+        }
+	}
 
-			foreach (XmlNode node in section.ChildNodes) 
-			{
-				if (node.NodeType == System.Xml.XmlNodeType.Element) 
-				{
-					files.Add(node.Attributes["name"].Value);
-				}
-			}
+    public class XslFilesCollection : ConfigurationElementCollection
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new XslFileElement();
+        }
+    
+        protected override Object GetElementKey(ConfigurationElement element)
+        {
+            return ((XslFileElement)element).Name;
+        }
+    
+        public XslFileElement this[int index]
+        {
+            get
+            {
+                return (XslFileElement)BaseGet(index);
+            }
+            set
+            {
+                if (BaseGet(index) != null)
+                    BaseRemoveAt(index);
 
-			return files;
-		}
-	}
+                BaseAdd(index, value);
+            }
+        }
+
+        protected override void BaseAdd(ConfigurationElement element)
+        {
+            BaseAdd(element, false);
+        }
+    }
+    
+    public class XslFileElement : ConfigurationElement
+    {
+        [ConfigurationProperty("name", IsRequired = true, IsKey = true)]
+        public string Name
+        {
+            get
+            {
+                return (string)this["name"];
+            }
+            set
+            {
+                this["name"] = value;
+            }
+        }
+    }
 }
+

project/core/publishers/BuildLogTransformer.cs

@@ -2,6 +2,7 @@
 using System.Configuration;
 using System.Text;
 using System.Xml.XPath;
+using ThoughtWorks.CruiseControl.Core.Config;
 using ThoughtWorks.CruiseControl.Core.Util;
 
 namespace ThoughtWorks.CruiseControl.Core.Publishers
@@ -20,8 +21,8 @@ public class BuildLogTransformer
 		/// <returns></returns>
 		public string TransformResultsWithAllStyleSheets(XPathDocument document)
 		{
-			IList list = (IList) ConfigurationManager.GetSection("xslFiles");
-			return TransformResults(list, document);
+			var section = ConfigurationManager.GetSection("xslFiles") as XslFilesSectionHandler;
+			return TransformResults(section?.FileNames, document);
 		}
 
         /// <summary>