Quality flaw fixes

Author: tamasvajk

SonarQube.Bootstrapper/DefaultProcessorFactory.cs

@@ -0,0 +1,40 @@
+//-----------------------------------------------------------------------
+// <copyright file="Program.cs" company="SonarSource SA and Microsoft Corporation">
+//   Copyright (c) SonarSource SA and Microsoft Corporation.  All rights reserved.
+//   Licensed under the MIT License. See License.txt in the project root for license information.
+// </copyright>
+//-----------------------------------------------------------------------
+
+using SonarQube.Common;
+using SonarQube.TeamBuild.PostProcessor;
+using SonarQube.TeamBuild.PostProcessor.Interfaces;
+using SonarQube.TeamBuild.PreProcessor;
+using SonarScanner.Shim;
+
+namespace SonarQube.Bootstrapper
+{
+    public class DefaultProcessorFactory : IProcessorFactory
+    {
+        private readonly ILogger logger;
+
+        public DefaultProcessorFactory(ILogger logger)
+        {
+            this.logger = logger;
+        }
+        public IMSBuildPostProcessor CreatePostProcessor()
+        {
+            return new MSBuildPostProcessor(
+                new CoverageReportProcessor(),
+                new SonarScannerWrapper(),
+                new SummaryReportBuilder(),
+                logger,
+                new TargetsUninstaller());
+        }
+
+        public ITeamBuildPreProcessor CreatePreProcessor()
+        {
+            IPreprocessorObjectFactory factory = new PreprocessorObjectFactory();
+            return new TeamBuildPreProcessor(factory, logger);
+        }
+    }
+}

SonarQube.Bootstrapper/Interfaces/IProcessorFactory.cs

@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------
+// <copyright file="IBootstrapperSettings.cs" company="SonarSource SA and Microsoft Corporation">
+//   Copyright (c) SonarSource SA and Microsoft Corporation.  All rights reserved.
+//   Licensed under the MIT License. See License.txt in the project root for license information.
+// </copyright>
+//-----------------------------------------------------------------------
+
+using SonarQube.TeamBuild.PostProcessor.Interfaces;
+using SonarQube.TeamBuild.PreProcessor;
+
+namespace SonarQube.Bootstrapper
+{
+    public interface IProcessorFactory
+    {
+        IMSBuildPostProcessor CreatePostProcessor();
+        ITeamBuildPreProcessor CreatePreProcessor();
+    }
+}

SonarQube.Bootstrapper/Program.cs

@@ -34,36 +34,5 @@ public static int Main(string[] args)
             BootstrapperClass bootstrapper = new BootstrapperClass(processorFactory, settings, logger);
             return bootstrapper.Execute();
         }
-
-        public interface IProcessorFactory
-        {
-            IMSBuildPostProcessor CreatePostProcessor();
-            ITeamBuildPreProcessor CreatePreProcessor();
-        }
-
-        public class DefaultProcessorFactory : IProcessorFactory
-        {
-            private readonly ILogger logger;
-
-            public DefaultProcessorFactory(ILogger logger)
-            {
-                this.logger = logger;
-            }
-            public IMSBuildPostProcessor CreatePostProcessor()
-            {
-                return new MSBuildPostProcessor(
-                    new CoverageReportProcessor(),
-                    new SonarScannerWrapper(),
-                    new SummaryReportBuilder(),
-                    logger,
-                    new TargetsUninstaller());
-            }
-
-            public ITeamBuildPreProcessor CreatePreProcessor()
-            {
-                IPreprocessorObjectFactory factory = new PreprocessorObjectFactory();
-                return new TeamBuildPreProcessor(factory, logger);
-            }
-        }
     }
 }

SonarQube.Bootstrapper/SonarQube.Bootstrapper.csproj

@@ -50,7 +50,9 @@
     <Compile Include="ArgumentProcessor.cs" />
     <Compile Include="BootstrapperClass.cs" />
     <Compile Include="BootstrapperSettings.cs" />
+    <Compile Include="Interfaces\IProcessorFactory.cs" />
     <Compile Include="Interfaces\IBootstrapperSettings.cs" />
+    <Compile Include="DefaultProcessorFactory.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources.Designer.cs">

SonarQube.Common/Utilities.cs

@@ -41,7 +41,7 @@ public static bool Retry(int timeoutInMilliseconds, int pauseBetweenTriesInMilli
             {
                 throw new ArgumentNullException("op");
             }
-            
+
             logger.LogDebug(Resources.MSG_BeginningRetry, timeoutInMilliseconds, pauseBetweenTriesInMilliseconds);
 
             Stopwatch timer = Stopwatch.StartNew();
@@ -148,11 +148,11 @@ public static bool TryEnsureEmptyDirectories(ILogger logger, params string[] dir
 
         public static bool IsSecuredServerProperty(string s)
         {
-            return s.EndsWith(".secured", StringComparison.InvariantCultureIgnoreCase);
+            return s.EndsWith(".secured", StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>
-        /// Common logic for handling web exceptions when connecting to the SonarQube server. Common exceptions 
+        /// Common logic for handling web exceptions when connecting to the SonarQube server. Common exceptions
         /// are handled by logging user friendly errors.
         /// </summary>
         /// <returns>True if the exception was handled</returns>

SonarQube.TeamBuild.PostProcessor/MSBuildPostProcessor.cs

@@ -17,11 +17,12 @@ namespace SonarQube.TeamBuild.PostProcessor
 {
     public class MSBuildPostProcessor : IMSBuildPostProcessor
     {
+        private const string scanAllFiles = "-Dsonar.scanAllFiles=true";
+
         private readonly ICoverageReportProcessor codeCoverageProcessor;
         private readonly ISummaryReportBuilder reportBuilder;
         private readonly ISonarScanner sonarScanner;
         private readonly ILogger logger;
-        private readonly static string scanAllFiles = "-Dsonar.scanAllFiles=true";
         private readonly ITargetsUninstaller targetUninstaller;
 
         public MSBuildPostProcessor(ICoverageReportProcessor codeCoverageProcessor, ISonarScanner scanner, ISummaryReportBuilder reportBuilder, ILogger logger,

SonarQube.TeamBuild.PreProcessor/Roslyn/RoslynAnalyzerProvider.cs

@@ -21,8 +21,8 @@ public class RoslynAnalyzerProvider : IAnalyzerProvider
         public const string RoslynFormatNamePrefix = "roslyn-{0}";
         public const string RoslynRulesetFileName = "SonarQubeRoslyn-{0}.ruleset";
 
-        private static readonly string SONARANALYZER_PARTIAL_REPO_KEY = "sonaranalyzer-{0}";
-        private static readonly string ROSLYN_REPOSITORY_PREFIX = "roslyn.";
+        private const string SONARANALYZER_PARTIAL_REPO_KEY = "sonaranalyzer-{0}";
+        private const string ROSLYN_REPOSITORY_PREFIX = "roslyn.";
 
         public const string CSharpLanguage = "cs";
         public const string CSharpPluginKey = "csharp";