Skip to content

ipgallery.common.java / utils

Go to a project
Commit ae92bfbd by Eli Ben Baruch
Options

## 1.2.3: 

 - add "mavenLocal", for local repository. enables to check this dependency locally
 - Handle correctly Exceptions in http requsts/responses
 - support Encoding type (other than utf8) in http responses
parent 6f707c20
Inline Side-by-side
Showing with 109 additions and 44 deletions
README.md 0 → 100644
### general utils
## 1.2.3:
- add "mavenLocal", for local repository. enables to check this dependency locally
- Handle correctly Exceptions in http requsts/responses
- support Encoding type (other than utf8) in http responses
build.gradle
group 'com.ipgallery.common' group 'com.ipgallery.common'
version '1.1.2' version '1.1.3'
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
//for mavenLocal
//apply plugin: 'maven'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
repositories { repositories {
//mavenCentral() //mavenCentral()
//use mavenLocal in cases you want to create this jar on your local machine
//or to be able to use one
//mavenLocal()
maven { url "http://172.16.1.132:8081/repository/internal" } maven { url "http://172.16.1.132:8081/repository/internal" }
maven { url "http://mandubian-mvn.googlecode.com/svn/trunk/mandubian-mvn/repository" } maven { url "http://mandubian-mvn.googlecode.com/svn/trunk/mandubian-mvn/repository" }
} }
...@@ -27,6 +33,18 @@ dependencies { ...@@ -27,6 +33,18 @@ dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11' testCompile group: 'junit', name: 'junit', version: '4.11'
} }
//1. use this install task (under "other" section)to create this jar localy on your machine.
// version will be extended with the Postfix "-LOCAL"
//2. in order to use this jar in a project:
// in the build.gradle add "mavenLocal()" as first repository
//and the dependency with correct version number ended with "-LOCAL"
//install {
// repositories.mavenInstaller {
// pom.version = version + '-LOCAL'
// }
//}
publishing { publishing {
publications { publications {
......
src/main/java/http/simpleHttpClient/SimpleHttpClient.java
...@@ -71,11 +71,14 @@ public class SimpleHttpClient { ...@@ -71,11 +71,14 @@ public class SimpleHttpClient {
if (resultResp != null) { if (resultResp != null) {
response = ParseResponseAndCookies(resultResp, defaulthttpClient.getCookieStore()); response = ParseResponseAndCookies(resultResp, defaulthttpClient.getCookieStore());
return response; return response;
}else
{
return new SimpleHttpResponse(500, "request execution failed");
} }
} catch (Exception e) { } catch (Exception e) {
return new SimpleHttpResponse(500, e.toString()); return new SimpleHttpResponse(500, e.toString());
} }
return null;
} }
public SimpleHttpResponse ParseResponseAndCookies(org.apache.http.HttpResponse response, CookieStore cookieStore) { public SimpleHttpResponse ParseResponseAndCookies(org.apache.http.HttpResponse response, CookieStore cookieStore) {
...@@ -99,7 +102,17 @@ public class SimpleHttpClient { ...@@ -99,7 +102,17 @@ public class SimpleHttpClient {
try { try {
HttpEntity httpEntity = response.getEntity(); HttpEntity httpEntity = response.getEntity();
if (httpEntity != null) { if (httpEntity != null) {
BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent())); BufferedReader rd;
Header contentEncoding = response.getEntity().getContentEncoding();
String contentEncodingValue = null;
if (contentEncoding != null)
contentEncodingValue = contentEncoding.getValue();
if (contentEncodingValue!= null)
rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent(),
contentEncodingValue));
else
rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
String line = ""; String line = "";
while ((line = rd.readLine()) != null) { while ((line = rd.readLine()) != null) {
......
src/main/java/http/simpleHttpClient/SimpleHttpRequest.java
...@@ -178,7 +178,7 @@ public class SimpleHttpRequest { ...@@ -178,7 +178,7 @@ public class SimpleHttpRequest {
return getRequest; return getRequest;
} }
protected HttpUriRequest buildPostRequest() { protected HttpUriRequest buildPostRequest() throws UnsupportedEncodingException {
// build URI // build URI
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
...@@ -206,19 +206,15 @@ public class SimpleHttpRequest { ...@@ -206,19 +206,15 @@ public class SimpleHttpRequest {
// add content // add content
if (content != null) { if (content != null) {
try {
StringEntity contentEntity = new StringEntity(content,"UTF-8"); StringEntity contentEntity = new StringEntity(content,"UTF-8");
contentEntity.setContentType(contentType); contentEntity.setContentType(contentType);
postRequest.setEntity(contentEntity); postRequest.setEntity(contentEntity);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
return postRequest; return postRequest;
} }
protected HttpUriRequest buildPutRequest() { protected HttpUriRequest buildPutRequest() throws UnsupportedEncodingException {
// build URI // build URI
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
...@@ -246,14 +242,10 @@ public class SimpleHttpRequest { ...@@ -246,14 +242,10 @@ public class SimpleHttpRequest {
// add content // add content
if (content != null) { if (content != null) {
try {
StringEntity contentEntity = new StringEntity(content); StringEntity contentEntity = new StringEntity(content);
//contentEntity.setContentType("application/json"); //contentEntity.setContentType("application/json");
contentEntity.setContentType(contentType); contentEntity.setContentType(contentType);
putRequest.setEntity(contentEntity); putRequest.setEntity(contentEntity);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
return putRequest; return putRequest;
......
src/main/java/http/simpleHttpClient/SimpleHttpResponse.java
...@@ -27,4 +27,23 @@ public class SimpleHttpResponse { ...@@ -27,4 +27,23 @@ public class SimpleHttpResponse {
public void setHeaders(Map<String, String> headers) { this.headers = headers; } public void setHeaders(Map<String, String> headers) { this.headers = headers; }
public String getContent() { return content; } public String getContent() { return content; }
public void setContent(String content) { this.content = content; } public void setContent(String content) { this.content = content; }
@Override
public String toString() {
StringBuilder respString;
try {
respString = new StringBuilder("statusCode=").append(statusCode).append(" content=");
if (content == null)
respString.append("null");
else
respString.append(content);
}
catch (Exception e){
return super.toString();
}
return respString.toString();
}
} }
src/main/java/http/simpleRestClient/SimpleRestClient.java
...@@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.google.gdata.util.common.base.PercentEscaper; import com.google.gdata.util.common.base.PercentEscaper;
public class SimpleRestClient extends SimpleHttpClient { public class SimpleRestClient extends SimpleHttpClient {
private static final String EMPTY_RESPONSE = "Empty response"; private static final String EMPTY_RESPONSE = "Empty response";
...@@ -90,15 +90,18 @@ import com.google.gdata.util.common.base.PercentEscaper; ...@@ -90,15 +90,18 @@ import com.google.gdata.util.common.base.PercentEscaper;
SimpleHttpRequest request = buildGetRequest(entity, params, requestParams); SimpleHttpRequest request = buildGetRequest(entity, params, requestParams);
try { try {
SimpleHttpResponse httpResp = processRequest(request); SimpleHttpResponse httpResp = processRequest(request);
return buildResp(httpResp);
} catch (UnsupportedEncodingException e) {
return new SimpleRestResponse(false, e.toString(),null);
}
}
private SimpleRestResponse buildResp(SimpleHttpResponse httpResp) {
if(httpResp.getStatusCode() == 200) if(httpResp.getStatusCode() == 200)
return getResponseHandler(httpResp.getContent()); return getResponseHandler(httpResp.getContent());
else else
return new SimpleRestResponse(false, httpResp.getContent(),null); return new SimpleRestResponse(false, httpResp.toString(),null);
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return null;
} }
public StringResponse getAsString(String entity, String[] params, String requestParams) { public StringResponse getAsString(String entity, String[] params, String requestParams) {
...@@ -122,10 +125,9 @@ import com.google.gdata.util.common.base.PercentEscaper; ...@@ -122,10 +125,9 @@ import com.google.gdata.util.common.base.PercentEscaper;
if (resp != null) if (resp != null)
return new StringResponse(resp.getStatusCode(), resp.getContent()); return new StringResponse(resp.getStatusCode(), resp.getContent());
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block return new StringResponse(500, "Failed to process request(GET). Exception: "+e.toString());
e.printStackTrace();
} }
return null; return new StringResponse(500, "Failed to process the request(GET)");
} }
/****************************************************************************** /******************************************************************************
...@@ -152,15 +154,10 @@ import com.google.gdata.util.common.base.PercentEscaper; ...@@ -152,15 +154,10 @@ import com.google.gdata.util.common.base.PercentEscaper;
SimpleHttpRequest request = buildPostRequest(entity, params, requestParams, content); SimpleHttpRequest request = buildPostRequest(entity, params, requestParams, content);
try { try {
SimpleHttpResponse httpResp = processRequest(request); SimpleHttpResponse httpResp = processRequest(request);
if(httpResp.getStatusCode() == 200) return buildResp(httpResp);
return getResponseHandler(httpResp.getContent());
else
return new SimpleRestResponse(false, httpResp.getContent(),null);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block return new SimpleRestResponse(false, e.toString(),null);
e.printStackTrace();
} }
return null;
} }
public String postAsString(String entity, String[] params, String requestParams, String content) { public String postAsString(String entity, String[] params, String requestParams, String content) {
...@@ -214,15 +211,10 @@ import com.google.gdata.util.common.base.PercentEscaper; ...@@ -214,15 +211,10 @@ import com.google.gdata.util.common.base.PercentEscaper;
SimpleHttpRequest request = buildPutRequest(entity, params, requestParams, content); SimpleHttpRequest request = buildPutRequest(entity, params, requestParams, content);
try { try {
SimpleHttpResponse httpResp = processRequest(request); SimpleHttpResponse httpResp = processRequest(request);
if(httpResp.getStatusCode() == 200) return buildResp(httpResp);
return getResponseHandler(httpResp.getContent());
else
return new SimpleRestResponse(false, httpResp.getContent(),null);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block return new SimpleRestResponse(false, e.toString(),null);
e.printStackTrace();
} }
return null;
} }
/****************************************************************************** /******************************************************************************
* *
...@@ -247,15 +239,10 @@ import com.google.gdata.util.common.base.PercentEscaper; ...@@ -247,15 +239,10 @@ import com.google.gdata.util.common.base.PercentEscaper;
SimpleHttpRequest request = buildDeleteRequest(entity, params, requestParams); SimpleHttpRequest request = buildDeleteRequest(entity, params, requestParams);
try { try {
SimpleHttpResponse httpResp = processRequest(request); SimpleHttpResponse httpResp = processRequest(request);
if(httpResp.getStatusCode() == 200) return buildResp(httpResp);
return getResponseHandler(httpResp.getContent());
else
return new SimpleRestResponse(false, httpResp.getContent(),null);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block return new SimpleRestResponse(false, e.toString(),null);
e.printStackTrace();
} }
return null;
} }
public String deleteAsString(String entity, String[] params, String requestParams) { public String deleteAsString(String entity, String[] params, String requestParams) {
......
src/test/java/TestSimpleRestClient.java 0 → 100644
import http.simpleRestClient.SimpleRestClient;
import http.simpleRestClient.SimpleRestResponse;
import org.junit.Test;
/**
* Created by eli on 7/26/16.
*/
public class TestSimpleRestClient {
@Test
public void testSimpleRestClient(){
SimpleRestClient restClient = new SimpleRestClient("mde", "172.16.1.56:50040");
SimpleRestResponse resp;
restClient.Initialize(100);
//wrong params to get 404
resp = restClient.get("\"/api/v1/\"", "chicago/transportation/routes", "key=gT2nciTKwRv6Jy5njqm8fe7LW");
System.out.println("resp for get is: "+resp.toString());
resp = restClient.post("\"/api/v1/\"", "chicago/transportation/routes", "key=gT2nciTKwRv6Jy5njqm8fe7LW",null);
System.out.println("resp for post is: "+resp.toString());
resp = restClient.get("/api/v1/", "chicago/transportation/routes", "key=gT2nciTKwRv6Jy5njqm8fe7LW");
System.out.println("resp for get is: "+resp.toString());
//domain for http tests http://httpbin.org/post
restClient = new SimpleRestClient("post", "httpbin.org:80");
restClient.Initialize(100);
resp = restClient.post(null, (String)null, null,null);
System.out.println("resp for get is: "+resp.toString());
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment