Simplify variables declarations when type is obvious

Closes #73

src/main/java/com/vtence/molecule/crypto/HMacDigest.java

@@ -16,7 +16,7 @@ public HMacDigest(String algorithm) {
     }
 
     public byte[] compute(String secret, byte[] content) throws Exception {
-        SecretKeySpec keySpec = new SecretKeySpec(encode(secret), algorithm);
+        var keySpec = new SecretKeySpec(encode(secret), algorithm);
         Mac mac = Mac.getInstance(algorithm);
         mac.init(keySpec);
 

src/main/java/com/vtence/molecule/decoration/HtmlDocumentProcessor.java

@@ -17,7 +17,7 @@ public class HtmlDocumentProcessor implements ContentProcessor {
     private static final Pattern META = Pattern.compile("<meta name=\"([^\"]*)\" content=\"([^\"]*)\"", Pattern.DOTALL);
 
     public Map<String, String> process(String html) {
-        final Map<String, String> chunks = new HashMap<>();
+        var chunks = new HashMap<String, String>();
         addHead(chunks, html);
         addTitle(chunks, html);
         addBody(chunks, html);
@@ -56,7 +56,7 @@ private void addBody(Map<String, String> chunks, String html) {
     }
 
     private void addMetaData(Map<String, String> chunks, String head) {
-        Matcher matcher = META.matcher(head);
+        var matcher = META.matcher(head);
         while (matcher.find()) {
             chunks.put(matcher.group(NAME), matcher.group(CONTENT));
         }

src/main/java/com/vtence/molecule/helpers/Headers.java

@@ -35,7 +35,7 @@ public Set<String> names() {
     }
 
     public Map<String, String> all() {
-        Map<String, String> headers = new LinkedHashMap<>();
+        var headers = new LinkedHashMap<String, String>();
         for (String name : names()) {
             headers.put(name, get(name));
         }

src/main/java/com/vtence/molecule/helpers/Joiner.java

@@ -15,7 +15,7 @@ public Joiner(String separator) {
     }
 
     public String join(Iterable<?> parts) {
-        StringJoiner joiner = new StringJoiner(separator);
+        var joiner = new StringJoiner(separator);
         for (Object part: parts) {
             joiner.add(String.valueOf(part));
         }

src/main/java/com/vtence/molecule/http/AcceptEncoding.java

@@ -23,7 +23,7 @@ public static AcceptEncoding parse(String header) {
     }
 
     public static AcceptEncoding from(Header header) {
-        AcceptEncoding accept = new AcceptEncoding();
+        var accept = new AcceptEncoding();
         accept.values.addAll(header.all());
         return accept;
     }
@@ -42,7 +42,7 @@ public String selectBestEncoding(Collection<String> candidates) {
     }
 
     private List<Header.Value> explicitContentCodings(Collection<String> availableEncodings) {
-        List<Header.Value> codings = new ArrayList<>();
+        var codings = new ArrayList<Header.Value>();
 
         for (Header.Value accept: values) {
             if (accept.is("*")) {
@@ -63,7 +63,7 @@ private List<String> filterAcceptable(List<Header.Value> encodings) {
         List<String> candidates = listValues(encodings);
         if (!candidates.contains("identity")) candidates.add("identity");
 
-        for (Header.Value encoding : encodings) {
+        for (var encoding : encodings) {
             if (!encoding.acceptable()) candidates.remove(encoding.value());
         }
         return candidates;

src/main/java/com/vtence/molecule/http/ContentLanguage.java

@@ -24,7 +24,7 @@ public static ContentLanguage parse(String header) {
     }
 
     public static ContentLanguage from(Header header) {
-        ContentLanguage languages = new ContentLanguage();
+        var languages = new ContentLanguage();
         header.values().stream().filter(locale -> !locale.equals(""))
               .forEach(locale -> languages.add(Locale.forLanguageTag(locale)));
         return languages;

src/main/java/com/vtence/molecule/http/CookieDecoder.java

@@ -17,9 +17,9 @@ public class CookieDecoder {
     private static final String DOMAIN = "$Domain";
 
     public List<Cookie> decode(String header) {
-        List<Cookie> cookies = new ArrayList<>();
+        var cookies = new ArrayList<Cookie>();
 
-        Matcher pair = NAME_VALUE_PAIR.matcher(header);
+        var pair = NAME_VALUE_PAIR.matcher(header);
 
         int pos = 0;
         int version = 1;
@@ -34,7 +34,7 @@ public List<Cookie> decode(String header) {
         while (pair.find(pos)) {
             pos = pair.end();
 
-            Cookie cookie = new Cookie(name(pair), value(pair));
+            var cookie = new Cookie(name(pair), value(pair));
             cookie.version(version);
 
             if (pair.find(pos)) {

src/main/java/com/vtence/molecule/http/Header.java

@@ -41,7 +41,7 @@ public List<String> values() {
     }
 
     private static List<Value> parseValues(String header) {
-        List<Value> values = new ArrayList<>();
+        var values = new ArrayList<Value>();
         for (String value : VALUES_DELIMITER.split(header)) {
             String[] tokens = TOKENS_DELIMITER.split(value);
 
@@ -59,7 +59,7 @@ private static boolean isParameter(String first) {
     }
 
     private static List<Parameter> parameters(String[] tokens) {
-        List<Parameter> pairs = new ArrayList<>();
+        var pairs = new ArrayList<Parameter>();
         for (String token : tokens) {
             String[] parts = NAME_VALUE_DELIMITER.split(token);
             String attribute = parts[0];

src/main/java/com/vtence/molecule/http/HttpDate.java

@@ -30,7 +30,7 @@ public final class HttpDate {
     private static final ZoneId GMT = ZoneId.of("GMT");
 
     public static Instant parse(String httpDate) {
-        for (DateTimeFormatter format : POSSIBLE_FORMATS) {
+        for (var format : POSSIBLE_FORMATS) {
             try {
                 // Ignore timezone component as all HTTP dates should be represented in UTC
                 return LocalDateTime.parse(httpDate, format).atZone(GMT).toInstant();

src/main/java/com/vtence/molecule/http/MimeTypes.java

@@ -38,7 +38,7 @@ public static boolean matches(String mediaType, String pattern) {
     }
 
     public static Predicate<String> isSpecializationOf(String pattern) {
-        final MediaType type = MediaType.parse(pattern);
+        var type = MediaType.parse(pattern);
         return m -> type.isGeneralizationOf(MediaType.parse(m));
     }
 

src/main/java/com/vtence/molecule/http/Scheme.java

@@ -5,7 +5,7 @@ public final class Scheme {
     public static final Scheme HTTP = new Scheme("http", 80);
     public static final Scheme HTTPS = new Scheme("https", 443);
 
-    private static final Scheme[] KNOWN = new Scheme[] { HTTP, HTTPS };
+    private static final Scheme[] KNOWN_SCHEMES = new Scheme[] { HTTP, HTTPS };
 
     private final String name;
     private final int defaultPort;
@@ -28,7 +28,7 @@ public String toString() {
     }
 
     public static Scheme of(String name) {
-        for (Scheme scheme : KNOWN) {
+        for (var scheme : KNOWN_SCHEMES) {
             if (scheme.name.equalsIgnoreCase(name)) return scheme;
         }
         return new Scheme(name, -1);

src/main/java/com/vtence/molecule/lib/FileBody.java

@@ -26,7 +26,7 @@ public long size(Charset charset) {
     }
 
     public void writeTo(OutputStream out, Charset charset) throws IOException {
-        try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
+        try (var in = new BufferedInputStream(new FileInputStream(file))) {
             in.transferTo(out);
         }
     }

src/main/java/com/vtence/molecule/lib/FlashHash.java

@@ -87,7 +87,7 @@ public void putAll(Map<?, ?> values) {
     }
 
     public void sweep() {
-        Map<String, Object> fresh = new HashMap<>();
+        var fresh = new HashMap<String, Object>();
         entries.keySet().stream().filter(this.keep::contains).forEach(key -> fresh.put(key, entries.get(key)));
         entries.clear();
         entries.putAll(fresh);

src/main/java/com/vtence/molecule/middlewares/BasicAuthentication.java

@@ -39,7 +39,7 @@ public Application then(Application next) {
                 return Response.of(BAD_REQUEST).done();
             }
 
-            BasicCredentials credentials = BasicCredentials.decode(auth.params());
+            var credentials = BasicCredentials.decode(auth.params());
             Optional<String> user = authenticator.authenticate(credentials.username(), credentials.password());
 
             if (user.isPresent()) {

src/main/java/com/vtence/molecule/middlewares/Compressor.java

@@ -26,41 +26,40 @@
 import static com.vtence.molecule.http.HeaderNames.CONTENT_LENGTH;
 import static com.vtence.molecule.http.HttpStatus.NOT_ACCEPTABLE;
 import static com.vtence.molecule.http.MimeTypes.TEXT;
-import static com.vtence.molecule.middlewares.Compressor.Codings.identity;
+import static com.vtence.molecule.middlewares.Compressor.Codings.IDENTITY;
 
 public class Compressor implements Middleware {
 
     private final Collection<String> compressibleTypes = new ArrayList<>();
 
     enum Codings {
-
-        gzip {
+        GZIP {
             public void encode(Response response) {
                 response.removeHeader(CONTENT_LENGTH);
-                response.header(CONTENT_ENCODING, name());
+                response.header(CONTENT_ENCODING, name().toLowerCase());
                 response.body(new GZipStream(response.body()));
             }
         },
 
-        deflate {
+        DEFLATE {
             public void encode(Response response) {
                 response.removeHeader(CONTENT_LENGTH);
-                response.header(CONTENT_ENCODING, name());
+                response.header(CONTENT_ENCODING, name().toLowerCase());
                 response.body(new DeflateStream(response.body()));
             }
         },
 
-        identity {
+        IDENTITY {
             public void encode(Response response) {
             }
         };
 
         public abstract void encode(Response response);
 
         public static String[] all() {
-            List<String> all = new ArrayList<>();
+            var all = new ArrayList<String>();
             for (Codings coding : values()) {
-                all.add(coding.name());
+                all.add(coding.name().toLowerCase());
             }
             return all.toArray(new String[0]);
         }
@@ -73,7 +72,7 @@ public GZipStream(Body body) {
             }
 
             public void writeTo(OutputStream out, Charset charset) throws IOException {
-                GZIPOutputStream zip = new GZIPOutputStream(out);
+                var zip = new GZIPOutputStream(out);
                 try {
                     body.writeTo(zip, charset);
                 } finally {
@@ -94,8 +93,8 @@ public DeflateStream(Body body) {
             }
 
             public void writeTo(OutputStream out, Charset charset) throws IOException {
-                Deflater zlib = new Deflater(Deflater.DEFAULT_COMPRESSION, true);
-                DeflaterOutputStream deflate = new DeflaterOutputStream(out, zlib);
+                var zlib = new Deflater(Deflater.DEFAULT_COMPRESSION, true);
+                var deflate = new DeflaterOutputStream(out, zlib);
                 try {
                     body.writeTo(deflate, charset);
                 } finally {
@@ -127,7 +126,7 @@ private Consumer<Response> compressResponse(String bestEncoding) {
             }
 
             if (bestEncoding != null) {
-                Codings coding = Codings.valueOf(bestEncoding);
+                Codings coding = Codings.valueOf(bestEncoding.toUpperCase());
                 coding.encode(response);
             } else {
                 notAcceptable(response);
@@ -164,15 +163,15 @@ private boolean compressible(String mediaType) {
     }
 
     private boolean isIdentity(String contentEncoding) {
-        return contentEncoding.matches(atWordBoundaries(identity.name()));
+        return contentEncoding.matches(atWordBoundaries(IDENTITY.name().toLowerCase()));
     }
 
     private String atWordBoundaries(String text) {
         return "\\b" + text + "\\b";
     }
 
     private String selectBestAvailableEncodingFor(Request request) {
-        AcceptEncoding acceptEncoding = AcceptEncoding.of(request);
+        var acceptEncoding = AcceptEncoding.of(request);
         return acceptEncoding.selectBestEncoding(Codings.all());
     }
 

src/main/java/com/vtence/molecule/middlewares/ConnectionScope.java

@@ -19,7 +19,7 @@ public ConnectionScope(DataSource dataSource) {
     public Application then(Application next) {
         return request -> {
             Connection connection = dataSource.getConnection();
-            Reference ref = new Reference(request);
+            var ref = new Reference(request);
 
             ref.set(connection);
             try {

src/main/java/com/vtence/molecule/middlewares/CookieSessionTracker.java

@@ -49,7 +49,7 @@ public Application then(Application next) {
     }
 
     private CookieJar fetchCookieJar(Request request) {
-        CookieJar cookieJar = CookieJar.get(request);
+        var cookieJar = CookieJar.get(request);
         if (cookieJar == null) throw new IllegalStateException("No cookie jar bound to request");
         return cookieJar;
     }

src/main/java/com/vtence/molecule/middlewares/Cookies.java

@@ -21,7 +21,7 @@ public class Cookies implements Middleware {
 
     public Application then(Application next) {
         return request -> {
-            CookieJar cookieJar = new CookieJar(clientCookiesFrom(request));
+            var cookieJar = new CookieJar(clientCookiesFrom(request));
             cookieJar.bind(request);
             try {
                 return next.handle(request)
@@ -36,11 +36,11 @@ public Application then(Application next) {
 
     private Consumer<Response> commitCookies(CookieJar cookies) {
         return response -> {
-            for (Cookie cookie : cookies.fresh()) {
+            for (var cookie : cookies.fresh()) {
                 response.addHeader(SET_COOKIE, cookie.toString());
             }
 
-            for (Cookie cookie : cookies.discarded()) {
+            for (var cookie : cookies.discarded()) {
                 response.addHeader(SET_COOKIE, cookie.maxAge(0).toString());
             }
         };

src/main/java/com/vtence/molecule/middlewares/ETag.java

@@ -45,7 +45,7 @@ private String etagOf(byte[] output) throws NoSuchAlgorithmException {
     }
 
     private byte[] render(Response response) throws IOException {
-        try(ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+        try(var out = new ByteArrayOutputStream()) {
             try(Body body = response.body()) {
                 body.writeTo(out, response.charset());
             }
@@ -92,7 +92,7 @@ private String cachingDirective(Response response) {
     }
 
     private byte[] computeHash(byte[] output) throws NoSuchAlgorithmException {
-        MessageDigest md5 = MessageDigest.getInstance("MD5");
+        var md5 = MessageDigest.getInstance("MD5");
         return md5.digest(output);
     }
 }

src/main/java/com/vtence/molecule/middlewares/Failsafe.java

@@ -36,8 +36,8 @@ private void failsafeResponse(Response response, Throwable error) {
     }
 
     private String formatAsHtml(Throwable error) {
-        StringWriter html = new StringWriter();
-        PrintWriter buffer = new PrintWriter(html);
+        var html = new StringWriter();
+        var buffer = new PrintWriter(html);
         buffer.println("<html>");
         buffer.println("<body>");
         buffer.println("<h1>Oups!</h1>");

src/main/java/com/vtence/molecule/middlewares/FileServer.java

@@ -55,7 +55,7 @@ public Response handle(Request request) throws Exception {
                            .done();
         }
 
-        File file = new File(root, request.path());
+        var file = new File(root, request.path());
         if (!canServe(file)) {
             return Response.of(NOT_FOUND)
                            .contentType(TEXT)
@@ -68,7 +68,7 @@ public Response handle(Request request) throws Exception {
                            .done();
         }
 
-        Response response = Response.ok();
+        var response = Response.ok();
         addFileHeaders(response, file);
         addCustomHeaders(response);
 

src/main/java/com/vtence/molecule/middlewares/FilterMap.java

@@ -42,15 +42,15 @@ private Middleware filterFor(Request request) {
     private Function<Predicate<? super Request>, Predicate<? super Request>> addDynamicParametersTo(Request request) {
         return path -> {
             if (path instanceof WithBoundParameters) {
-                WithBoundParameters dynamicPath = (WithBoundParameters) path;
+                var dynamicPath = (WithBoundParameters) path;
                 dynamicPath.addParametersTo(request);
             }
             return path;
         };
     }
 
     private List<Predicate<? super Request>> possibleMatches() {
-        List<Predicate<? super Request>> matchers = new ArrayList<>(filters.keySet());
+        var matchers = new ArrayList<>(filters.keySet());
         Collections.reverse(matchers);
         return matchers;
     }