🧹 "jira server class" renamed to "jira server flavour" ... simply sounds better 😎

Author: nop77svk

jwl.console/CLI.cs

@@ -20,9 +20,9 @@ public class FillCLI
         + $"\nJSON config: $.{nameof(core.AppConfig.User)}.{nameof(core.UserConfig.Name)} for <user name>")]
     public string? UserCredentials { get; set; }
 
-    [Option("server-class", HelpText = "Jira server class (whether vanilla or with timesheet plugins)"
-        + $"\nJSON config: $.{nameof(core.AppConfig.JiraServer)}.{nameof(jira.ServerConfig.ServerClass)}"
-        + $"\nAvailable values: {nameof(jira.JiraServerClass.VanillaJira)}, {nameof(jira.JiraServerClass.TempoTimeSheetsPlugin)}, {nameof(jira.JiraServerClass.ICTimePlugin)}")]
+    [Option("server-flavour", HelpText = "Jira server flavour (whether vanilla or with some timesheet plugins)"
+        + $"\nJSON config: $.{nameof(core.AppConfig.JiraServer)}.{nameof(jira.ServerConfig.ServerFlavour)}"
+        + $"\nAvailable values: {nameof(jira.JiraServerFlavour.Vanilla)}, {nameof(jira.JiraServerFlavour.TempoTimeSheets)}, {nameof(jira.JiraServerFlavour.ICTime)}")]
     public string? ServerClass { get; set; }
 
     [Option("no-proxy", HelpText = "Turn off proxying the HTTP(S) connections to Jira server"
@@ -55,7 +55,7 @@ public core.AppConfig ToAppConfig()
             UseVerboseFeedback = UseVerboseFeedback,
             JiraServer = new jira.ServerConfig()
             {
-                ServerClass = ServerClass,
+                ServerFlavour = ServerClass,
                 BaseUrl = jiraServerSpecification,
                 UseProxy = !NoProxy,
                 MaxConnectionsPerServer = MaxConnectionsPerServer,

jwl.jira/JiraServerClass.cs

@@ -0,0 +1,8 @@
+namespace jwl.jira;
+
+public enum JiraServerFlavour
+{
+    Vanilla = 0,
+    TempoTimeSheets = 1,
+    ICTime = 2
+}

jwl.jira/JiraServerFlavour.cs

@@ -2,25 +2,25 @@
 
 public static class ServerApiFactory
 {
-    public static IJiraServerApi CreateApi(HttpClient httpClient, string userName, JiraServerClass serverClass)
+    public static IJiraServerApi CreateApi(HttpClient httpClient, string userName, JiraServerFlavour serverClass)
     {
         return serverClass switch
         {
-            JiraServerClass.VanillaJira => new VanillaJiraServerApi(httpClient, userName),
-            JiraServerClass.TempoTimeSheetsPlugin => new JiraWithTempoPluginApi(httpClient, userName),
+            JiraServerFlavour.Vanilla => new VanillaJiraServerApi(httpClient, userName),
+            JiraServerFlavour.TempoTimeSheets => new JiraWithTempoPluginApi(httpClient, userName),
             _ => throw new NotImplementedException($"Jira server class {nameof(serverClass)} not yet implemented")
         };
     }
 
-    public static JiraServerClass? DecodeServerClass(string? serverClass)
+    public static JiraServerFlavour? DecodeServerClass(string? serverClass)
     {
-        JiraServerClass? result;
+        JiraServerFlavour? result;
 
         if (string.IsNullOrEmpty(serverClass))
             result = null;
         else if (int.TryParse(serverClass, out int serverClassIntId))
-            result = (JiraServerClass)serverClassIntId;
-        else if (Enum.TryParse(serverClass, true, out JiraServerClass serverClassEnumId))
+            result = (JiraServerFlavour)serverClassIntId;
+        else if (Enum.TryParse(serverClass, true, out JiraServerFlavour serverClassEnumId))
             result = serverClassEnumId;
         else
             throw new ArgumentOutOfRangeException(nameof(serverClass), serverClass, "Invalid server class configured");

jwl.jira/ServerApiFactory.cs

@@ -3,8 +3,8 @@ namespace jwl.jira;
 
 public class ServerConfig
 {
-    public string? ServerClass { get; init; }
-    public JiraServerClass ServerClassId => ServerApiFactory.DecodeServerClass(ServerClass) ?? JiraServerClass.VanillaJira;
+    public string? ServerFlavour { get; init; }
+    public JiraServerFlavour ServerFlavourId => ServerApiFactory.DecodeServerClass(ServerFlavour) ?? JiraServerFlavour.Vanilla;
     public string? BaseUrl { get; init; }
     public bool? UseProxy { get; init; }
     public int? MaxConnectionsPerServer { get; init; }