Fix header injection for rest module and promote version (#26)

* Fix header injection for rest module and promote version

* Snapshot version bump

Author: kirillbilchenko

README.md

@@ -396,7 +396,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.34-SNAPSHOT</version>
+        <version>2.1.35-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.34-SNAPSHOT</version>
+        <version>2.1.35-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-core/src/main/java/net/lightbody/bmp/util/BrowserMobHttpUtil.java

@@ -171,7 +171,8 @@ public static boolean hasTextualContent(String contentType) {
                         contentType.startsWith("application/javascript") ||
                         contentType.startsWith("application/json") ||
                         contentType.startsWith("application/xml") ||
-                        contentType.startsWith("application/xhtml+xml")
+                        contentType.startsWith("application/xhtml+xml") ||
+                        (contentType.startsWith("application/") && contentType.endsWith("+json"))
                 );
     }
 

browsermob-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.34-SNAPSHOT</version>
+        <version>2.1.35-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.34-SNAPSHOT</version>
+        <version>2.1.35-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

browsermob-legacy/src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java

@@ -1100,7 +1100,8 @@ private boolean hasTextualContent(String contentType) {
 				contentType.startsWith("application/javascript")  ||
 				contentType.startsWith("application/json")  ||
 				contentType.startsWith("application/xml")  ||
-				contentType.startsWith("application/xhtml+xml");
+                contentType.startsWith("application/xhtml+xml") ||
+                (contentType.startsWith("application/") && contentType.endsWith("+json"));
 	}
 
 	private void setBinaryContentOfEntry(HarEntry entry, ByteArrayOutputStream copy) {

browsermob-rest/pom.xml

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

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

@@ -273,11 +273,13 @@ public Reply<?> updateHeaders(@Named("port") int port, Request<String> request)
 
         Map<String, String> mappedJsonRequest = request.read(Map.class).as(Json.class);
         mappedJsonRequest.entrySet().stream()
-                .filter(stringStringEntry -> stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp"))
+                .filter(stringStringEntry -> !stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp"))
                 .forEach(stringStringEntry -> proxy.addHeader(stringStringEntry.getKey(), stringStringEntry.getValue()));
 
         mappedJsonRequest.entrySet().stream().filter(stringStringEntry ->
-                stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp") && StringUtils.isNotEmpty(stringStringEntry.getValue())).findFirst().ifPresent(stringStringEntry -> proxy.headerFilterRegexp(stringStringEntry.getValue()));
+                stringStringEntry.getKey().equalsIgnoreCase("headersFilterRegexp")
+                        && StringUtils.isNotEmpty(stringStringEntry.getValue())).findFirst()
+                .ifPresent(stringStringEntry -> proxy.headerFilterRegexp(stringStringEntry.getValue()));
 
         return Reply.saying().ok();
     }

mitm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.34-SNAPSHOT</version>
+        <version>2.1.35-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.34-SNAPSHOT</version>
+    <version>2.1.35-SNAPSHOT</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>