Merge pull request #13 from cjkappd/master

Updating to more secure dependencies, adding JUnit5 test
Appdynamics · Sep 9, 2024 · 066eab0 · 066eab0
2 parents f9370dd + df2e96f
commit 066eab0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+#### 2.2.3 - Aug 29, 2024,
+1. Upgraded to appd-exts-commons 2.2.13
+2. 
 ### 2.2.2 - Jan 08, 2021
 1. Upgraded to appd-exts-commons 2.2.4
 

diff --git a/pom.xml b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2014. AppDynamics LLC and its affiliates.
   ~  * All Rights Reserved.
@@ -11,7 +12,7 @@
 
     <groupId>com.appdynamics.extensions</groupId>
     <artifactId>haproxy-monitoring-extension</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3</version>
     <packaging>jar</packaging>
 
     <name>haproxy-monitoring-extension</name>
@@ -33,7 +34,7 @@
         <dependency>
             <groupId>com.appdynamics</groupId>
             <artifactId>appd-exts-commons</artifactId>
-            <version>2.2.4</version>
+            <version>2.2.13</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/src/test/java/com/appdynamics/extensions/haproxy/HAProxyMonitorTaskTest.java b/src/test/java/com/appdynamics/extensions/haproxy/HAProxyMonitorTaskTest.java
@@ -9,11 +9,19 @@
 
 package com.appdynamics.extensions.haproxy;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
 import com.appdynamics.extensions.MetricWriteHelper;
 import com.appdynamics.extensions.TasksExecutionServiceProvider;
 import com.appdynamics.extensions.conf.MonitorContext;
 import com.appdynamics.extensions.conf.MonitorContextConfiguration;
-import com.appdynamics.extensions.haproxy.config.*;
+import com.appdynamics.extensions.haproxy.config.MetricConfig;
+import com.appdynamics.extensions.haproxy.config.MetricConverter;
+import com.appdynamics.extensions.haproxy.config.ProxyServerConfig;
+import com.appdynamics.extensions.haproxy.config.ProxyStats;
+import com.appdynamics.extensions.haproxy.config.ServerConfig;
+import com.appdynamics.extensions.haproxy.config.Stat;
 import com.appdynamics.extensions.http.HttpClientUtils;
 import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
 import com.appdynamics.extensions.metrics.Metric;
@@ -37,12 +45,17 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.slf4j.Logger;
 
-import java.io.*;
-import java.util.*;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  *