Skip to content

Add patch method and default timeout wrappers #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjbrown0618 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add patch method and default timeout wrappers #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af9fa38
Add patch method to rest client
pjbrown0618 Aug 1, 2018
140156a
Add delete api for default timeout
pjbrown0618 Aug 13, 2018
10759d2
Add and post and put wrappers
pjbrown0618 Aug 17, 2018
683d586
Remove Unnecessary File
pjbrown0618 Aug 17, 2018
db106aa
Merge pull request #1 from pjbrown0618/AddPatch
pjbrown0618 Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions src/main/java/com/ge/predix/solsvc/restclient/impl/RestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,15 @@ public CloseableHttpResponse post(String url, HttpEntity request, List<Header> h
* @return -
*/
public CloseableHttpResponse post(String url, String request, List<Header> headers);


/**
* @param url -
* @param request -
* @param headers -
* @return -
*/
public CloseableHttpResponse post(String url, HttpEntity request, List<Header> headers);

/**
* @param url -
* @param request -
Expand All @@ -76,7 +84,33 @@ public CloseableHttpResponse post(String url, HttpEntity request, List<Header> h
*/
public abstract CloseableHttpResponse put(String url, String request, List<Header> headers, int connectionTimeout, int socketTimeout);

/**
/**
* @param url -
* @param request -
* @param headers -
* @return -
*/
public abstract CloseableHttpResponse put(String url, String request, List<Header> headers);

/**
* @param url -
* @param request -
* @param headers -
* @param connectionTimeout -
* @param socketTimeout -
* @return -
*/
public abstract CloseableHttpResponse patch(String url, String request, List<Header> headers, int connectionTimeout, int socketTimeout );

/**
* @param url -
* @param request -
* @param headers -
* @return -
*/
public CloseableHttpResponse patch(String url, String request, List<Header> headers);

/**
* @param url -
* @param headers -
* @param connectionTimeout -
Expand All @@ -85,6 +119,13 @@ public CloseableHttpResponse post(String url, HttpEntity request, List<Header> h
*/
public abstract CloseableHttpResponse delete(String url, List<Header> headers, int connectionTimeout, int socketTimeout);

/**
* @param url -
* @param headers -
* @return -
*/
public abstract CloseableHttpResponse delete(String url, List<Header> headers);

/**
* @return -
*/
Expand Down
58 changes: 58 additions & 0 deletions src/main/java/com/ge/predix/solsvc/restclient/impl/RestClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPatch;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.conn.params.ConnRoutePNames;
Expand Down Expand Up @@ -533,6 +534,13 @@ public CloseableHttpResponse post(String url, String request, List<Header> heade
}
}


@Override
public CloseableHttpResponse post(String url, HttpEntity entity, List<Header> headers) {
return post(url, entity, headers, this.restConfig.getDefaultConnectionTimeout(),
this.restConfig.getDefaultSocketTimeout());
}

/*
* (non-Javadoc)
*
Expand Down Expand Up @@ -567,6 +575,11 @@ public CloseableHttpResponse post(String url, HttpEntity entity, List<Header> he
}
}

@Override
public CloseableHttpResponse put(String url, String request, List<Header> headers) {
return put(url, request, headers, this.restConfig.getDefaultConnectionTimeout(),
this.restConfig.getDefaultSocketTimeout());
}
/*
* (non-Javadoc)
*
Expand All @@ -593,8 +606,46 @@ public CloseableHttpResponse put(String url, String request, List<Header> header
}
}

@Override
public CloseableHttpResponse patch(String url, String request, List<Header> headers) {
return patch(url, request, headers, this.restConfig.getDefaultConnectionTimeout(),
this.restConfig.getDefaultSocketTimeout());
}

/*
* (non-Javadoc)
*
* @see
* com.ge.predix.solsvc.restclient.impl.RestClient#post(java.lang.String,
* java.lang.String, org.springframework.http.HttpHeaders)
*/
@SuppressWarnings({ "nls" })
@Override
public CloseableHttpResponse patch(String url, String request, List<Header> headers, int connectionTimeout,
int socketTimeout) {
try {
HttpPatch method = new HttpPatch(url);
org.apache.http.HttpEntity entity = new StringEntity(request);
method.setEntity(entity);
method.setHeaders(headers.toArray(new Header[headers.size()]));
try (CloseableHttpClient httpClient = getHttpClient(connectionTimeout, socketTimeout, url,
this.restConfig.getProxyHost(), this.restConfig.getProxyPort(),
this.restConfig.getNoProxyHost(), this.restConfig.getProxyUser(), this.restConfig.getProxyPassword());) {
CloseableHttpResponse httpResponse = httpClient.execute(method);
return httpResponse;
} catch (Exception e) {
throw new RuntimeException(
"unable to call url=" + url + " with headers=" + headers + " and body=" + request, e);
}
} catch (IOException e) {
throw new RuntimeException(
"unable to call url=" + url + " with headers=" + headers + " and body=" + request, e);
}
}


/*
* (non-Javadoc)
*
* @see
* com.ge.predix.solsvc.restclient.impl.RestClient#delete(java.lang.String,
Expand All @@ -616,6 +667,13 @@ public CloseableHttpResponse delete(String url, List<Header> headers, int connec
}
}

@Override
public CloseableHttpResponse delete(String url, List<Header> headers) {
return delete(url, headers, this.restConfig.getDefaultConnectionTimeout(),
this.restConfig.getDefaultSocketTimeout());
}


/**
* @param object
* -
Expand Down