Remove Port from ServerHealth plugin - actually it was moved from Ser…

…verSubject to JenkinsProject, so that it does not show for ServerHealth.

src/Soloplan.WhatsON.Jenkins/JenkinsProject.cs

@@ -9,6 +9,7 @@
   [SubjectType("Jenkins Project Status", Description = "Retrieve the current status of a Jenkins project.")]
   [ConfigurationItem(ProjectName, typeof(string), Optional = false, Priority = 300)]
   [ConfigurationItem(RedirectPlugin, typeof(bool), Priority = 400)] // defines use of Display URL API Plugin https://wiki.jenkins.io/display/JENKINS/Display+URL+API+Plugin
+  [ConfigurationItem(ServerPort, typeof(int), Priority = 200)]
   public class JenkinsProject : ServerSubject
   {
     public const string ProjectName = "ProjectName";
@@ -18,6 +19,11 @@ public class JenkinsProject : ServerSubject
     /// </summary>
     public const string RedirectPlugin = "RedirectPlugin";
 
+    /// <summary>
+    /// The server port.
+    /// </summary>
+    public const string ServerPort = "Port";
+
     /// <summary>
     /// API class for accessing Jenkins.
     /// </summary>
@@ -36,12 +42,10 @@ public JenkinsProject(SubjectConfiguration configuration, IJenkinsApi api)
 
     public string Project => this.GetProject();
 
-    private JenkinsStatus PreviousCheckStatus { get; set; }
-
     /// <summary>
     /// Gets the port number.
     /// </summary>
-    public override int Port
+    public int Port
     {
       get
       {
@@ -55,6 +59,8 @@ public override int Port
       }
     }
 
+    private JenkinsStatus PreviousCheckStatus { get; set; }
+
     /// <summary>
     /// Gets the project.
     /// </summary>
@@ -64,6 +70,15 @@ public string GetProject()
       return this.SubjectConfiguration.GetConfigurationByKey(JenkinsProject.ProjectName).Value;
     }
 
+    /// <summary>
+    /// Gets the port.
+    /// </summary>
+    /// <returns>The port number.</returns>
+    public string GetPort()
+    {
+      return this.SubjectConfiguration.GetConfigurationByKey(ServerPort).Value;
+    }
+
     protected override async Task ExecuteQuery(CancellationToken cancellationToken, params string[] args)
     {
       var job = await this.api.GetJenkinsJob(this, cancellationToken);

src/Soloplan.WhatsON.ServerBase/ServerSubject.cs

@@ -1,11 +1,9 @@
 namespace Soloplan.WhatsON.ServerBase
 {
   [ConfigurationItem(ServerAddress, typeof(string), Optional = false, Priority = 100)]
-  [ConfigurationItem(ServerPort, typeof(int), Priority = 200)]
   public abstract class ServerSubject : Subject
   {
     public const string ServerAddress = "Address";
-    public const string ServerPort = "Port";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ServerSubject"/> class.
@@ -24,24 +22,5 @@ public string Address
       get => this.SubjectConfiguration.GetConfigurationByKey(ServerAddress).Value;
       set => this.SubjectConfiguration.GetConfigurationByKey(ServerAddress).Value = value;
     }
-
-    /// <summary>
-    /// Gets or sets the port.
-    /// </summary>
-    public virtual int Port
-    {
-      get
-      {
-        var configItem = this.SubjectConfiguration.GetConfigurationByKey(ServerPort);
-        if (configItem != null)
-        {
-          return int.TryParse(configItem.Value, out var port) ? port : 0;
-        }
-
-        return 0;
-      }
-
-      set => this.SubjectConfiguration.GetConfigurationByKey(ServerPort).Value = value.ToString();
-    }
   }
 }

src/Soloplan.WhatsON.ServerBase/SubjectExtensions.cs

@@ -6,10 +6,5 @@ public static string GetAddress(this ServerSubject subject)
     {
       return subject.SubjectConfiguration.GetConfigurationByKey(ServerSubject.ServerAddress).Value;
     }
-
-    public static string GetPort(this ServerSubject subject)
-    {
-      return subject.SubjectConfiguration.GetConfigurationByKey(ServerSubject.ServerPort).Value;
-    }
   }
 }