diff --git a/apache-fop/.classpath b/apache-fop/.classpath index 5637e12604..63439b10fa 100644 --- a/apache-fop/.classpath +++ b/apache-fop/.classpath @@ -32,19 +32,6 @@ - - - - - - - - - - - - - - + diff --git a/apache-fop/.gitignore b/apache-fop/.gitignore index 6ecc6405c2..941f6a39ab 100644 --- a/apache-fop/.gitignore +++ b/apache-fop/.gitignore @@ -8,7 +8,6 @@ */META-INF/* # Packaged files # -*.jar *.war *.ear diff --git a/apache-fop/src/test/resources/.gitignore b/apache-fop/src/test/resources/.gitignore index 83c05e60c8..f56f6c4a2d 100644 --- a/apache-fop/src/test/resources/.gitignore +++ b/apache-fop/src/test/resources/.gitignore @@ -8,6 +8,5 @@ */META-INF/* # Packaged files # -*.jar *.war *.ear \ No newline at end of file diff --git a/apache-fop/src/test/resources/jars/herold.jar b/apache-fop/src/test/resources/jars/herold.jar new file mode 100644 index 0000000000..ef5d052f36 Binary files /dev/null and b/apache-fop/src/test/resources/jars/herold.jar differ diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java index 3a97d4d09a..ebd67512e4 100644 --- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java +++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientHeadersLiveTest.java @@ -13,12 +13,9 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.RequestBuilder; 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.client.HttpClients; import org.apache.http.message.BasicHeader; -import org.apache.http.params.CoreProtocolPNames; -import org.apache.http.params.HttpProtocolParams; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -58,10 +55,8 @@ public class HttpClientHeadersLiveTest { // tests - headers - deprecated @Test - public final void givenDeprecatedApi_whenClientUsesCustomUserAgent_thenCorrect() throws ClientProtocolException, IOException { - client = HttpClients.custom().build(); - client.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Mozilla/5.0 Firefox/26.0"); - HttpProtocolParams.setUserAgent(client.getParams(), "Mozilla/5.0 Firefox/26.0"); + public final void givenNewApi_whenClientUsesCustomUserAgent_thenCorrect() throws ClientProtocolException, IOException { + client = HttpClients.custom().setUserAgent("Mozilla/5.0 Firefox/26.0").build(); final HttpGet request = new HttpGet(SAMPLE_URL); response = client.execute(request); @@ -86,7 +81,7 @@ public class HttpClientHeadersLiveTest { // tests - headers - content type @Test - public final void givenUsingDeprecatedApi_whenRequestHasCustomContentType_thenCorrect() throws ClientProtocolException, IOException { + public final void givenUsingNewApi_whenRequestHasCustomContentType_thenCorrect() throws ClientProtocolException, IOException { client = HttpClients.custom().build(); final HttpGet request = new HttpGet(SAMPLE_URL); request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json"); @@ -94,8 +89,8 @@ public class HttpClientHeadersLiveTest { } @Test - public final void givenRequestBuildWithBuilderWithDeprecatedApi_whenRequestHasCustomContentType_thenCorrect() throws ClientProtocolException, IOException { - final DefaultHttpClient client2 = new DefaultHttpClient(); + public final void givenRequestBuildWithBuilderWithNewApi_whenRequestHasCustomContentType_thenCorrect() throws ClientProtocolException, IOException { + final CloseableHttpClient client2 = HttpClients.custom().build(); final HttpGet request = new HttpGet(SAMPLE_URL); request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json"); response = client2.execute(request); diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientRedirectLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientRedirectLiveTest.java index fa3d20a483..3cb02dc767 100644 --- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientRedirectLiveTest.java +++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientRedirectLiveTest.java @@ -12,15 +12,11 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.params.ClientPNames; -import org.apache.http.client.params.HttpClientParams; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultRedirectStrategy; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.LaxRedirectStrategy; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpParams; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -56,15 +52,10 @@ public class HttpClientRedirectLiveTest { // tests @Test - public final void givenRedirectsAreDisabledViaDeprecatedApi_whenConsumingUrlWhichRedirects_thenNotRedirected() throws ClientProtocolException, IOException { - instance = new DefaultHttpClient(); - - final HttpParams params = new BasicHttpParams(); - params.setParameter(ClientPNames.HANDLE_REDIRECTS, false); - HttpClientParams.setRedirecting(params, false); + public final void givenRedirectsAreDisabledViaNewApi_whenConsumingUrlWhichRedirects_thenNotRedirected() throws ClientProtocolException, IOException { + instance = HttpClients.custom().disableRedirectHandling().build(); final HttpGet httpGet = new HttpGet("http://t.co/I5YYd9tddw"); - httpGet.setParams(params); response = instance.execute(httpGet); assertThat(response.getStatusLine().getStatusCode(), equalTo(301)); @@ -87,9 +78,8 @@ public class HttpClientRedirectLiveTest { } @Test - public final void givenRedirectingPOSTViaPre4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws ClientProtocolException, IOException { - final DefaultHttpClient client = new DefaultHttpClient(); - client.setRedirectStrategy(new DefaultRedirectStrategy() { + public final void givenRedirectingPOSTViaPost4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws ClientProtocolException, IOException { + final CloseableHttpClient client = HttpClients.custom().setRedirectStrategy(new DefaultRedirectStrategy() { /** Redirectable methods. */ private final String[] REDIRECT_METHODS = new String[] { HttpGet.METHOD_NAME, HttpPost.METHOD_NAME, HttpHead.METHOD_NAME }; @@ -102,7 +92,7 @@ public class HttpClientRedirectLiveTest { } return false; } - }); + }).build(); response = client.execute(new HttpPost("http://t.co/I5YYd9tddw")); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); @@ -110,8 +100,7 @@ public class HttpClientRedirectLiveTest { @Test public final void givenRedirectingPOSTVia4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws ClientProtocolException, IOException { - final DefaultHttpClient client = new DefaultHttpClient(); - client.setRedirectStrategy(new LaxRedirectStrategy()); + final CloseableHttpClient client = HttpClients.custom().setRedirectStrategy(new LaxRedirectStrategy()).build(); response = client.execute(new HttpPost("http://t.co/I5YYd9tddw")); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java index e9a420c728..7e7dbe2146 100644 --- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java +++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java @@ -11,13 +11,10 @@ import org.apache.http.client.ClientProtocolException; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.conn.ConnectTimeoutException; +import org.apache.http.config.SocketConfig; +import org.apache.http.conn.HttpHostConnectException; 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.params.CoreConnectionPNames; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; import org.junit.After; import org.junit.Test; @@ -45,36 +42,31 @@ public class HttpClientTimeoutLiveTest { // tests @Test - public final void givenUsingDeprecatedApi_whenSettingTimeoutViaRawParams_thenCorrect() throws ClientProtocolException, IOException { + public final void givenUsingNewApi_whenSettingTimeoutViaRequestConfig_thenCorrect() throws ClientProtocolException, IOException { final int timeout = 2; - final DefaultHttpClient client = new DefaultHttpClient(); + final RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout * 1000).setConnectionRequestTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build(); + final CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build(); final HttpGet request = new HttpGet("http://www.github.com"); - final HttpParams httpParams = client.getParams(); - httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000); - httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000); // httpParams.setLongParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); // https://issues.apache.org/jira/browse/HTTPCLIENT-1418 response = client.execute(request); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); - client.close(); } @Test - public final void givenUsingDeprecatedApi_whenSettingTimeoutViaHigherLevelApi_thenCorrect() throws ClientProtocolException, IOException { + public final void givenUsingNewApi_whenSettingTimeoutViaSocketConfig_thenCorrect() throws ClientProtocolException, IOException { final int timeout = 2; - final DefaultHttpClient client = new DefaultHttpClient(); - final HttpGet request = new HttpGet("http://www.github.com"); - final HttpParams httpParams = client.getParams(); - HttpConnectionParams.setConnectionTimeout(httpParams, timeout * 1000); // http.connection.timeout - HttpConnectionParams.setSoTimeout(httpParams, timeout * 1000); // http.socket.timeout + final SocketConfig config = SocketConfig.custom().setSoTimeout(timeout * 1000).build(); + final CloseableHttpClient client = HttpClientBuilder.create().setDefaultSocketConfig(config).build(); + + final HttpGet request = new HttpGet("http://www.github.com"); response = client.execute(request); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); - client.close(); } @Test @@ -94,7 +86,7 @@ public class HttpClientTimeoutLiveTest { /** * This simulates a timeout against a domain with multiple routes/IPs to it (not a single raw IP) */ - @Test(expected = ConnectTimeoutException.class) + @Test(expected = HttpHostConnectException.class) public final void givenTimeoutIsConfigured_whenTimingOut_thenTimeoutException() throws ClientProtocolException, IOException { final int timeout = 3;