Bmp 2.1.30 (#22)

* Added proxy pool size to be exposed

* fix properties

* Snapshot version promotion

Author: kirillbilchenko

README.md

@@ -395,7 +395,7 @@ When you build the latest code from source, you'll have access to the latest sna
     <dependency>
         <groupId>net.lightbody.bmp</groupId>
         <artifactId>browsermob-core</artifactId>
-        <version>2.1.30-SNAPSHOT</version>
+        <version>2.1.31-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 ```

browsermob-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.30-SNAPSHOT</version>
+        <version>2.1.31-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.30-SNAPSHOT</version>
+        <version>2.1.31-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-legacy/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.30-SNAPSHOT</version>
+        <version>2.1.31-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.30-SNAPSHOT</version>
+        <version>2.1.31-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java

@@ -32,22 +32,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
+import javax.script.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
+import java.util.*;
 
 @At("/proxy")
 @Service
@@ -684,12 +675,14 @@ public void setPort(int port) {
 
     public static class ProxyListDescriptor {
         private Collection<ProxyDescriptor> proxyList;
+        private int numberOfProxies;
 
         public ProxyListDescriptor() {
         }
 
         public ProxyListDescriptor(Collection<ProxyDescriptor> proxyList) {
             this.proxyList = proxyList;
+            this.numberOfProxies = proxyList.size();
         }
 
         public Collection<ProxyDescriptor> getProxyList() {
@@ -699,6 +692,15 @@ public Collection<ProxyDescriptor> getProxyList() {
         public void setProxyList(Collection<ProxyDescriptor> proxyList) {
             this.proxyList = proxyList;
         }
+
+        public int getNumberOfProxies() {
+            return numberOfProxies;
+        }
+
+        public ProxyListDescriptor setNumberOfProxies(int numberOfProxies) {
+            this.numberOfProxies = numberOfProxies;
+            return this;
+        }
     }
 
     public static class BandwidthLimitDescriptor {

mitm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.30-SNAPSHOT</version>
+        <version>2.1.31-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
-    <version>2.1.30-SNAPSHOT</version>
+    <version>2.1.31-SNAPSHOT</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>