From 16e24521d12e5b32775dcc9029557f0e492a608a Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Thu, 7 Jul 2022 23:07:27 +0200
Subject: [PATCH 01/21] global.jelly updated with proxy fields

---
 .../office365connector/Webhook/global.jelly   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly b/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
index 09b3ecb..5b61d78 100755
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
@@ -7,5 +7,24 @@
             <f:entry title="Name" field="globalName">
                 <f:textbox/>
             </f:entry>
+        <f:advanced>
+            <f:section title="Proxy Config">
+                <f:description>
+                    This section defines global proxy settings that will apply to all webhook messages
+                </f:description>
+                <f:entry title="IP" field="ip">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry title="Port" field="port">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry title="Username" field="username">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry title="Password" field="password">
+                    <f:password/>
+                </f:entry>
+            </f:section>
+        </f:advanced>
     </f:section>
 </j:jelly>

From 94cd34b7bd694ddaf816cbc69aa956b7aa418e8a Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Tue, 12 Jul 2022 22:23:36 +0200
Subject: [PATCH 02/21] Adding plugin specific proxy support for
 Office365Connector

---
 pom.xml                                       |  2 +-
 .../office365connector/HttpWorker.java        | 19 ++++--
 .../Office365ConnectorWebhookNotifier.java    |  2 +-
 .../plugins/office365connector/Proxy.java     | 58 +++++++++++++++++++
 .../plugins/office365connector/Webhook.java   | 50 ++++++++++++++++
 .../office365connector/Webhook/config.jelly   |  2 +-
 .../office365connector/Webhook/global.jelly   |  3 +-
 .../office365connector/Webhook/help-ip.html   |  1 +
 .../office365connector/Webhook/help-port.html |  1 +
 .../Webhook/help-username.html                |  1 +
 10 files changed, 130 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/jenkins/plugins/office365connector/Proxy.java
 create mode 100644 src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html
 create mode 100644 src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html
 create mode 100644 src/main/resources/jenkins/plugins/office365connector/Webhook/help-username.html

diff --git a/pom.xml b/pom.xml
index 5e51d63..a4f0874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.jenkins-ci.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
-                <version>3.5</version>
+                <version>3.17</version>
                 <configuration>
                     <!-- Jenkins test InjectedTest renamed to InjectedIT so it is executed only during integration tests -->
                     <injectedTestName>InjectionIT</injectedTestName>
diff --git a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
index 504e0a8..e75da5f 100644
--- a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
+++ b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
@@ -13,9 +13,7 @@
  */
 package jenkins.plugins.office365connector;
 
-import java.io.IOException;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -43,17 +41,20 @@ public class HttpWorker implements Runnable {
 
     private final PrintStream logger;
 
+    private final Proxy pluginProxy;
+
     private final String url;
     private final String data;
     private final int timeout;
 
     private static final int RETRIES = 3;
 
-    public HttpWorker(String url, String data, int timeout, PrintStream logger) {
+    public HttpWorker(String url, String data, int timeout, PrintStream logger, Proxy pluginProxy) {
         this.url = url;
         this.data = data;
         this.timeout = timeout;
         this.logger = logger;
+        this.pluginProxy = pluginProxy;
     }
 
     /**
@@ -75,7 +76,7 @@ public void run() {
                 // uncomment to log what message has been sent
                 // log("Posted JSON: %s", data);
                 requestEntity = new StringRequestEntity(data, "application/json", StandardCharsets.UTF_8.name());
-            } catch (UnsupportedEncodingException e) {
+            } catch (Exception e) {
                 e.printStackTrace(logger);
                 break;
             }
@@ -92,7 +93,7 @@ public void run() {
                 } else {
                     success = true;
                 }
-            } catch (IOException e) {
+            } catch (Exception e) {
                 log("Failed to post data to webhook - %s", url);
                 e.printStackTrace(logger);
             } finally {
@@ -105,8 +106,16 @@ public void run() {
     private HttpClient getHttpClient() {
         HttpClient client = new HttpClient();
         Jenkins jenkins = Jenkins.get();
+        if (pluginProxy.proxyConfigured()) {
+            client.getHostConfiguration().setProxy(pluginProxy.getIp(), pluginProxy.getPort());
+            if (StringUtils.isNotBlank(pluginProxy.getUsername())) {
+                client.getState().setProxyCredentials(AuthScope.ANY,
+                        new UsernamePasswordCredentials(pluginProxy.getUsername(), pluginProxy.getPassword()));
+            }
+        }
         if (jenkins != null) {
             ProxyConfiguration proxy = jenkins.proxy;
+            // Check job proxy first
             if (proxy != null) {
                 List<Pattern> noHostProxyPatterns = proxy.getNoProxyHostPatterns();
                 if (!isNoProxyHost(this.url, noHostProxyPatterns)) {
diff --git a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
index 2c9cbd1..ce9738f 100644
--- a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
+++ b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
@@ -112,7 +112,7 @@ private void executeWorker(Webhook webhook, Card card) {
         try {
             String url = run.getEnvironment(taskListener).expand(webhook.getUrl());
             String data = gson.toJson(card);
-            HttpWorker worker = new HttpWorker(url, data, webhook.getTimeout(), taskListener.getLogger());
+            HttpWorker worker = new HttpWorker(url, data, webhook.getTimeout(), taskListener.getLogger(), webhook.getPluginProxy());
             worker.submit();
         } catch (IOException | InterruptedException | RejectedExecutionException e) {
             log(String.format("Failed to notify webhook: %s", webhook.getName()));
diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
new file mode 100644
index 0000000..5f99ac0
--- /dev/null
+++ b/src/main/java/jenkins/plugins/office365connector/Proxy.java
@@ -0,0 +1,58 @@
+package jenkins.plugins.office365connector;
+
+public class Proxy {
+
+    private String ip;
+    private Integer port;
+    private String username;
+    private String password;
+
+
+    public Proxy(String ip, Integer port, String username, String password) {
+        this.ip = ip;
+        this.port = port;
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Boolean proxyConfigured() {
+        try {
+            return (!this.ip.equals(null) || !this.ip.equals(""));
+
+        } catch (NullPointerException ex) {
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index e26b686..c94e390 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -72,6 +72,10 @@ public String getName() {
         return Util.fixEmptyAndTrim(StringUtils.isEmpty(name) ? getDescriptor().getGlobalName() : name);
     }
 
+    public Proxy getPluginProxy() {
+        return getDescriptor().proxyPluginConfiguration();
+    }
+
     @DataBoundSetter
     public void setName(String name) {
         this.name = Util.fixEmptyAndTrim(name);
@@ -183,16 +187,62 @@ public static class DescriptorImpl extends Descriptor<Webhook> {
         private String globalUrl;
         private String globalName;
 
+        private String proxyIp;
+        private String proxyUsername;
+        private String proxyPassword;
+
+        private int proxyPort;
+
         public DescriptorImpl() {
             load();
         }
 
+        public Proxy proxyPluginConfiguration() {
+            return new Proxy(this.proxyIp, this.proxyPort, this.proxyUsername, this.proxyPassword);
+        }
+
         @Nonnull
         @Override
         public String getDisplayName() {
             return "Webhook";
         }
 
+        public String getProxyIp() {
+            return proxyIp;
+        }
+
+        @DataBoundSetter
+        public void setProxyIp(String proxyIp) {
+            this.proxyIp = proxyIp;
+        }
+
+        public String getProxyUsername() {
+            return proxyUsername;
+        }
+
+        @DataBoundSetter
+        public void setProxyUsername(String proxyUsername) {
+            this.proxyUsername = proxyUsername;
+        }
+
+        public String getProxyPassword() {
+            return proxyPassword;
+        }
+
+        @DataBoundSetter
+        public void setProxyPassword(String proxyPassword) {
+            this.proxyPassword = proxyPassword;
+        }
+
+        public int getProxyPort() {
+            return proxyPort;
+        }
+
+        @DataBoundSetter
+        public void setProxyPort(int proxyPort) {
+            this.proxyPort = proxyPort;
+        }
+
         public int getDefaultTimeout() {
             return Webhook.DEFAULT_TIMEOUT;
         }
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly b/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly
index 6917e9a..71e421b 100644
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly
@@ -14,7 +14,7 @@
                 This section defines for which build statuses the notification is sent.
             </f:description>
 
-            <f:entry title="Notify Build Start" field="startNotification">
+            <f:entry title="Notify Build Start" field="startNotification" >
                 <f:checkbox/>
             </f:entry>
 
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly b/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
index 5b61d78..f4ebda3 100755
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
@@ -10,7 +10,8 @@
         <f:advanced>
             <f:section title="Proxy Config">
                 <f:description>
-                    This section defines global proxy settings that will apply to all webhook messages
+                    This section defines the Office365Connector proxy settings that will apply to all webhook notifications. This
+                    proxy configuration will be prioritized over the Jenkins global proxy config
                 </f:description>
                 <f:entry title="IP" field="ip">
                     <f:textbox/>
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html
new file mode 100644
index 0000000..a62c127
--- /dev/null
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html
@@ -0,0 +1 @@
+<div align="help">The IP address of the proxy server</div>
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html
new file mode 100644
index 0000000..75e11bd
--- /dev/null
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html
@@ -0,0 +1 @@
+<div align="help">This field works in conjunction with the ip field to specify the HTTP proxy port.</div>
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-username.html b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-username.html
new file mode 100644
index 0000000..ee67c43
--- /dev/null
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-username.html
@@ -0,0 +1 @@
+<div align="help">This field works in conjunction with the proxy server field to specify the username used to authenticate with the proxy.</div>

From eef318ee755121d3cded3cfef87715d467ca9bf1 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Tue, 12 Jul 2022 22:24:04 +0200
Subject: [PATCH 03/21] Fixing tests

---
 .../office365connector/HttpWorkerTest.java    | 35 ++++++++++---
 .../plugins/office365connector/ProxyTest.java | 49 +++++++++++++++++++
 2 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/jenkins/plugins/office365connector/ProxyTest.java

diff --git a/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java b/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
index 7b9039f..67b890a 100644
--- a/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
@@ -33,11 +33,12 @@ public void setUp() {
     }
 
     @Test
-    public void HttpWorker_getHttpClient_NoProxy() throws NoSuchMethodException {
+    public void HttpWorker_getHttpClient_NoJenkinsProxy() throws NoSuchMethodException {
 
         // given
         // from @Before
-        HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out);
+        Proxy thisPluginProxy = new Proxy(null, null, null, null);
+        HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);
 
@@ -50,15 +51,16 @@ public void HttpWorker_getHttpClient_NoProxy() throws NoSuchMethodException {
     }
 
     @Test
-    public void HttpWorker_getHttpClient_Proxy() throws NoSuchMethodException {
+    public void HttpWorker_getHttpClient_JenkinsProxy() throws NoSuchMethodException {
 
         // given
         // from @Before
+        Proxy thisPluginProxy = new Proxy(null, null, null, null);
         Jenkins jenkins = Jenkins.get();
         ProxyConfiguration proxyConfiguration = new ProxyConfiguration("name", 123, null, null, "*mockwebsite.com*");
         jenkins.proxy = proxyConfiguration;
 
-        HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out);
+        HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);
 
@@ -71,15 +73,16 @@ public void HttpWorker_getHttpClient_Proxy() throws NoSuchMethodException {
     }
 
     @Test
-    public void HttpWorker_getHttpClient_Proxy_Ignored() throws NoSuchMethodException {
+    public void HttpWorker_getHttpClient_JenkinsProxy_Ignored() throws NoSuchMethodException {
 
         // given
         // from @Before
+        Proxy thisPluginProxy = new Proxy(null, null, null, null);
         Jenkins jenkins = Jenkins.get();
         ProxyConfiguration proxyConfiguration = new ProxyConfiguration("name", 123, null, null, "*mockwebsite.com*");
         jenkins.proxy = proxyConfiguration;
 
-        HttpWorker httpWorker = new HttpWorker("http://mockwebsite.com", "{}", 30, System.out);
+        HttpWorker httpWorker = new HttpWorker("http://mockwebsite.com", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);
 
@@ -90,4 +93,22 @@ public void HttpWorker_getHttpClient_Proxy_Ignored() throws NoSuchMethodExceptio
         assertThat(httpClient.getHostConfiguration().getProxyHost()).isNull();
         assertThat(httpClient.getHostConfiguration().getProxyPort()).isEqualTo(-1);
     }
-}
+
+    @Test
+    public void HttpWorker_getHttpClient_PluginProxy() throws NoSuchMethodException {
+
+        // given
+        // from @Before
+        Proxy thisPluginProxy = new Proxy("10.0.0.1", 12345, null, null);
+        HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
+        Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
+        method.setAccessible(true);
+
+        // when
+        HttpClient httpClient = (HttpClient) ReflectionUtils.invokeMethod(method, httpWorker);
+
+        // then
+        assertThat(httpClient.getHostConfiguration().getProxyHost()).isEqualTo(thisPluginProxy.getIp());
+        assertThat(httpClient.getHostConfiguration().getProxyPort()).isEqualTo(thisPluginProxy.getPort());
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/jenkins/plugins/office365connector/ProxyTest.java b/src/test/java/jenkins/plugins/office365connector/ProxyTest.java
new file mode 100644
index 0000000..83a5945
--- /dev/null
+++ b/src/test/java/jenkins/plugins/office365connector/ProxyTest.java
@@ -0,0 +1,49 @@
+package jenkins.plugins.office365connector;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ProxyTest {
+
+    private Proxy proxyTest;
+    private Proxy proxyTestNoCredentials;
+
+    @Before
+    public void setUp() {
+        proxyTest = new Proxy("10.0.0.1", 65654, "myUsername", "myPassword");
+        proxyTestNoCredentials = new Proxy("10.0.0.1", 65654, null, null);
+    }
+
+    @Test
+    public void getIp() {
+        assertThat("10.0.0.1").isEqualTo(proxyTest.getIp());
+    }
+
+    @Test
+    public void getPort() {
+        assertThat(65654).isEqualTo(proxyTest.getPort());
+    }
+
+    @Test
+    public void getUsername() {
+        assertThat("myUsername").isEqualTo(proxyTest.getUsername());
+    }
+
+    @Test
+    public void getPassword() {
+        assertThat("myPassword").isEqualTo(proxyTest.getPassword());
+    }
+
+    @Test
+    public void proxyConfigured_True() {
+        assertThat(proxyTest.proxyConfigured().equals(true));
+    }
+
+    @Test
+    public void proxyConfigured_False() {
+        assertThat(proxyTest.proxyConfigured().equals(false));
+    }
+}
\ No newline at end of file

From bd50cf8ce0394ae1005fc4aa6df7703ee500cb0d Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Wed, 13 Jul 2022 12:01:25 +0200
Subject: [PATCH 04/21] Added mock for DescriptorImpl to support changes in
 Webhook.java constructor

---
 .../plugins/office365connector/Webhook.java   | 13 ++++++++-----
 .../office365connector/WebhookTest.java       | 17 +++++++++++++++++
 .../workflow/DevelopersIT.java                | 17 +++++++++++++----
 .../workflow/PullRequestIT.java               | 15 +++++++--------
 .../office365connector/workflow/SampleIT.java | 13 ++++++-------
 .../workflow/WebhookJobPropertyTest.java      | 19 +++++++++++++++++--
 6 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index c94e390..b83fe17 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -50,6 +50,8 @@ public class Webhook extends AbstractDescribableImpl<Webhook> {
 
     private int timeout;
 
+    private Proxy pluginProxy;
+
     private List<Macro> macros = Collections.emptyList();
 
     private List<FactDefinition> factDefinitions = Collections.emptyList();
@@ -62,6 +64,7 @@ public DescriptorImpl getDescriptor() {
     @DataBoundConstructor
     public Webhook(String url) {
         this.url = StringUtils.isEmpty(url) ? getDescriptor().getGlobalUrl() : url;
+        this.setProxyPluginConfiguration(getDescriptor().getProxyIp(), getDescriptor().getProxyPort(), getDescriptor().getProxyUsername(), getDescriptor().getProxyPassword());
     }
 
     public String getUrl() {
@@ -73,7 +76,11 @@ public String getName() {
     }
 
     public Proxy getPluginProxy() {
-        return getDescriptor().proxyPluginConfiguration();
+        return this.pluginProxy;
+    }
+
+    public void setProxyPluginConfiguration(String proxyIp, Integer proxyPort, String proxyUsername, String proxyPassword) {
+        this.pluginProxy = new Proxy(proxyIp, proxyPort, proxyUsername, proxyPassword);
     }
 
     @DataBoundSetter
@@ -197,10 +204,6 @@ public DescriptorImpl() {
             load();
         }
 
-        public Proxy proxyPluginConfiguration() {
-            return new Proxy(this.proxyIp, this.proxyPort, this.proxyUsername, this.proxyPassword);
-        }
-
         @Nonnull
         @Override
         public String getDisplayName() {
diff --git a/src/test/java/jenkins/plugins/office365connector/WebhookTest.java b/src/test/java/jenkins/plugins/office365connector/WebhookTest.java
index 9bdd45d..e4beb19 100644
--- a/src/test/java/jenkins/plugins/office365connector/WebhookTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/WebhookTest.java
@@ -2,16 +2,23 @@
 
 import java.util.Arrays;
 import java.util.List;
+
+import hudson.model.AbstractBuild;
+import hudson.model.Job;
+import hudson.model.Result;
 import jenkins.model.Jenkins;
 import jenkins.plugins.office365connector.model.FactDefinition;
 import jenkins.plugins.office365connector.model.Macro;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.anyObject;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;
@@ -23,6 +30,16 @@
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(Jenkins.class)
 public class WebhookTest {
+    @Before
+    public void setUp() throws Exception {
+
+        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
+
+        Jenkins jenkins = mock(Jenkins.class);
+        mockStatic(Jenkins.class);
+        Mockito.when(Jenkins.get()).thenReturn(jenkins);
+        Mockito.when(jenkins.getDescriptorOrDie(anyObject())).thenReturn(mockDescriptor);
+    }
 
     @Test
     public void getUrl_ReturnsUrl() {
diff --git a/src/test/java/jenkins/plugins/office365connector/workflow/DevelopersIT.java b/src/test/java/jenkins/plugins/office365connector/workflow/DevelopersIT.java
index e4340c5..63604a4 100644
--- a/src/test/java/jenkins/plugins/office365connector/workflow/DevelopersIT.java
+++ b/src/test/java/jenkins/plugins/office365connector/workflow/DevelopersIT.java
@@ -1,15 +1,14 @@
 package jenkins.plugins.office365connector.workflow;
 
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
 import java.util.List;
 
 import hudson.model.AbstractBuild;
 import hudson.model.Job;
 import hudson.scm.ChangeLogSet;
+import jenkins.model.Jenkins;
 import jenkins.plugins.office365connector.FileUtils;
 import jenkins.plugins.office365connector.Office365ConnectorWebhookNotifier;
+import jenkins.plugins.office365connector.Webhook;
 import jenkins.plugins.office365connector.helpers.AffectedFileBuilder;
 import org.junit.Before;
 import org.junit.Test;
@@ -18,12 +17,14 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import static org.powermock.api.mockito.PowerMockito.*;
+
 /**
  * @author Damian Szczepanik (damianszczepanik@github)
  */
 @PowerMockIgnore("jdk.internal.reflect.*")
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(Office365ConnectorWebhookNotifier.class)
+@PrepareForTest({Office365ConnectorWebhookNotifier.class, Jenkins.class})
 public class DevelopersIT extends AbstractTest {
 
     private static final String JOB_NAME = "simple job";
@@ -31,8 +32,16 @@ public class DevelopersIT extends AbstractTest {
 
     @Before
     public void setUp() {
+        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
+        when(mockDescriptor.getName()).thenReturn("testName");
+
+        mockStatic(Jenkins.class);
+        Jenkins jenkins = mock(Jenkins.class);
         mockListener();
 
+        when(jenkins.getDescriptorOrDie(Webhook.class)).thenReturn(mockDescriptor);
+        when(Jenkins.get()).thenReturn(jenkins);
+
         run = mockRun();
 
         mockDisplayURLProvider(JOB_NAME, BUILD_NUMBER);
diff --git a/src/test/java/jenkins/plugins/office365connector/workflow/PullRequestIT.java b/src/test/java/jenkins/plugins/office365connector/workflow/PullRequestIT.java
index 1821add..4c68c6c 100644
--- a/src/test/java/jenkins/plugins/office365connector/workflow/PullRequestIT.java
+++ b/src/test/java/jenkins/plugins/office365connector/workflow/PullRequestIT.java
@@ -47,10 +47,17 @@ public class PullRequestIT extends AbstractTest {
 
     @Before
     public void setUp() {
+
+        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
+        when(mockDescriptor.getName()).thenReturn("testName");
+
         mockStatic(Jenkins.class);
         Jenkins jenkins = mock(Jenkins.class);
         mockListener();
 
+        when(jenkins.getDescriptorOrDie(Webhook.class)).thenReturn(mockDescriptor);
+        when(Jenkins.get()).thenReturn(jenkins);
+
         run = mockRun();
         mockCause("Branch indexing");
         mockCommitters();
@@ -59,15 +66,7 @@ public void setUp() {
         mockEnvironment();
         mockHttpWorker();
         mockGetChangeSets();
-
         mockPullRequest();
-
-        when(Jenkins.get()).thenReturn(jenkins);
-
-        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
-        when(mockDescriptor.getName()).thenReturn("testName");
-
-        when(jenkins.getDescriptorOrDie(Webhook.class)).thenReturn(mockDescriptor);
     }
 
     private AbstractBuild mockRun() {
diff --git a/src/test/java/jenkins/plugins/office365connector/workflow/SampleIT.java b/src/test/java/jenkins/plugins/office365connector/workflow/SampleIT.java
index cd06d2e..8ff6e71 100644
--- a/src/test/java/jenkins/plugins/office365connector/workflow/SampleIT.java
+++ b/src/test/java/jenkins/plugins/office365connector/workflow/SampleIT.java
@@ -41,10 +41,16 @@ public class SampleIT extends AbstractTest {
 
     @Before
     public void setUp() {
+        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
+        when(mockDescriptor.getName()).thenReturn("testName");
+
         mockStatic(Jenkins.class);
         Jenkins jenkins = mock(Jenkins.class);
         mockListener();
 
+        when(jenkins.getDescriptorOrDie(Webhook.class)).thenReturn(mockDescriptor);
+        when(Jenkins.get()).thenReturn(jenkins);
+
         run = mockRun();
         mockCause(CAUSE_DESCRIPTION);
 
@@ -52,13 +58,6 @@ public void setUp() {
         mockEnvironment();
         mockHttpWorker();
         mockGetChangeSets();
-
-        when(Jenkins.get()).thenReturn(jenkins);
-
-        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
-        when(mockDescriptor.getName()).thenReturn("testName");
-
-        when(jenkins.getDescriptorOrDie(Webhook.class)).thenReturn(mockDescriptor);
     }
 
     private AbstractBuild mockRun() {
diff --git a/src/test/java/jenkins/plugins/office365connector/workflow/WebhookJobPropertyTest.java b/src/test/java/jenkins/plugins/office365connector/workflow/WebhookJobPropertyTest.java
index ac28719..6d43b93 100644
--- a/src/test/java/jenkins/plugins/office365connector/workflow/WebhookJobPropertyTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/workflow/WebhookJobPropertyTest.java
@@ -1,16 +1,19 @@
 package jenkins.plugins.office365connector.workflow;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.*;
+import static org.powermock.api.mockito.PowerMockito.when;
 
 import java.util.Collections;
 import java.util.List;
 
 import hudson.model.AbstractBuild;
+import jenkins.model.Jenkins;
 import jenkins.plugins.office365connector.Office365ConnectorWebhookNotifier;
 import jenkins.plugins.office365connector.Webhook;
 import jenkins.plugins.office365connector.WebhookJobProperty;
 import jenkins.plugins.office365connector.helpers.WebhookBuilder;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -22,9 +25,21 @@
  */
 @PowerMockIgnore("jdk.internal.reflect.*")
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Office365ConnectorWebhookNotifier.class, WebhookJobProperty.class})
+@PrepareForTest({Office365ConnectorWebhookNotifier.class, WebhookJobProperty.class, Jenkins.class})
 public class WebhookJobPropertyTest extends AbstractTest {
 
+    @Before
+    public void setUp() {
+        Webhook.DescriptorImpl mockDescriptor = mock(Webhook.DescriptorImpl.class);
+        when(mockDescriptor.getName()).thenReturn("testName");
+
+        mockStatic(Jenkins.class);
+        Jenkins jenkins = mock(Jenkins.class);
+        mockListener();
+
+        when(jenkins.getDescriptorOrDie(Webhook.class)).thenReturn(mockDescriptor);
+        when(Jenkins.get()).thenReturn(jenkins);
+    }
     @Test
     public void getWebhooks_ReturnsHook() {
 

From 2bce0d1a0c7079994afe5f25e1f0b4defc970139 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Wed, 13 Jul 2022 12:46:45 +0200
Subject: [PATCH 05/21] Updated screenshot for README.md

---
 .README/globalconfig.png | Bin 12079 -> 25652 bytes
 README.md                |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.README/globalconfig.png b/.README/globalconfig.png
index 5307e8ef779c186f0fa6eec447e28d0124cec1dc..d390eb95935e6c54696706abe62523a447571e25 100644
GIT binary patch
literal 25652
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

literal 12079
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
M)>bN0uzver0PRYVxBvhE

diff --git a/README.md b/README.md
index d04b1b8..a8989de 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Plugin is used to send actionable messages in [Outlook](http://outlook.com), [Of
 
 #### Global configuration values used as default in jobs
 
-![GlobalConfigurationDefault](.README/globalconfigdefault.png?raw=true)
+![GlobalConfiguratio![img.png](.README/globalconfig.png)nDefault](.README/globalconfigdefault.png?raw=true)
 
 ### Microsoft Teams
 

From 9ffa565a3545cbaf59fafaf110d93071f88d4fa0 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Wed, 13 Jul 2022 21:51:18 +0200
Subject: [PATCH 06/21] Fixing null check

---
 src/main/java/jenkins/plugins/office365connector/Proxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
index 5f99ac0..e76b10e 100644
--- a/src/main/java/jenkins/plugins/office365connector/Proxy.java
+++ b/src/main/java/jenkins/plugins/office365connector/Proxy.java
@@ -49,7 +49,7 @@ public void setPassword(String password) {
 
     public Boolean proxyConfigured() {
         try {
-            return (!this.ip.equals(null) || !this.ip.equals(""));
+            return (this.ip != null);
 
         } catch (NullPointerException ex) {
             return false;

From b10ce616a0847a304e26b6efd195e36ee4a47f11 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Thu, 14 Jul 2022 22:34:26 +0200
Subject: [PATCH 07/21] Fixing null check

---
 .../plugins/office365connector/Proxy.java     |  2 +-
 .../plugins/office365connector/Webhook.java   | 42 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
index e76b10e..1d7bbb9 100644
--- a/src/main/java/jenkins/plugins/office365connector/Proxy.java
+++ b/src/main/java/jenkins/plugins/office365connector/Proxy.java
@@ -49,7 +49,7 @@ public void setPassword(String password) {
 
     public Boolean proxyConfigured() {
         try {
-            return (this.ip != null);
+            return (this.ip != null && this.ip != "");
 
         } catch (NullPointerException ex) {
             return false;
diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index b83fe17..3f85d24 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -64,7 +64,7 @@ public DescriptorImpl getDescriptor() {
     @DataBoundConstructor
     public Webhook(String url) {
         this.url = StringUtils.isEmpty(url) ? getDescriptor().getGlobalUrl() : url;
-        this.setProxyPluginConfiguration(getDescriptor().getProxyIp(), getDescriptor().getProxyPort(), getDescriptor().getProxyUsername(), getDescriptor().getProxyPassword());
+        this.setProxyPluginConfiguration(getDescriptor().getIp(), getDescriptor().getPort(), getDescriptor().getUsername(), getDescriptor().getPassword());
     }
 
     public String getUrl() {
@@ -194,11 +194,11 @@ public static class DescriptorImpl extends Descriptor<Webhook> {
         private String globalUrl;
         private String globalName;
 
-        private String proxyIp;
-        private String proxyUsername;
-        private String proxyPassword;
+        private String ip;
+        private String username;
+        private String password;
 
-        private int proxyPort;
+        private Integer port;
 
         public DescriptorImpl() {
             load();
@@ -210,40 +210,40 @@ public String getDisplayName() {
             return "Webhook";
         }
 
-        public String getProxyIp() {
-            return proxyIp;
+        public String getIp() {
+            return ip;
         }
 
         @DataBoundSetter
-        public void setProxyIp(String proxyIp) {
-            this.proxyIp = proxyIp;
+        public void setIp(String ip) {
+            this.ip = ip;
         }
 
-        public String getProxyUsername() {
-            return proxyUsername;
+        public String getUsername() {
+            return username;
         }
 
         @DataBoundSetter
-        public void setProxyUsername(String proxyUsername) {
-            this.proxyUsername = proxyUsername;
+        public void setUsername(String username) {
+            this.username = username;
         }
 
-        public String getProxyPassword() {
-            return proxyPassword;
+        public String getPassword() {
+            return password;
         }
 
         @DataBoundSetter
-        public void setProxyPassword(String proxyPassword) {
-            this.proxyPassword = proxyPassword;
+        public void setPassword(String password) {
+            this.password = password;
         }
 
-        public int getProxyPort() {
-            return proxyPort;
+        public Integer getPort() {
+            return port;
         }
 
         @DataBoundSetter
-        public void setProxyPort(int proxyPort) {
-            this.proxyPort = proxyPort;
+        public void setPort(Integer port) {
+            this.port = port;
         }
 
         public int getDefaultTimeout() {

From b06ef6f5b83f766d84864d3de17d485412b674ba Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Mon, 25 Jul 2022 20:45:58 +0200
Subject: [PATCH 08/21] Added missing exception

---
 .../java/jenkins/plugins/office365connector/HttpWorker.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
index e75da5f..a9a90e1 100644
--- a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
+++ b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
@@ -14,6 +14,7 @@
 package jenkins.plugins.office365connector;
 
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -76,7 +77,7 @@ public void run() {
                 // uncomment to log what message has been sent
                 // log("Posted JSON: %s", data);
                 requestEntity = new StringRequestEntity(data, "application/json", StandardCharsets.UTF_8.name());
-            } catch (Exception e) {
+            } catch (UnsupportedEncodingException e) {
                 e.printStackTrace(logger);
                 break;
             }

From ed328017cc0e3a4941c6fba810c98683d7f2e999 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Mon, 25 Jul 2022 20:46:48 +0200
Subject: [PATCH 09/21] Modified proxyConfigured to avoid a NPE scenario

---
 .../java/jenkins/plugins/office365connector/Proxy.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
index 1d7bbb9..977d4a9 100644
--- a/src/main/java/jenkins/plugins/office365connector/Proxy.java
+++ b/src/main/java/jenkins/plugins/office365connector/Proxy.java
@@ -1,5 +1,7 @@
 package jenkins.plugins.office365connector;
 
+import org.apache.commons.lang.StringUtils;
+
 public class Proxy {
 
     private String ip;
@@ -48,11 +50,6 @@ public void setPassword(String password) {
     }
 
     public Boolean proxyConfigured() {
-        try {
-            return (this.ip != null && this.ip != "");
-
-        } catch (NullPointerException ex) {
-            return false;
-        }
+        return (StringUtils.isEmpty(this.ip) && StringUtils.isEmpty(String.valueOf(this.port)));
     }
 }

From 7af49d543a5e2184fd1734c79110e3bc39d6c6c5 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Mon, 25 Jul 2022 20:47:13 +0200
Subject: [PATCH 10/21] Using temp reference to descriptor

---
 src/main/java/jenkins/plugins/office365connector/Webhook.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index 3f85d24..090458f 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -64,7 +64,9 @@ public DescriptorImpl getDescriptor() {
     @DataBoundConstructor
     public Webhook(String url) {
         this.url = StringUtils.isEmpty(url) ? getDescriptor().getGlobalUrl() : url;
-        this.setProxyPluginConfiguration(getDescriptor().getIp(), getDescriptor().getPort(), getDescriptor().getUsername(), getDescriptor().getPassword());
+
+        DescriptorImpl globalConfig = getDescriptor();
+        this.setProxyPluginConfiguration(globalConfig.getIp(), globalConfig.getPort(), globalConfig.getUsername(), globalConfig.getPassword());
     }
 
     public String getUrl() {

From ae547e4b5478f1c10e6a2012e3836cac2517e4c8 Mon Sep 17 00:00:00 2001
From: Leemalin Moodley <leemalin.moodley@aciworldwide.com>
Date: Wed, 3 Aug 2022 11:24:27 +0200
Subject: [PATCH 11/21] Fixed return condition

---
 src/main/java/jenkins/plugins/office365connector/Proxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
index 977d4a9..6a3fb7d 100644
--- a/src/main/java/jenkins/plugins/office365connector/Proxy.java
+++ b/src/main/java/jenkins/plugins/office365connector/Proxy.java
@@ -50,6 +50,6 @@ public void setPassword(String password) {
     }
 
     public Boolean proxyConfigured() {
-        return (StringUtils.isEmpty(this.ip) && StringUtils.isEmpty(String.valueOf(this.port)));
+        return (!StringUtils.isEmpty(this.ip) && !StringUtils.isEmpty(String.valueOf(this.port)));
     }
 }

From 09bac61fcb495bea96b9d6a6b74a846710db7730 Mon Sep 17 00:00:00 2001
From: Leemalin Moodley <leemalin.moodley@aciworldwide.com>
Date: Wed, 3 Aug 2022 11:43:41 +0200
Subject: [PATCH 12/21] reverted plugin version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4f0874..5e51d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.jenkins-ci.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
-                <version>3.17</version>
+                <version>3.5</version>
                 <configuration>
                     <!-- Jenkins test InjectedTest renamed to InjectedIT so it is executed only during integration tests -->
                     <injectedTestName>InjectionIT</injectedTestName>

From 9b4b793a78cbc842c4ed9dfb44e9aac3a6233fcc Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Wed, 31 Aug 2022 10:54:16 +0200
Subject: [PATCH 13/21] Set IOException instead of generic Exception

---
 .../java/jenkins/plugins/office365connector/HttpWorker.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
index a9a90e1..7399d17 100644
--- a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
+++ b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
@@ -13,6 +13,7 @@
  */
 package jenkins.plugins.office365connector;
 
+import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
@@ -94,7 +95,7 @@ public void run() {
                 } else {
                     success = true;
                 }
-            } catch (Exception e) {
+            } catch (IOException e) {
                 log("Failed to post data to webhook - %s", url);
                 e.printStackTrace(logger);
             } finally {

From a09c19ecc1bc843d6e95c2adabf6b2ab2ae981b8 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Wed, 31 Aug 2022 11:02:44 +0200
Subject: [PATCH 14/21] proxyConfigured takes into account empty, blank and
 null strings

---
 src/main/java/jenkins/plugins/office365connector/Proxy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
index 6a3fb7d..d1fc435 100644
--- a/src/main/java/jenkins/plugins/office365connector/Proxy.java
+++ b/src/main/java/jenkins/plugins/office365connector/Proxy.java
@@ -50,6 +50,7 @@ public void setPassword(String password) {
     }
 
     public Boolean proxyConfigured() {
-        return (!StringUtils.isEmpty(this.ip) && !StringUtils.isEmpty(String.valueOf(this.port)));
+        return ((!StringUtils.isEmpty(this.ip) && !StringUtils.isEmpty(String.valueOf(this.port)))
+                && (!StringUtils.isBlank(this.ip) && !StringUtils.isBlank(String.valueOf(this.port))));
     }
 }

From be436e60d0d751332bbd0db2eb6a47c7e65122d6 Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Fri, 4 Nov 2022 11:03:18 +0200
Subject: [PATCH 15/21] Removed ProxyTest.java

---
 .../plugins/office365connector/Proxy.java     | 56 -------------------
 .../plugins/office365connector/ProxyTest.java | 49 ----------------
 2 files changed, 105 deletions(-)
 delete mode 100644 src/main/java/jenkins/plugins/office365connector/Proxy.java
 delete mode 100644 src/test/java/jenkins/plugins/office365connector/ProxyTest.java

diff --git a/src/main/java/jenkins/plugins/office365connector/Proxy.java b/src/main/java/jenkins/plugins/office365connector/Proxy.java
deleted file mode 100644
index d1fc435..0000000
--- a/src/main/java/jenkins/plugins/office365connector/Proxy.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package jenkins.plugins.office365connector;
-
-import org.apache.commons.lang.StringUtils;
-
-public class Proxy {
-
-    private String ip;
-    private Integer port;
-    private String username;
-    private String password;
-
-
-    public Proxy(String ip, Integer port, String username, String password) {
-        this.ip = ip;
-        this.port = port;
-        this.username = username;
-        this.password = password;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public Boolean proxyConfigured() {
-        return ((!StringUtils.isEmpty(this.ip) && !StringUtils.isEmpty(String.valueOf(this.port)))
-                && (!StringUtils.isBlank(this.ip) && !StringUtils.isBlank(String.valueOf(this.port))));
-    }
-}
diff --git a/src/test/java/jenkins/plugins/office365connector/ProxyTest.java b/src/test/java/jenkins/plugins/office365connector/ProxyTest.java
deleted file mode 100644
index 83a5945..0000000
--- a/src/test/java/jenkins/plugins/office365connector/ProxyTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jenkins.plugins.office365connector;
-
-import junit.framework.TestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ProxyTest {
-
-    private Proxy proxyTest;
-    private Proxy proxyTestNoCredentials;
-
-    @Before
-    public void setUp() {
-        proxyTest = new Proxy("10.0.0.1", 65654, "myUsername", "myPassword");
-        proxyTestNoCredentials = new Proxy("10.0.0.1", 65654, null, null);
-    }
-
-    @Test
-    public void getIp() {
-        assertThat("10.0.0.1").isEqualTo(proxyTest.getIp());
-    }
-
-    @Test
-    public void getPort() {
-        assertThat(65654).isEqualTo(proxyTest.getPort());
-    }
-
-    @Test
-    public void getUsername() {
-        assertThat("myUsername").isEqualTo(proxyTest.getUsername());
-    }
-
-    @Test
-    public void getPassword() {
-        assertThat("myPassword").isEqualTo(proxyTest.getPassword());
-    }
-
-    @Test
-    public void proxyConfigured_True() {
-        assertThat(proxyTest.proxyConfigured().equals(true));
-    }
-
-    @Test
-    public void proxyConfigured_False() {
-        assertThat(proxyTest.proxyConfigured().equals(false));
-    }
-}
\ No newline at end of file

From fc028d1247f4fc431b58332c183313f4759bb6fc Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Fri, 4 Nov 2022 11:05:26 +0200
Subject: [PATCH 16/21] Using jenkins ProxyConfigration to handle plugin proxy
 info

---
 .../plugins/office365connector/HttpWorker.java    | 15 +++++++--------
 .../plugins/office365connector/Webhook.java       | 13 ++++++++-----
 .../office365connector/HttpWorkerTest.java        | 10 +++++-----
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
index 7399d17..5347b52 100644
--- a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
+++ b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
@@ -43,7 +43,7 @@ public class HttpWorker implements Runnable {
 
     private final PrintStream logger;
 
-    private final Proxy pluginProxy;
+    private final ProxyConfiguration pluginProxy;
 
     private final String url;
     private final String data;
@@ -51,7 +51,7 @@ public class HttpWorker implements Runnable {
 
     private static final int RETRIES = 3;
 
-    public HttpWorker(String url, String data, int timeout, PrintStream logger, Proxy pluginProxy) {
+    public HttpWorker(String url, String data, int timeout, PrintStream logger, ProxyConfiguration pluginProxy) {
         this.url = url;
         this.data = data;
         this.timeout = timeout;
@@ -108,14 +108,13 @@ public void run() {
     private HttpClient getHttpClient() {
         HttpClient client = new HttpClient();
         Jenkins jenkins = Jenkins.get();
-        if (pluginProxy.proxyConfigured()) {
-            client.getHostConfiguration().setProxy(pluginProxy.getIp(), pluginProxy.getPort());
-            if (StringUtils.isNotBlank(pluginProxy.getUsername())) {
+        if (pluginProxy != null) {
+            client.getHostConfiguration().setProxy(pluginProxy.getName(), pluginProxy.getPort());
+            if (StringUtils.isNotBlank(pluginProxy.getUserName())) {
                 client.getState().setProxyCredentials(AuthScope.ANY,
-                        new UsernamePasswordCredentials(pluginProxy.getUsername(), pluginProxy.getPassword()));
+                        new UsernamePasswordCredentials(pluginProxy.getUserName(), pluginProxy.getPassword()));
             }
-        }
-        if (jenkins != null) {
+        } else if (jenkins != null) {
             ProxyConfiguration proxy = jenkins.proxy;
             // Check job proxy first
             if (proxy != null) {
diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index 090458f..2b652d2 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import javax.annotation.Nonnull;
 import hudson.Extension;
+import hudson.ProxyConfiguration;
 import hudson.Util;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
@@ -50,7 +51,7 @@ public class Webhook extends AbstractDescribableImpl<Webhook> {
 
     private int timeout;
 
-    private Proxy pluginProxy;
+    private ProxyConfiguration pluginProxy;
 
     private List<Macro> macros = Collections.emptyList();
 
@@ -66,7 +67,9 @@ public Webhook(String url) {
         this.url = StringUtils.isEmpty(url) ? getDescriptor().getGlobalUrl() : url;
 
         DescriptorImpl globalConfig = getDescriptor();
-        this.setProxyPluginConfiguration(globalConfig.getIp(), globalConfig.getPort(), globalConfig.getUsername(), globalConfig.getPassword());
+        if (globalConfig.getIp().length() > 0) {
+            this.setProxyPluginConfiguration(globalConfig.getIp(), globalConfig.getPort(), globalConfig.getUsername(), globalConfig.getPassword());
+        }
     }
 
     public String getUrl() {
@@ -77,12 +80,12 @@ public String getName() {
         return Util.fixEmptyAndTrim(StringUtils.isEmpty(name) ? getDescriptor().getGlobalName() : name);
     }
 
-    public Proxy getPluginProxy() {
+    public ProxyConfiguration getPluginProxy() {
         return this.pluginProxy;
     }
 
-    public void setProxyPluginConfiguration(String proxyIp, Integer proxyPort, String proxyUsername, String proxyPassword) {
-        this.pluginProxy = new Proxy(proxyIp, proxyPort, proxyUsername, proxyPassword);
+    public void setProxyPluginConfiguration(String proxyIp, int proxyPort, String proxyUsername, String proxyPassword) {
+        this.pluginProxy = new ProxyConfiguration(proxyIp, proxyPort, proxyUsername, proxyPassword);
     }
 
     @DataBoundSetter
diff --git a/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java b/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
index 67b890a..3062757 100644
--- a/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
@@ -37,7 +37,7 @@ public void HttpWorker_getHttpClient_NoJenkinsProxy() throws NoSuchMethodExcepti
 
         // given
         // from @Before
-        Proxy thisPluginProxy = new Proxy(null, null, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration(null, 0, null, null);
         HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);
@@ -55,7 +55,7 @@ public void HttpWorker_getHttpClient_JenkinsProxy() throws NoSuchMethodException
 
         // given
         // from @Before
-        Proxy thisPluginProxy = new Proxy(null, null, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration(null, 0, null, null);
         Jenkins jenkins = Jenkins.get();
         ProxyConfiguration proxyConfiguration = new ProxyConfiguration("name", 123, null, null, "*mockwebsite.com*");
         jenkins.proxy = proxyConfiguration;
@@ -77,7 +77,7 @@ public void HttpWorker_getHttpClient_JenkinsProxy_Ignored() throws NoSuchMethodE
 
         // given
         // from @Before
-        Proxy thisPluginProxy = new Proxy(null, null, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration(null, 0, null, null);
         Jenkins jenkins = Jenkins.get();
         ProxyConfiguration proxyConfiguration = new ProxyConfiguration("name", 123, null, null, "*mockwebsite.com*");
         jenkins.proxy = proxyConfiguration;
@@ -99,7 +99,7 @@ public void HttpWorker_getHttpClient_PluginProxy() throws NoSuchMethodException
 
         // given
         // from @Before
-        Proxy thisPluginProxy = new Proxy("10.0.0.1", 12345, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration("10.0.0.1", 12345, null, null);
         HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);
@@ -108,7 +108,7 @@ public void HttpWorker_getHttpClient_PluginProxy() throws NoSuchMethodException
         HttpClient httpClient = (HttpClient) ReflectionUtils.invokeMethod(method, httpWorker);
 
         // then
-        assertThat(httpClient.getHostConfiguration().getProxyHost()).isEqualTo(thisPluginProxy.getIp());
+        assertThat(httpClient.getHostConfiguration().getProxyHost()).isEqualTo(thisPluginProxy.getName());
         assertThat(httpClient.getHostConfiguration().getProxyPort()).isEqualTo(thisPluginProxy.getPort());
     }
 }
\ No newline at end of file

From 7f5db722ee58fc4bf34135ddcaeea6b61973305f Mon Sep 17 00:00:00 2001
From: Lee <leemalin.moodley@gmail.com>
Date: Mon, 7 Nov 2022 23:47:24 +0200
Subject: [PATCH 17/21] Refactored to reference ProxyConfiguration in
 Office365ConnectorWebhookNotifier

---
 .../office365connector/HttpWorker.java        |  2 +-
 .../Office365ConnectorWebhookNotifier.java    | 10 ++++-
 .../plugins/office365connector/Webhook.java   | 41 ++++++-------------
 .../office365connector/HttpWorkerTest.java    |  8 ++--
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
index 5347b52..ce6088b 100644
--- a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
+++ b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
@@ -108,7 +108,7 @@ public void run() {
     private HttpClient getHttpClient() {
         HttpClient client = new HttpClient();
         Jenkins jenkins = Jenkins.get();
-        if (pluginProxy != null) {
+        if (!StringUtils.isEmpty(pluginProxy.getName())) {
             client.getHostConfiguration().setProxy(pluginProxy.getName(), pluginProxy.getPort());
             if (StringUtils.isNotBlank(pluginProxy.getUserName())) {
                 client.getState().setProxyCredentials(AuthScope.ANY,
diff --git a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
index ce9738f..9b1fb03 100644
--- a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
+++ b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
@@ -23,6 +23,7 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import hudson.ProxyConfiguration;
 import hudson.model.AbstractBuild;
 import hudson.model.Job;
 import hudson.model.Run;
@@ -112,7 +113,14 @@ private void executeWorker(Webhook webhook, Card card) {
         try {
             String url = run.getEnvironment(taskListener).expand(webhook.getUrl());
             String data = gson.toJson(card);
-            HttpWorker worker = new HttpWorker(url, data, webhook.getTimeout(), taskListener.getLogger(), webhook.getPluginProxy());
+
+            Integer port = 0;
+            if (!StringUtils.isEmpty(webhook.getDescriptor().getPort())) {
+                port = Integer.parseInt(webhook.getDescriptor().getPort());
+            }
+
+            ProxyConfiguration pluginProxy = new ProxyConfiguration(webhook.getDescriptor().getIp(), port, webhook.getDescriptor().getUsername(), webhook.getDescriptor().getPassword());
+            HttpWorker worker = new HttpWorker(url, data, webhook.getTimeout(), taskListener.getLogger(), pluginProxy);
             worker.submit();
         } catch (IOException | InterruptedException | RejectedExecutionException e) {
             log(String.format("Failed to notify webhook: %s", webhook.getName()));
diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index 2b652d2..5fa06c4 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -51,8 +51,6 @@ public class Webhook extends AbstractDescribableImpl<Webhook> {
 
     private int timeout;
 
-    private ProxyConfiguration pluginProxy;
-
     private List<Macro> macros = Collections.emptyList();
 
     private List<FactDefinition> factDefinitions = Collections.emptyList();
@@ -65,11 +63,6 @@ public DescriptorImpl getDescriptor() {
     @DataBoundConstructor
     public Webhook(String url) {
         this.url = StringUtils.isEmpty(url) ? getDescriptor().getGlobalUrl() : url;
-
-        DescriptorImpl globalConfig = getDescriptor();
-        if (globalConfig.getIp().length() > 0) {
-            this.setProxyPluginConfiguration(globalConfig.getIp(), globalConfig.getPort(), globalConfig.getUsername(), globalConfig.getPassword());
-        }
     }
 
     public String getUrl() {
@@ -80,14 +73,6 @@ public String getName() {
         return Util.fixEmptyAndTrim(StringUtils.isEmpty(name) ? getDescriptor().getGlobalName() : name);
     }
 
-    public ProxyConfiguration getPluginProxy() {
-        return this.pluginProxy;
-    }
-
-    public void setProxyPluginConfiguration(String proxyIp, int proxyPort, String proxyUsername, String proxyPassword) {
-        this.pluginProxy = new ProxyConfiguration(proxyIp, proxyPort, proxyUsername, proxyPassword);
-    }
-
     @DataBoundSetter
     public void setName(String name) {
         this.name = Util.fixEmptyAndTrim(name);
@@ -200,11 +185,10 @@ public static class DescriptorImpl extends Descriptor<Webhook> {
         private String globalName;
 
         private String ip;
+        private String port;
         private String username;
         private String password;
 
-        private Integer port;
-
         public DescriptorImpl() {
             load();
         }
@@ -216,39 +200,40 @@ public String getDisplayName() {
         }
 
         public String getIp() {
-            return ip;
+            return Util.fixNull(ip);
         }
 
         @DataBoundSetter
         public void setIp(String ip) {
-            this.ip = ip;
+            this.ip = Util.fixNull(ip);
         }
 
         public String getUsername() {
-            return username;
+            return Util.fixNull(username);
         }
 
         @DataBoundSetter
         public void setUsername(String username) {
-            this.username = username;
+            this.username = Util.fixNull(username);
         }
 
         public String getPassword() {
-            return password;
+            return Util.fixNull(password);
         }
 
         @DataBoundSetter
         public void setPassword(String password) {
-            this.password = password;
+            this.password = Util.fixNull(password);
         }
 
-        public Integer getPort() {
-            return port;
+        @Nonnull
+        public String getPort() {
+            return Util.fixNull(port);
         }
 
         @DataBoundSetter
-        public void setPort(Integer port) {
-            this.port = port;
+        public void setPort(String port) {
+            this.port = Util.fixNull(port);
         }
 
         public int getDefaultTimeout() {
@@ -259,7 +244,7 @@ public FormValidation doCheckUrl(@QueryParameter String value) {
             return FormUtils.formValidateUrl(value);
         }
 
-       public FormValidation doCheckGlobalUrl(@QueryParameter String value) {
+        public FormValidation doCheckGlobalUrl(@QueryParameter String value) {
             if(StringUtils.isNotBlank(value)) {
                 return FormUtils.formValidateUrl(value);
             } else {
diff --git a/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java b/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
index 3062757..f2e0ee2 100644
--- a/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/HttpWorkerTest.java
@@ -37,7 +37,7 @@ public void HttpWorker_getHttpClient_NoJenkinsProxy() throws NoSuchMethodExcepti
 
         // given
         // from @Before
-        ProxyConfiguration thisPluginProxy = new ProxyConfiguration(null, 0, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration("", 0, "", "");
         HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);
@@ -55,7 +55,7 @@ public void HttpWorker_getHttpClient_JenkinsProxy() throws NoSuchMethodException
 
         // given
         // from @Before
-        ProxyConfiguration thisPluginProxy = new ProxyConfiguration(null, 0, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration("", 0, "", "");
         Jenkins jenkins = Jenkins.get();
         ProxyConfiguration proxyConfiguration = new ProxyConfiguration("name", 123, null, null, "*mockwebsite.com*");
         jenkins.proxy = proxyConfiguration;
@@ -77,7 +77,7 @@ public void HttpWorker_getHttpClient_JenkinsProxy_Ignored() throws NoSuchMethodE
 
         // given
         // from @Before
-        ProxyConfiguration thisPluginProxy = new ProxyConfiguration(null, 0, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration("", 0, "", "");
         Jenkins jenkins = Jenkins.get();
         ProxyConfiguration proxyConfiguration = new ProxyConfiguration("name", 123, null, null, "*mockwebsite.com*");
         jenkins.proxy = proxyConfiguration;
@@ -99,7 +99,7 @@ public void HttpWorker_getHttpClient_PluginProxy() throws NoSuchMethodException
 
         // given
         // from @Before
-        ProxyConfiguration thisPluginProxy = new ProxyConfiguration("10.0.0.1", 12345, null, null);
+        ProxyConfiguration thisPluginProxy = new ProxyConfiguration("10.0.0.1", 12345, "", "");
         HttpWorker httpWorker = new HttpWorker("http://127.0.0.1", "{}", 30, System.out, thisPluginProxy);
         Method method = HttpWorker.class.getDeclaredMethod("getHttpClient");
         method.setAccessible(true);

From 2b87fb50e319a76d5bb956d7d5a90de91aa826f2 Mon Sep 17 00:00:00 2001
From: Leemalin Moodley <leemalin.moodley@aciworldwide.com>
Date: Tue, 6 Dec 2022 11:53:31 +0200
Subject: [PATCH 18/21] renamed ip to host

---
 .../Office365ConnectorWebhookNotifier.java    |  2 +-
 .../plugins/office365connector/Webhook.java   | 31 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
index 9b1fb03..1c402b4 100644
--- a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
+++ b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
@@ -119,7 +119,7 @@ private void executeWorker(Webhook webhook, Card card) {
                 port = Integer.parseInt(webhook.getDescriptor().getPort());
             }
 
-            ProxyConfiguration pluginProxy = new ProxyConfiguration(webhook.getDescriptor().getIp(), port, webhook.getDescriptor().getUsername(), webhook.getDescriptor().getPassword());
+            ProxyConfiguration pluginProxy = new ProxyConfiguration(webhook.getDescriptor().getHost(), port, webhook.getDescriptor().getUsername(), webhook.getDescriptor().getPassword());
             HttpWorker worker = new HttpWorker(url, data, webhook.getTimeout(), taskListener.getLogger(), pluginProxy);
             worker.submit();
         } catch (IOException | InterruptedException | RejectedExecutionException e) {
diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index 5fa06c4..6af7102 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import javax.annotation.Nonnull;
 import hudson.Extension;
-import hudson.ProxyConfiguration;
 import hudson.Util;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
@@ -184,7 +183,7 @@ public static class DescriptorImpl extends Descriptor<Webhook> {
         private String globalUrl;
         private String globalName;
 
-        private String ip;
+        private String host;
         private String port;
         private String username;
         private String password;
@@ -199,13 +198,23 @@ public String getDisplayName() {
             return "Webhook";
         }
 
-        public String getIp() {
-            return Util.fixNull(ip);
+        public String getHost() {
+            return Util.fixNull(host);
         }
 
         @DataBoundSetter
-        public void setIp(String ip) {
-            this.ip = Util.fixNull(ip);
+        public void setHost(String host) {
+            this.host = Util.fixNull(host);
+        }
+
+        @Nonnull
+        public String getPort() {
+            return Util.fixNull(port);
+        }
+
+        @DataBoundSetter
+        public void setPort(String port) {
+            this.port = Util.fixNull(port);
         }
 
         public String getUsername() {
@@ -226,16 +235,6 @@ public void setPassword(String password) {
             this.password = Util.fixNull(password);
         }
 
-        @Nonnull
-        public String getPort() {
-            return Util.fixNull(port);
-        }
-
-        @DataBoundSetter
-        public void setPort(String port) {
-            this.port = Util.fixNull(port);
-        }
-
         public int getDefaultTimeout() {
             return Webhook.DEFAULT_TIMEOUT;
         }

From b728aba4d467b21a1e4d7a091bd791f8cf122645 Mon Sep 17 00:00:00 2001
From: Leemalin Moodley <leemalin.moodley@aciworldwide.com>
Date: Tue, 6 Dec 2022 11:54:24 +0200
Subject: [PATCH 19/21] fixed whitespace in xml entry

---
 .../jenkins/plugins/office365connector/Webhook/config.jelly     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly b/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly
index 71e421b..6917e9a 100644
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/config.jelly
@@ -14,7 +14,7 @@
                 This section defines for which build statuses the notification is sent.
             </f:description>
 
-            <f:entry title="Notify Build Start" field="startNotification" >
+            <f:entry title="Notify Build Start" field="startNotification">
                 <f:checkbox/>
             </f:entry>
 

From 4dd524545fc161846c4afe36e68bb8cf74d7def2 Mon Sep 17 00:00:00 2001
From: Leemalin Moodley <leemalin.moodley@aciworldwide.com>
Date: Tue, 6 Dec 2022 11:57:26 +0200
Subject: [PATCH 20/21] Use of term configuration

---
 .../jenkins/plugins/office365connector/Webhook/global.jelly   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly b/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
index f4ebda3..79142b9 100755
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/global.jelly
@@ -8,12 +8,12 @@
                 <f:textbox/>
             </f:entry>
         <f:advanced>
-            <f:section title="Proxy Config">
+            <f:section title="Proxy Configuration">
                 <f:description>
                     This section defines the Office365Connector proxy settings that will apply to all webhook notifications. This
                     proxy configuration will be prioritized over the Jenkins global proxy config
                 </f:description>
-                <f:entry title="IP" field="ip">
+                <f:entry title="Host" field="host">
                     <f:textbox/>
                 </f:entry>
                 <f:entry title="Port" field="port">

From 29db0ddfab98c4ab640aa7d5b8ac41cd29d1febd Mon Sep 17 00:00:00 2001
From: Leemalin Moodley <leemalin.moodley@aciworldwide.com>
Date: Tue, 6 Dec 2022 11:57:46 +0200
Subject: [PATCH 21/21] Updating jelly help documentation

---
 .../jenkins/plugins/office365connector/Webhook/help-host.html   | 1 +
 .../jenkins/plugins/office365connector/Webhook/help-ip.html     | 1 -
 .../jenkins/plugins/office365connector/Webhook/help-port.html   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/jenkins/plugins/office365connector/Webhook/help-host.html
 delete mode 100644 src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html

diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-host.html b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-host.html
new file mode 100644
index 0000000..87a8c3b
--- /dev/null
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-host.html
@@ -0,0 +1 @@
+<div align="help">The hostname or ip address of the proxy server</div>
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html
deleted file mode 100644
index a62c127..0000000
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-ip.html
+++ /dev/null
@@ -1 +0,0 @@
-<div align="help">The IP address of the proxy server</div>
diff --git a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html
index 75e11bd..fb85fe5 100644
--- a/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html
+++ b/src/main/resources/jenkins/plugins/office365connector/Webhook/help-port.html
@@ -1 +1 @@
-<div align="help">This field works in conjunction with the ip field to specify the HTTP proxy port.</div>
+<div align="help">This field works in conjunction with the host field to specify the HTTP proxy port.</div>