Cleaning up the naming and updating the string method for consistency

OctopusDeploy · Mar 30, 2016 · f9438cf · f9438cf
1 parent b156dec
commit f9438cf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/source/Octopus.Cli/Exporters/ProjectExporter.cs b/source/Octopus.Cli/Exporters/ProjectExporter.cs
@@ -84,10 +84,10 @@ protected override void Export(Dictionary<string, string> parameters)
                     {
                         Log.Debug("Finding NuGet feed for step " + step.Name);
                         FeedResource feed = null;
-                        if (FeedResourceCustomExpressionHelper.IsValidRepositoryId(nugetFeedId.Value))
+                        if (FeedCustomExpressionHelper.IsRealFeedId(nugetFeedId.Value))
                             feed = Repository.Feeds.Get(nugetFeedId.Value);
                         else
-                            feed = FeedResourceCustomExpressionHelper.FeedResourceWithId(nugetFeedId.Value);
+                            feed = FeedCustomExpressionHelper.CustomExpressionFeedWithId(nugetFeedId.Value);
 
                         if (feed == null)
                             throw new CouldNotFindException("NuGet feed for step", step.Name);

diff --git a/source/Octopus.Cli/Importers/ProjectImporter.cs b/source/Octopus.Cli/Importers/ProjectImporter.cs
@@ -544,10 +544,10 @@ protected CheckedReferences<FeedResource> CheckNuGetFeedsExist(List<ReferenceDat
             foreach (var nugetFeed in nugetFeeds)
             {
                 FeedResource feed = null;
-                if (FeedResourceCustomExpressionHelper.IsValidRepositoryId(nugetFeed.Id))
+                if (FeedCustomExpressionHelper.IsRealFeedId(nugetFeed.Id))
                     feed = Repository.Feeds.FindByName(nugetFeed.Name);
                 else
-                    feed = FeedResourceCustomExpressionHelper.FeedResourceWithId(nugetFeed.Id);
+                    feed = FeedCustomExpressionHelper.CustomExpressionFeedWithId(nugetFeed.Id);
 
                 dependencies.Register(nugetFeed.Name, nugetFeed.Id, feed);
             }

diff --git a/source/Octopus.Cli/Octopus.Cli.csproj b/source/Octopus.Cli/Octopus.Cli.csproj
@@ -121,7 +121,7 @@
     <Compile Include="Repositories\ActionTemplateRepository.cs" />
     <Compile Include="Repositories\IActionTemplateRepository.cs" />
     <Compile Include="Util\DeletionOptions.cs" />
-    <Compile Include="Util\FeedResourceCustomExpressionHelper.cs" />
+    <Compile Include="Util\FeedCustomExpressionHelper.cs" />
     <Compile Include="Util\Humanize.cs" />
     <Compile Include="Util\IOctopusFileSystem.cs" />
     <Compile Include="Util\LineSplitter.cs" />

diff --git a/...til/FeedResourceCustomExpressionHelper.cs → ...us.Cli/Util/FeedCustomExpressionHelper.cs b/...til/FeedResourceCustomExpressionHelper.cs → ...us.Cli/Util/FeedCustomExpressionHelper.cs
@@ -1,20 +1,21 @@
 using Octopus.Client.Model;
+using System;
 
 namespace Octopus.Cli.Util
 {
     /// <summary>
     /// Helps with situations where feeds use custom expressions Eg. #{MyCustomFeedURL}
     /// </summary>
-    public static class FeedResourceCustomExpressionHelper
+    public static class FeedCustomExpressionHelper
     {
-        public static string FeedName = "Custom expression";
+        public static string CustomExpressionFeedName = "Custom expression";
 
-        public static FeedResource FeedResourceWithId(string id)
+        public static FeedResource CustomExpressionFeedWithId(string id)
         {
             var feed = new FeedResource()
             {
                 Id = id,
-                Name = FeedResourceCustomExpressionHelper.FeedName
+                Name = FeedCustomExpressionHelper.CustomExpressionFeedName
             };
             return feed;
         }
@@ -29,9 +30,9 @@ public static FeedResource FeedResourceWithId(string id)
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public static bool IsValidRepositoryId(string id)
+        public static bool IsRealFeedId(string id)
         {
-            if (id.ToLowerInvariant().StartsWith("feeds-"))
+            if (id.StartsWith("feeds-", StringComparison.OrdinalIgnoreCase))
                 return true;
             return false;
         }