iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79 from Doha2012/master 

syntax upgrade httpClient
This commit is contained in:
Eugen 2014-11-25 15:22:24 +02:00
parent 72279b8d80 5b416e68f7
commit 3899aa3a92
2 changed files with 179 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java
View File

@ -15,9 +15,7 @@ import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.junit.Before;
import org.junit.Test;
@ -33,10 +31,7 @@ public class HttpClientUnshortenLiveTest {
@Before
public final void before() {
final HttpParams httpParameters = new BasicHttpParams();
httpParameters.setParameter("http.protocol.handle-redirects", false);
client = new DefaultHttpClient(httpParameters);
client = HttpClientBuilder.create().disableRedirectHandling().build();
}
// tests

8
httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
View File

@ -8,12 +8,12 @@ import java.io.InputStream;
import org.apache.http.HttpEntity;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.cookie.BasicClientCookie;
import org.apache.http.protocol.BasicHttpContext;
@ -70,12 +70,12 @@ public class HttpClientCookieLiveTest {
cookie.setDomain(".github.com");
cookie.setPath("/");
cookieStore.addCookie(cookie);
final DefaultHttpClient client = new DefaultHttpClient();
client.setCookieStore(cookieStore);
final HttpClient client = HttpClientBuilder.create()
.setDefaultCookieStore(cookieStore).build();
final HttpGet request = new HttpGet("http://www.github.com");
response = client.execute(request);
response = (CloseableHttpResponse) client.execute(request);
assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
}