[incubator-trafficcontrol] 02/02: 'Accept-Encoding: gzip' headers code cleanup

[elsloo]

This is an automated email from the ASF dual-hosted git repository.

elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit a3b0dab2828efff0c36090bef78e02e7c3396e87
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Fri Mar 9 11:15:10 2018 -0700

    'Accept-Encoding: gzip' headers code cleanup
---
 .../cdn/traffic_control/traffic_router/core/util/Fetcher.java    | 8 ++++----
 .../traffic_router/core/util/PeriodicResourceUpdater.java        | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
index 6a6ded4..772c00c 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java
@@ -46,6 +46,7 @@ public class Fetcher {
        protected static final String POST_STR = "POST";
        protected static final String UTF8_STR = "UTF-8";
        protected static final int DEFAULT_TIMEOUT = 10000;
+       private static final String GZIP_ENCODING_STRING = "gzip";
        protected int timeout = DEFAULT_TIMEOUT; // override if you want 
something different
        protected final Map<String, String> requestProps = new HashMap<String, 
String>();
 
@@ -103,7 +104,7 @@ public class Fetcher {
                http.setInstanceFollowRedirects(false);
                http.setRequestMethod(method);
                http.setAllowUserInteraction(true);
-               http.addRequestProperty("Accept-Encoding", "gzip");
+               http.addRequestProperty("Accept-Encoding", 
GZIP_ENCODING_STRING);
 
                for (final String key : requestProps.keySet()) {
                        http.addRequestProperty(key, requestProps.get(key));
@@ -201,15 +202,14 @@ public class Fetcher {
        }
 
        public void createStringBuilderFromResponse (final StringBuilder sb, 
final HttpURLConnection connection) throws IOException {
-               if ("gzip".equals(connection.getContentEncoding())) {
+               if 
(GZIP_ENCODING_STRING.equals(connection.getContentEncoding())) {
                        final GZIPInputStream zippedInputStream =  new 
GZIPInputStream(connection.getInputStream());
                        final BufferedReader r = new BufferedReader(new 
InputStreamReader(zippedInputStream));
                        String input;
                        while((input = r.readLine()) != null) {
                                sb.append(input);
                        }
-               }
-               else {
+               } else {
                        try (final BufferedReader in = new BufferedReader(new 
InputStreamReader(connection.getInputStream()))) {
                                String input;
 
diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
index 9ce224f..3072b65 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java
@@ -62,6 +62,8 @@ public class PeriodicResourceUpdater {
        protected ScheduledExecutorService executorService = 
Executors.newSingleThreadScheduledExecutor();
        protected long pollingInterval;
 
+       private static final String GZIP_ENCODING_STRING = "gzip";
+
        protected ScheduledFuture<?> scheduledService;
 
        public PeriodicResourceUpdater(final AbstractUpdatable listener, final 
ResourceUrl urls, final String location, final int interval, final boolean 
pauseTilLoaded) {
@@ -136,7 +138,7 @@ public class PeriodicResourceUpdater {
                        if (!hasBeenLoaded || needsUpdating(existingDB)) {
                                final Request request = 
getRequest(urls.nextUrl());
                                if (request != null) {
-                                       
request.getHeaders().add("Accept-Encoding", "gzip");
+                                       
request.getHeaders().add("Accept-Encoding", GZIP_ENCODING_STRING);
                                        asyncHttpClient.executeRequest(request, 
new UpdateHandler(request)); // AsyncHandlers are NOT thread safe; one instance 
per request
                                        return true;
                                }
@@ -261,7 +263,7 @@ public class PeriodicResourceUpdater {
                        }
 
                        final String responseBody;
-                       if 
("gzip".equals(response.getHeader("Content-Encoding"))) {
+                       if 
(GZIP_ENCODING_STRING.equals(response.getHeader("Content-Encoding"))) {
                                final StringBuilder stringBuilder = new 
StringBuilder();
                                final GZIPInputStream zippedInputStream =  new 
GZIPInputStream(response.getResponseBodyAsStream());
                                final BufferedReader r = new BufferedReader(new 
InputStreamReader(zippedInputStream));
@@ -270,8 +272,7 @@ public class PeriodicResourceUpdater {
                                        stringBuilder.append(line);
                                }
                                responseBody = stringBuilder.toString();
-                       }
-                       else {
+                       } else {
                                responseBody = response.getResponseBody();
                        }
 

-- 
To stop receiving notification emails like this one, please contact
els...@apache.org.