Merge pull request #3 from Hi-Fi/release/0.0.1

Release/0.0.1
MarketSquare · Jan 18, 2017 · 668d631 · 668d631
2 parents 575ed3c + 724d23a
commit 668d631
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.hi-fi</groupId>
 	<artifactId>robotframework-httprequestlibrary</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1</version>
 	<packaging>jar</packaging>
 
 	<name>robotframework-httprequestlibrary</name>

diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/domain/Session.java b/src/main/java/com/github/hi_fi/httprequestlibrary/domain/Session.java
@@ -1,6 +1,7 @@
 package com.github.hi_fi.httprequestlibrary.domain;
 
 import java.io.IOException;
+import java.util.Map;
 
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
@@ -19,6 +20,7 @@ public class Session {
 	private Authentication authentication;
 	private HttpHost httpHost;
 	private String verify;
+	private Map<String, String> headers;
 
 	public String getAlias() {
 		return alias;
@@ -106,4 +108,12 @@ public String getVerify() {
 	public void setVerify(String verify) {
 		this.verify = verify;
 	}
+
+	public Map<String, String> getHeaders() {
+		return headers;
+	}
+
+	public void setHeaders(Map<String, String> headers) {
+		this.headers = headers;
+	}
 }
diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Session.java b/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Session.java
@@ -1,7 +1,9 @@
 package com.github.hi_fi.httprequestlibrary.keywords;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.robotframework.javalib.annotation.ArgumentNames;
 import org.robotframework.javalib.annotation.RobotKeyword;
@@ -18,20 +20,22 @@ public class Session {
 	@ArgumentNames({"alias", "url", "headers={}", "cookies=None", "auth=None", "timeout=None", "proxies=None", "verify=False", "debug=False", "max_retries=3", "backoff_factor=0.1", "disable_warnings=0"})
 	public void createSession(String alias, String url, String...params) {
 		RestClient rc = new RestClient();
+		Map<String, String> headers = Robot.getParamsValue(params, 0, new HashMap<String, String>());
 		String verify = Robot.getParamsValue(params, 5, "False");
 		Boolean debug = Boolean.parseBoolean(Robot.getParamsValue(params, 6, "False"));
 		Authentication auth = Authentication.getAuthentication(Robot.getParamsValue(params, 2, (List<String>) new ArrayList<String>()));
-		rc.createSession(alias, url, auth, verify, debug);
+		rc.createSession(alias, url, headers, auth, verify, debug);
 	}
 
 	@RobotKeyword
 	@ArgumentNames({"alias", "url", "headers={}", "cookies=None", "auth=None", "timeout=None", "proxies=None", "verify=False", "debug=False", "max_retries=3", "backoff_factor=0.1", "disable_warnings=0"})
 	public void createDigestSession(String alias, String url, String...params) {
 		RestClient rc = new RestClient();
+		Map<String, String> headers = Robot.getParamsValue(params, 0, new HashMap<String, String>());
 		String verify = Robot.getParamsValue(params, 5, "False");
 		Boolean debug = Boolean.parseBoolean(Robot.getParamsValue(params, 6, "False"));
 		Authentication auth = Authentication.getAuthentication(Robot.getParamsValue(params, 2, (List<String>) new ArrayList<String>()), Authentication.Type.DIGEST);
-		rc.createSession(alias, url, auth, verify, debug);
+		rc.createSession(alias, url, headers, auth, verify, debug);
 	}
 
 }
diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/utils/RestClient.java b/src/main/java/com/github/hi_fi/httprequestlibrary/utils/RestClient.java
@@ -56,7 +56,7 @@ public Session getSession(String alias) {
 		return sessions.get(alias);
 	}
 
-	public void createSession(String alias, String url, Authentication auth, String verify, Boolean debug) {
+	public void createSession(String alias, String url, Map<String, String> headers, Authentication auth, String verify, Boolean debug) {
 		if (debug) {
 			System.setProperty("org.apache.commons.logging.Log",
 					"com.github.hi_fi.httprequestlibrary.utils.RobotLogger");
@@ -72,6 +72,7 @@ public void createSession(String alias, String url, Authentication auth, String
 		session.setContext(this.createContext(auth, target));
 		session.setClient(this.createHttpClient(auth, verify, target, false));
 		session.setUrl(url);
+		session.setHeaders(headers);
 		session.setHttpHost(target);
 		session.setVerify(verify);
 		session.setAuthentication(auth);
@@ -141,6 +142,7 @@ private HttpEntity createFileEntity(Object files) {
 	}
 
 	private void makeRequest(HttpUriRequest request, Session session) {
+		request = this.setHeaders(request, session.getHeaders());
 		try {
 			session.setResponse(session.getClient().execute(request, session.getContext()));
 		} catch (ClientProtocolException e) {