Usage of new API, cleanups (reduced)

src/org/adblockplus/brazil/RequestHandler.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 30 matching lines @@
 
 import sunlabs.brazil.server.Request;
 import sunlabs.brazil.server.Server;
 import sunlabs.brazil.util.MatchString;
 import sunlabs.brazil.util.http.HttpInputStream;
 import sunlabs.brazil.util.http.HttpRequest;
 import android.util.Log;
 
 /**
  * The <code>RequestHandler</code> implements a proxy service optionally
- * modifying output. The
- * following configuration parameters are used to initialize this
+ * modifying output.
+ * The following configuration parameters are used to initialize this
  * <code>Handler</code>:
  * <dl class=props>
  *
  * <dt>prefix, suffix, glob, match
  * <dd>Specify the URL that triggers this handler. (See {@link MatchString}).
  * <dt>auth
  * <dd>The value of the proxy-authenticate header (if any) sent to the upstream
  * proxy
  * <dt>proxyHost
  * <dd>If specified, the name of the upstream proxy
@@ skipping 12 matching lines @@
  * handler=adblock
  * adblock.class=org.adblockplus.brazil.RequestHandler
  * </pre>
  *
  * See the description under {@link sunlabs.brazil.server.Handler#respond
  * respond} for a more detailed explanation.
  */
 
 public class RequestHandler extends BaseRequestHandler
 {
-  private static final Pattern RE_HTTP = Pattern.compile("^https?:");
-
   private AdblockPlus application;
   private String via;
+  private static final Pattern RE_HTTP = Pattern.compile("^https?:");
 
   @Override
   public boolean init(final Server server, final String prefix)
   {
     super.init(server, prefix);
 
     application = AdblockPlus.getApplication();
     via = " " + server.hostName + ":" + server.listen.getLocalPort() + " (" + server.name + ")";
 
     return true;
@@ skipping 239 matching lines @@
           }
           catch (final IOException e)
           {
             break;
           }
         }
         // The correct way would be to close ChunkedOutputStream
         // but we can not do it because underlying output stream is
         // used later in caller code. So we use this ugly hack:
         if (out instanceof ChunkedOutputStream)
-        {
           ((ChunkedOutputStream) out).writeFinalChunk();
-        }
       }
     }
     catch (final InterruptedIOException e)
     {
       /*
        * Read timeout while reading from the remote side. We use a
        * read timeout in case the target never responds.
        */
       request.sendError(408, "Timeout / No response");
     }
@@ skipping 26 matching lines @@
       request.sendError(500, msg);
       Log.e(prefix, msg, e);
     }
     finally
     {
       target.close();
     }
     return true;
   }
 }