From 951fe608b726edda84516f41276d017bdfd705a2 Mon Sep 17 00:00:00 2001
From: Steven Cooney <steven.cooney@x-labsystems.co.uk>
Date: Mon, 3 Jun 2019 17:27:19 +0100
Subject: [PATCH] Make Logging Class Generic

Allow either the agent or server loggers to be used with the wrapper class by making the set method use the interface rather than concrete class. Also rename the interface away from C# style naming.
---
 .../xlab/teamcity/phabricator/PhabricatorAgentLogger.java   | 2 +-
 .../xlab/teamcity/phabricator/PhabricatorPluginConfig.java  | 6 +++---
 ...icatorPluginLogger.java => PhabricatorPluginLogger.java} | 2 +-
 .../xlab/teamcity/phabricator/PhabricatorServerLogger.java  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/{IPhabricatorPluginLogger.java => PhabricatorPluginLogger.java} (77%)

diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorAgentLogger.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorAgentLogger.java
index c7700da..cba064c 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorAgentLogger.java
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorAgentLogger.java
@@ -2,7 +2,7 @@ package uk.xlab.teamcity.phabricator;
 
 import jetbrains.buildServer.log.Loggers;
 
-public final class PhabricatorAgentLogger implements IPhabricatorPluginLogger {
+public final class PhabricatorAgentLogger implements PhabricatorPluginLogger {
 
     @Override
     public void info(String message) {
diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java
index 0e1b3e6..35a6b49 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java
@@ -15,7 +15,7 @@ import static uk.xlab.teamcity.phabricator.CommonUtils.*;
  */
 public class PhabricatorPluginConfig {
 
-    private IPhabricatorPluginLogger logger;
+    private PhabricatorPluginLogger logger;
     private Map<String, String> params;
 
     // Build Feature Variables
@@ -35,7 +35,7 @@ public class PhabricatorPluginConfig {
      * 
      * @param logger
      */
-    public void setLogger(PhabricatorServerLogger logger) {
+    public void setLogger(PhabricatorPluginLogger logger) {
         this.logger = logger;
     }
 
@@ -65,7 +65,7 @@ public class PhabricatorPluginConfig {
                 case Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING:
                     logger.info("Found Phabricator Conduit Token");
                     conduitToken = params.get(Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING);
-                    
+
                 case Constants.BRANCH_NAME:
                     logger.info(String.format("Found branch name: %s", params.get(Constants.BRANCH_NAME)));
                     branchName = params.get(Constants.BRANCH_NAME);
diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/IPhabricatorPluginLogger.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java
similarity index 77%
rename from Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/IPhabricatorPluginLogger.java
rename to Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java
index 872f672..c7f33eb 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/IPhabricatorPluginLogger.java
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java
@@ -1,6 +1,6 @@
 package uk.xlab.teamcity.phabricator;
 
-public interface IPhabricatorPluginLogger {
+public interface PhabricatorPluginLogger {
 
     public void info(String message);
 
diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorServerLogger.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorServerLogger.java
index 5729aa7..188742e 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorServerLogger.java
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorServerLogger.java
@@ -2,7 +2,7 @@ package uk.xlab.teamcity.phabricator;
 
 import jetbrains.buildServer.log.Loggers;
 
-public final class PhabricatorServerLogger implements IPhabricatorPluginLogger {
+public final class PhabricatorServerLogger implements PhabricatorPluginLogger {
 
     @Override
     public void info(String message) {