Merge pull request #27 from Hi-Fi/ownHttpClient

Own http client
MarketSquare · Apr 5, 2017 · 455f9a1 · 455f9a1
2 parents 184d5b6 + 21b70b8
commit 455f9a1
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 878 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,6 @@ pom.xml.next
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
+.classpath
+.settings
+.project
diff --git a/.project b/.project
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,3 @@
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -48,8 +47,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<keywords.class>HttpRequestLibrary</keywords.class>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<powermock.version>1.6.5</powermock.version>
-		<httpclient.version>0.0.1</httpclient.version>
+		<powermock.version>1.6.5</powermock.version>
+		<httpclient.version>0.0.1</httpclient.version>
 	</properties>
 
 	<dependencies>
@@ -66,8 +65,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.hi-fi</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</version>
+			<artifactId>httpclient</artifactId>
+			<version>${httpclient.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>

diff --git a/src/main/java/HttpRequestLibrary.java b/src/main/java/HttpRequestLibrary.java
@@ -6,6 +6,7 @@ public class HttpRequestLibrary extends AnnotationLibrary {
 
 	public HttpRequestLibrary() {
 		super("com/github/hi_fi/httprequestlibrary/keywords/**");
+		System.setProperty("org.apache.commons.logging.Log", "com.github.hi_fi.httprequestlibrary.utils.RobotLogger");
 	}
 
 	@Override

diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/domain/Authentication.java b/src/main/java/com/github/hi_fi/httprequestlibrary/domain/Authentication.java
diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/domain/ResponseData.java b/src/main/java/com/github/hi_fi/httprequestlibrary/domain/ResponseData.java
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
diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Assert.java b/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Assert.java
@@ -4,7 +4,7 @@
 import org.robotframework.javalib.annotation.RobotKeyword;
 import org.robotframework.javalib.annotation.RobotKeywords;
 
-import com.github.hi_fi.httprequestlibrary.utils.RestClient;
+import com.github.hi_fi.httpclient.RestClient;
 import com.github.hi_fi.httprequestlibrary.utils.Robot;
 
 @RobotKeywords

diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Delete.java b/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Delete.java
@@ -7,8 +7,8 @@
 import org.robotframework.javalib.annotation.RobotKeyword;
 import org.robotframework.javalib.annotation.RobotKeywords;
 
-import com.github.hi_fi.httprequestlibrary.domain.ResponseData;
-import com.github.hi_fi.httprequestlibrary.utils.RestClient;
+import com.github.hi_fi.httpclient.RestClient;
+import com.github.hi_fi.httpclient.domain.ResponseData;
 import com.github.hi_fi.httprequestlibrary.utils.Robot;
 
 @RobotKeywords

diff --git a/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Get.java b/src/main/java/com/github/hi_fi/httprequestlibrary/keywords/Get.java
@@ -7,8 +7,8 @@
 import org.robotframework.javalib.annotation.RobotKeyword;
 import org.robotframework.javalib.annotation.RobotKeywords;
 
-import com.github.hi_fi.httprequestlibrary.domain.ResponseData;
-import com.github.hi_fi.httprequestlibrary.utils.RestClient;
+import com.github.hi_fi.httpclient.RestClient;
+import com.github.hi_fi.httpclient.domain.ResponseData;
 import com.github.hi_fi.httprequestlibrary.utils.Robot;
 
 @RobotKeywords