New http client

pom.xml

@@ -22,6 +22,8 @@
     <description>A simple rest client, used by the RestFixture</description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <mave.compiler.target>1.8</mave.compiler.target>
+        <mave.compiler.source>1.8</mave.compiler.source>
     </properties>
     <licenses>
         <license>
@@ -53,14 +55,25 @@
     </issueManagement>
     <dependencies>
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -76,8 +89,14 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.0</version>
+            <artifactId>mockito-core</artifactId>
+            <version>3.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>3.9.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -93,8 +112,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.5.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -149,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.12.2</version>
+                <version>2.12.4</version>
                 <configuration>
                     <!-- place your configuration here -->
                 </configuration>

src/main/java/smartrics/rest/client/RestData.java

@@ -75,8 +75,8 @@ public String toString() {
 		}
 	}
 
-	private final List<Header> headers = new ArrayList<Header>();
-	private byte raw[];
+	private final List<Header> headers = new ArrayList<>();
+	private byte[] raw;
 	private String resource;
 	private Long transactionId;
 
@@ -170,7 +170,7 @@ public List<Header> getHeaders() {
 	 * @return the sub-list of headers with the same name
 	 */
 	public List<Header> getHeader(String name) {
-		List<Header> headersWithTheSameName = new ArrayList<Header>();
+		List<Header> headersWithTheSameName = new ArrayList<>();
 		for (Header h : headers) {
 			if (h.getName().equalsIgnoreCase(name)) {
 				headersWithTheSameName.add(h);

src/main/java/smartrics/rest/client/RestMultipart.java

@@ -23,11 +23,11 @@ public enum RestMultipartType {
      * @param stringValue The String content or the file Path
      */
     public RestMultipart(RestMultipartType type, String stringValue) {
-        this(type, stringValue, (String)null, (String)null);
+        this(type, stringValue, null, null);
     }
 
     public RestMultipart(RestMultipartType type,String stringValue, String contentType) {
-        this(type, stringValue, contentType, (String)null);
+        this(type, stringValue, contentType, null);
     }
 
     public RestMultipart(RestMultipartType type, String stringValue, String contentType, String charset) {

src/main/java/smartrics/rest/client/RestRequest.java

@@ -32,7 +32,7 @@ public class RestRequest extends RestData {
      * An http verb (those supported).
      */
     public enum Method {
-        Get, Post, Put, Delete, Head, Options, Trace
+        Get, Post, Put, Delete, Head, Options, Trace, Patch
     }
 
     private static final String FILE = "file";
@@ -41,7 +41,7 @@ public enum Method {
     private String multipartFileName;
     @Deprecated
     private String multipartFileParameterName = FILE;
-    private Map<String,RestMultipart> multipartFileByParamName = new LinkedHashMap<String, RestMultipart>();
+    private final Map<String,RestMultipart> multipartFileByParamName = new LinkedHashMap<>();
     private String query;
     private Method method;
     private boolean followRedirect = true;