From a8694ba1b4b5d8c0477e6c97d72af6971ddd7b55 Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 2 Jul 2013 16:17:34 +0200 Subject: [PATCH] move some strings as final constants --- .../com/commafeed/backend/HttpGetter.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index bb8bc2b9..53a7e081 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -45,6 +45,13 @@ public class HttpGetter { private static Logger log = LoggerFactory.getLogger(HttpGetter.class); + private static final String USER_AGENT = "CommaFeed/1.0 (http://www.commafeed.com)"; + private static final String ACCEPT_LANGUAGE = "en"; + private static final String PRAGMA_NO_CACHE = "No-cache"; + private static final String CACHE_CONTROL_NO_CACHE = "no-cache"; + private static final String UTF8 = "UTF-8"; + private static final String HTTPS = "https"; + private static SSLContext SSL_CONTEXT = null; static { try { @@ -86,11 +93,10 @@ public class HttpGetter { HttpClient client = newClient(timeout); try { HttpGet httpget = new HttpGet(url); - httpget.addHeader(HttpHeaders.ACCEPT_LANGUAGE, "en"); - httpget.addHeader(HttpHeaders.PRAGMA, "No-cache"); - httpget.addHeader(HttpHeaders.CACHE_CONTROL, "no-cache"); - httpget.addHeader(HttpHeaders.USER_AGENT, - "CommaFeed/1.0 (http://www.commafeed.com)"); + httpget.addHeader(HttpHeaders.ACCEPT_LANGUAGE, ACCEPT_LANGUAGE); + httpget.addHeader(HttpHeaders.PRAGMA, PRAGMA_NO_CACHE); + httpget.addHeader(HttpHeaders.CACHE_CONTROL, CACHE_CONTROL_NO_CACHE); + httpget.addHeader(HttpHeaders.USER_AGENT, USER_AGENT); if (lastModified != null) { httpget.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified); @@ -197,11 +203,11 @@ public class HttpGetter { SSLSocketFactory ssf = new SSLSocketFactory(SSL_CONTEXT, VERIFIER); ClientConnectionManager ccm = client.getConnectionManager(); SchemeRegistry sr = ccm.getSchemeRegistry(); - sr.register(new Scheme("https", 443, ssf)); + sr.register(new Scheme(HTTPS, 443, ssf)); HttpParams params = client.getParams(); HttpClientParams.setCookiePolicy(params, CookiePolicy.IGNORE_COOKIES); - HttpProtocolParams.setContentCharset(params, "UTF-8"); + HttpProtocolParams.setContentCharset(params, UTF8); HttpConnectionParams.setConnectionTimeout(params, timeout); HttpConnectionParams.setSoTimeout(params, timeout); client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0,