From bef6fba78a5c87191d40a90ddc903a09f4a7ba9c Mon Sep 17 00:00:00 2001 From: testinfected Date: Sun, 13 Mar 2022 15:46:48 -0400 Subject: [PATCH] Simplify variables declarations when type is obvious Closes #73 --- .../vtence/molecule/crypto/HMacDigest.java | 2 +- .../decoration/HtmlDocumentProcessor.java | 4 +-- .../com/vtence/molecule/helpers/Headers.java | 2 +- .../com/vtence/molecule/helpers/Joiner.java | 2 +- .../vtence/molecule/http/AcceptEncoding.java | 6 ++-- .../vtence/molecule/http/ContentLanguage.java | 2 +- .../vtence/molecule/http/CookieDecoder.java | 6 ++-- .../java/com/vtence/molecule/http/Header.java | 4 +-- .../com/vtence/molecule/http/HttpDate.java | 2 +- .../com/vtence/molecule/http/MimeTypes.java | 2 +- .../java/com/vtence/molecule/http/Scheme.java | 4 +-- .../com/vtence/molecule/lib/FileBody.java | 2 +- .../com/vtence/molecule/lib/FlashHash.java | 2 +- .../middlewares/BasicAuthentication.java | 2 +- .../molecule/middlewares/Compressor.java | 29 +++++++++---------- .../molecule/middlewares/ConnectionScope.java | 2 +- .../middlewares/CookieSessionTracker.java | 2 +- .../vtence/molecule/middlewares/Cookies.java | 6 ++-- .../com/vtence/molecule/middlewares/ETag.java | 4 +-- .../vtence/molecule/middlewares/Failsafe.java | 4 +-- .../molecule/middlewares/FileServer.java | 4 +-- .../molecule/middlewares/FilterMap.java | 4 +-- .../vtence/molecule/middlewares/Flash.java | 4 +-- .../vtence/molecule/middlewares/Layout.java | 2 +- .../vtence/molecule/middlewares/Locales.java | 4 +-- .../vtence/molecule/middlewares/Router.java | 2 +- .../vtence/molecule/routing/DynamicPath.java | 8 ++--- .../vtence/molecule/routing/DynamicRoute.java | 2 +- .../com/vtence/molecule/servers/Servers.java | 2 +- .../vtence/molecule/servers/SimpleServer.java | 8 ++--- .../molecule/servers/UndertowServer.java | 22 +++++++------- .../molecule/session/CookieSessionStore.java | 4 +-- .../vtence/molecule/session/Serializer.java | 6 ++-- .../vtence/molecule/session/SessionPool.java | 2 +- .../com/vtence/molecule/ssl/KeyStoreType.java | 6 ++-- .../vtence/molecule/ssl/SecureProtocol.java | 2 +- .../molecule/templating/TemplateBody.java | 2 +- .../vtence/molecule/testing/BodyContent.java | 2 +- .../molecule/testing/CharsetDetector.java | 2 +- .../http/ByteCountingOutputStream.java | 4 +-- .../molecule/testing/http/MultipartForm.java | 18 ++++++------ .../molecule/testing/http/UrlEncodedForm.java | 10 +++---- 42 files changed, 104 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/vtence/molecule/crypto/HMacDigest.java b/src/main/java/com/vtence/molecule/crypto/HMacDigest.java index 782ba47..650d292 100644 --- a/src/main/java/com/vtence/molecule/crypto/HMacDigest.java +++ b/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); diff --git a/src/main/java/com/vtence/molecule/decoration/HtmlDocumentProcessor.java b/src/main/java/com/vtence/molecule/decoration/HtmlDocumentProcessor.java index e7df3a6..a5520a7 100644 --- a/src/main/java/com/vtence/molecule/decoration/HtmlDocumentProcessor.java +++ b/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(" process(String html) { - final Map chunks = new HashMap<>(); + var chunks = new HashMap(); addHead(chunks, html); addTitle(chunks, html); addBody(chunks, html); @@ -56,7 +56,7 @@ private void addBody(Map chunks, String html) { } private void addMetaData(Map chunks, String head) { - Matcher matcher = META.matcher(head); + var matcher = META.matcher(head); while (matcher.find()) { chunks.put(matcher.group(NAME), matcher.group(CONTENT)); } diff --git a/src/main/java/com/vtence/molecule/helpers/Headers.java b/src/main/java/com/vtence/molecule/helpers/Headers.java index 8f4c146..b3d8a97 100644 --- a/src/main/java/com/vtence/molecule/helpers/Headers.java +++ b/src/main/java/com/vtence/molecule/helpers/Headers.java @@ -35,7 +35,7 @@ public Set names() { } public Map all() { - Map headers = new LinkedHashMap<>(); + var headers = new LinkedHashMap(); for (String name : names()) { headers.put(name, get(name)); } diff --git a/src/main/java/com/vtence/molecule/helpers/Joiner.java b/src/main/java/com/vtence/molecule/helpers/Joiner.java index 81e975e..4c448e1 100644 --- a/src/main/java/com/vtence/molecule/helpers/Joiner.java +++ b/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)); } diff --git a/src/main/java/com/vtence/molecule/http/AcceptEncoding.java b/src/main/java/com/vtence/molecule/http/AcceptEncoding.java index 9b9aa73..8f12a52 100644 --- a/src/main/java/com/vtence/molecule/http/AcceptEncoding.java +++ b/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 candidates) { } private List explicitContentCodings(Collection availableEncodings) { - List codings = new ArrayList<>(); + var codings = new ArrayList(); for (Header.Value accept: values) { if (accept.is("*")) { @@ -63,7 +63,7 @@ private List filterAcceptable(List encodings) { List 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; diff --git a/src/main/java/com/vtence/molecule/http/ContentLanguage.java b/src/main/java/com/vtence/molecule/http/ContentLanguage.java index 4bbe904..6e078e5 100644 --- a/src/main/java/com/vtence/molecule/http/ContentLanguage.java +++ b/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; diff --git a/src/main/java/com/vtence/molecule/http/CookieDecoder.java b/src/main/java/com/vtence/molecule/http/CookieDecoder.java index d54dd17..b2c0de7 100644 --- a/src/main/java/com/vtence/molecule/http/CookieDecoder.java +++ b/src/main/java/com/vtence/molecule/http/CookieDecoder.java @@ -17,9 +17,9 @@ public class CookieDecoder { private static final String DOMAIN = "$Domain"; public List decode(String header) { - List cookies = new ArrayList<>(); + var cookies = new ArrayList(); - 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 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)) { diff --git a/src/main/java/com/vtence/molecule/http/Header.java b/src/main/java/com/vtence/molecule/http/Header.java index 4a0008d..2e2dcd8 100644 --- a/src/main/java/com/vtence/molecule/http/Header.java +++ b/src/main/java/com/vtence/molecule/http/Header.java @@ -41,7 +41,7 @@ public List values() { } private static List parseValues(String header) { - List values = new ArrayList<>(); + var values = new ArrayList(); 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 parameters(String[] tokens) { - List pairs = new ArrayList<>(); + var pairs = new ArrayList(); for (String token : tokens) { String[] parts = NAME_VALUE_DELIMITER.split(token); String attribute = parts[0]; diff --git a/src/main/java/com/vtence/molecule/http/HttpDate.java b/src/main/java/com/vtence/molecule/http/HttpDate.java index 4e1da50..72d9080 100644 --- a/src/main/java/com/vtence/molecule/http/HttpDate.java +++ b/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(); diff --git a/src/main/java/com/vtence/molecule/http/MimeTypes.java b/src/main/java/com/vtence/molecule/http/MimeTypes.java index bb45b37..788bb06 100644 --- a/src/main/java/com/vtence/molecule/http/MimeTypes.java +++ b/src/main/java/com/vtence/molecule/http/MimeTypes.java @@ -38,7 +38,7 @@ public static boolean matches(String mediaType, String pattern) { } public static Predicate isSpecializationOf(String pattern) { - final MediaType type = MediaType.parse(pattern); + var type = MediaType.parse(pattern); return m -> type.isGeneralizationOf(MediaType.parse(m)); } diff --git a/src/main/java/com/vtence/molecule/http/Scheme.java b/src/main/java/com/vtence/molecule/http/Scheme.java index 297872d..9af03bb 100644 --- a/src/main/java/com/vtence/molecule/http/Scheme.java +++ b/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); diff --git a/src/main/java/com/vtence/molecule/lib/FileBody.java b/src/main/java/com/vtence/molecule/lib/FileBody.java index 70d3cb6..743ffa8 100644 --- a/src/main/java/com/vtence/molecule/lib/FileBody.java +++ b/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); } } diff --git a/src/main/java/com/vtence/molecule/lib/FlashHash.java b/src/main/java/com/vtence/molecule/lib/FlashHash.java index d55ce4c..5dd2295 100644 --- a/src/main/java/com/vtence/molecule/lib/FlashHash.java +++ b/src/main/java/com/vtence/molecule/lib/FlashHash.java @@ -87,7 +87,7 @@ public void putAll(Map values) { } public void sweep() { - Map fresh = new HashMap<>(); + var fresh = new HashMap(); entries.keySet().stream().filter(this.keep::contains).forEach(key -> fresh.put(key, entries.get(key))); entries.clear(); entries.putAll(fresh); diff --git a/src/main/java/com/vtence/molecule/middlewares/BasicAuthentication.java b/src/main/java/com/vtence/molecule/middlewares/BasicAuthentication.java index 3fe1ed5..610de0d 100644 --- a/src/main/java/com/vtence/molecule/middlewares/BasicAuthentication.java +++ b/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 user = authenticator.authenticate(credentials.username(), credentials.password()); if (user.isPresent()) { diff --git a/src/main/java/com/vtence/molecule/middlewares/Compressor.java b/src/main/java/com/vtence/molecule/middlewares/Compressor.java index 4ed9105..5595c2b 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Compressor.java +++ b/src/main/java/com/vtence/molecule/middlewares/Compressor.java @@ -26,31 +26,30 @@ 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 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) { } }; @@ -58,9 +57,9 @@ public void encode(Response response) { public abstract void encode(Response response); public static String[] all() { - List all = new ArrayList<>(); + var all = new ArrayList(); 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 compressResponse(String bestEncoding) { } if (bestEncoding != null) { - Codings coding = Codings.valueOf(bestEncoding); + Codings coding = Codings.valueOf(bestEncoding.toUpperCase()); coding.encode(response); } else { notAcceptable(response); @@ -164,7 +163,7 @@ 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) { @@ -172,7 +171,7 @@ private String atWordBoundaries(String text) { } private String selectBestAvailableEncodingFor(Request request) { - AcceptEncoding acceptEncoding = AcceptEncoding.of(request); + var acceptEncoding = AcceptEncoding.of(request); return acceptEncoding.selectBestEncoding(Codings.all()); } diff --git a/src/main/java/com/vtence/molecule/middlewares/ConnectionScope.java b/src/main/java/com/vtence/molecule/middlewares/ConnectionScope.java index e190388..5874b16 100644 --- a/src/main/java/com/vtence/molecule/middlewares/ConnectionScope.java +++ b/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 { diff --git a/src/main/java/com/vtence/molecule/middlewares/CookieSessionTracker.java b/src/main/java/com/vtence/molecule/middlewares/CookieSessionTracker.java index fd1de77..ab97486 100644 --- a/src/main/java/com/vtence/molecule/middlewares/CookieSessionTracker.java +++ b/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; } diff --git a/src/main/java/com/vtence/molecule/middlewares/Cookies.java b/src/main/java/com/vtence/molecule/middlewares/Cookies.java index 5ebad9d..5bdb4bd 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Cookies.java +++ b/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 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()); } }; diff --git a/src/main/java/com/vtence/molecule/middlewares/ETag.java b/src/main/java/com/vtence/molecule/middlewares/ETag.java index 3a61d29..b74f3fd 100644 --- a/src/main/java/com/vtence/molecule/middlewares/ETag.java +++ b/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); } } \ No newline at end of file diff --git a/src/main/java/com/vtence/molecule/middlewares/Failsafe.java b/src/main/java/com/vtence/molecule/middlewares/Failsafe.java index b571cf5..a41c098 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Failsafe.java +++ b/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(""); buffer.println(""); buffer.println("

Oups!

"); diff --git a/src/main/java/com/vtence/molecule/middlewares/FileServer.java b/src/main/java/com/vtence/molecule/middlewares/FileServer.java index e8613a0..4e5b75b 100644 --- a/src/main/java/com/vtence/molecule/middlewares/FileServer.java +++ b/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); diff --git a/src/main/java/com/vtence/molecule/middlewares/FilterMap.java b/src/main/java/com/vtence/molecule/middlewares/FilterMap.java index e175343..f7fa01d 100644 --- a/src/main/java/com/vtence/molecule/middlewares/FilterMap.java +++ b/src/main/java/com/vtence/molecule/middlewares/FilterMap.java @@ -42,7 +42,7 @@ private Middleware filterFor(Request request) { private Function, Predicate> addDynamicParametersTo(Request request) { return path -> { if (path instanceof WithBoundParameters) { - WithBoundParameters dynamicPath = (WithBoundParameters) path; + var dynamicPath = (WithBoundParameters) path; dynamicPath.addParametersTo(request); } return path; @@ -50,7 +50,7 @@ private Function, Predicate> addDyna } private List> possibleMatches() { - List> matchers = new ArrayList<>(filters.keySet()); + var matchers = new ArrayList<>(filters.keySet()); Collections.reverse(matchers); return matchers; } diff --git a/src/main/java/com/vtence/molecule/middlewares/Flash.java b/src/main/java/com/vtence/molecule/middlewares/Flash.java index 9537b4b..1074eb2 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Flash.java +++ b/src/main/java/com/vtence/molecule/middlewares/Flash.java @@ -44,7 +44,7 @@ private FlashHash loadFlash(Request request) { private Consumer commitFlash(Request request) { return response -> { Session session = fetchSession(request); - FlashHash flash = FlashHash.get(request); + var flash = FlashHash.get(request); flash.sweep(); if (!session.invalid() && !flash.empty()) { session.put(FlashHash.class, flash.toMap()); @@ -53,7 +53,7 @@ private Consumer commitFlash(Request request) { } private Session fetchSession(Request request) { - Session session = Session.get(request); + var session = Session.get(request); if (session == null) throw new IllegalStateException("No session bound to request"); return session; } diff --git a/src/main/java/com/vtence/molecule/middlewares/Layout.java b/src/main/java/com/vtence/molecule/middlewares/Layout.java index 88bec49..6087d5a 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Layout.java +++ b/src/main/java/com/vtence/molecule/middlewares/Layout.java @@ -70,7 +70,7 @@ private void applyDecoration(Request request, Response response) throws IOExcept } private String render(Body body, Charset charset) throws IOException { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + var buffer = new ByteArrayOutputStream(); body.writeTo(buffer, charset); return buffer.toString(charset.name()); } diff --git a/src/main/java/com/vtence/molecule/middlewares/Locales.java b/src/main/java/com/vtence/molecule/middlewares/Locales.java index fcaaaaf..331e04a 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Locales.java +++ b/src/main/java/com/vtence/molecule/middlewares/Locales.java @@ -18,7 +18,7 @@ public Locales(String... supported) { } private static List fromLanguageTags(String... languageTags) { - List locales = new ArrayList<>(); + var locales = new ArrayList(); for (String tag : languageTags) { locales.add(Locale.forLanguageTag(tag)); } @@ -27,7 +27,7 @@ private static List fromLanguageTags(String... languageTags) { public Application then(Application next) { return request -> { - AcceptLanguage acceptedLanguages = AcceptLanguage.of(request); + var acceptedLanguages = AcceptLanguage.of(request); Locale best = acceptedLanguages.selectBest(supported); request.attribute(Locale.class, best != null ? best : Locale.getDefault()); diff --git a/src/main/java/com/vtence/molecule/middlewares/Router.java b/src/main/java/com/vtence/molecule/middlewares/Router.java index d2442f4..a95a44b 100644 --- a/src/main/java/com/vtence/molecule/middlewares/Router.java +++ b/src/main/java/com/vtence/molecule/middlewares/Router.java @@ -15,7 +15,7 @@ public class Router implements Application, RouteSet { public static Router draw(RouteBuilder routeBuilder) { - Router router = new Router(); + var router = new Router(); routeBuilder.build(router); return router; } diff --git a/src/main/java/com/vtence/molecule/routing/DynamicPath.java b/src/main/java/com/vtence/molecule/routing/DynamicPath.java index ebc2f29..a758f62 100644 --- a/src/main/java/com/vtence/molecule/routing/DynamicPath.java +++ b/src/main/java/com/vtence/molecule/routing/DynamicPath.java @@ -29,7 +29,7 @@ public static DynamicPath startingWith(String pattern) { } public boolean test(String actual) { - Path path = new Path(actual); + var path = new Path(actual); if (pattern.longerThan(path)) return false; if (fullMatch && path.longerThan(pattern)) return false; @@ -45,8 +45,8 @@ private boolean isDynamic(String segment) { } public Map parametersBoundTo(String path) { - Path p = new Path(path); - Map boundParameters = new HashMap<>(); + var p = new Path(path); + var boundParameters = new HashMap(); for (int i = 0; i < pattern.segmentCount(); i++) { String segment = pattern.segment(i); @@ -73,7 +73,7 @@ public String[] segments() { } private static String[] removeEmptyParts(String[] parts) { - List segments = new ArrayList<>(); + var segments = new ArrayList(); for (String part : parts) { if (!part.isEmpty()) segments.add(part); } diff --git a/src/main/java/com/vtence/molecule/routing/DynamicRoute.java b/src/main/java/com/vtence/molecule/routing/DynamicRoute.java index e8a36b3..361bb91 100644 --- a/src/main/java/com/vtence/molecule/routing/DynamicRoute.java +++ b/src/main/java/com/vtence/molecule/routing/DynamicRoute.java @@ -33,7 +33,7 @@ private boolean matches(Request request) { private Application extractPathParameters(Application app) { return request -> { if (path instanceof WithBoundParameters) { - WithBoundParameters dynamicPath = (WithBoundParameters) path; + var dynamicPath = (WithBoundParameters) path; dynamicPath.addParametersTo(request); } return app.handle(request); diff --git a/src/main/java/com/vtence/molecule/servers/Servers.java b/src/main/java/com/vtence/molecule/servers/Servers.java index e9ca4bb..763408b 100644 --- a/src/main/java/com/vtence/molecule/servers/Servers.java +++ b/src/main/java/com/vtence/molecule/servers/Servers.java @@ -48,7 +48,7 @@ public static Server create(String host, int port) { private static Server instantiate(Class clazz, String host, int port) { try { - Constructor constructor = clazz.getDeclaredConstructor(String.class, Integer.TYPE); + var constructor = clazz.getDeclaredConstructor(String.class, Integer.TYPE); return constructor.newInstance(host, port); } catch (Exception e) { throw new CreationFailed(clazz, e); diff --git a/src/main/java/com/vtence/molecule/servers/SimpleServer.java b/src/main/java/com/vtence/molecule/servers/SimpleServer.java index 032e4be..0acbb62 100644 --- a/src/main/java/com/vtence/molecule/servers/SimpleServer.java +++ b/src/main/java/com/vtence/molecule/servers/SimpleServer.java @@ -141,7 +141,7 @@ private HttpMethod getMethod(org.simpleframework.http.Request req) { } private Uri reconstructUri(org.simpleframework.http.Request req) { - Uri uri = Uri.of(req.getTarget()); + var uri = Uri.of(req.getTarget()); if (uri.scheme() == null) uri = uri.scheme(req.isSecure() ? HTTPS.name() : HTTP.name()); if (uri.host() == null) uri = uri.host(host); if (uri.port() == -1) uri = uri.port(port); @@ -149,7 +149,7 @@ private Uri reconstructUri(org.simpleframework.http.Request req) { } private Headers readHeaders(org.simpleframework.http.Request req) { - Headers headers = new Headers(); + var headers = new Headers(); for (String header : req.getNames()) { // Apparently there's no way to know the number of values for a given name, // so we have to iterate until we reach a null value @@ -163,7 +163,7 @@ private Headers readHeaders(org.simpleframework.http.Request req) { } private Map> readParameters(org.simpleframework.http.Request req) { - Map> parameters = new HashMap<>(); + var parameters = new HashMap>(); Query query = req.getQuery(); query.keySet().forEach(name -> { query.getAll(name).forEach( @@ -174,7 +174,7 @@ private Map> readParameters(org.simpleframework.http.Reques } private List readMultiPartData(org.simpleframework.http.Request req) throws IOException { - List parts = new ArrayList<>(); + var parts = new ArrayList(); for (Part part : req.getParts()) { parts.add(new BodyPart().content(track(part.getInputStream())) .contentType(contentTypeOf(part)) diff --git a/src/main/java/com/vtence/molecule/servers/UndertowServer.java b/src/main/java/com/vtence/molecule/servers/UndertowServer.java index d1edc69..902489d 100644 --- a/src/main/java/com/vtence/molecule/servers/UndertowServer.java +++ b/src/main/java/com/vtence/molecule/servers/UndertowServer.java @@ -150,7 +150,7 @@ private HttpMethod getMethod(HttpServerExchange exchange) { } private Uri reconstructUri(HttpServerExchange exchange) { - Uri uri = Uri.of(exchange.getRequestURI()) + var uri = Uri.of(exchange.getRequestURI()) .query(exchange.getQueryString()); if (uri.scheme() == null) uri = uri.scheme(exchange.getRequestScheme()); if (uri.host() == null) uri = uri.host(host); @@ -159,7 +159,7 @@ private Uri reconstructUri(HttpServerExchange exchange) { } private Headers readHeaders(HttpServerExchange exchange) { - Headers headers = new Headers(); + var headers = new Headers(); for (HeaderValues values : exchange.getRequestHeaders()) { for (String value : values) { headers.add(values.getHeaderName().toString(), value); @@ -169,7 +169,7 @@ private Headers readHeaders(HttpServerExchange exchange) { } private Map> readParameters(HttpServerExchange exchange) throws IOException { - Map> parameters = new HashMap<>(); + var parameters = new HashMap>(); parameters.putAll(readQueryParameters(exchange)); parameters.putAll(readFormParameters(exchange)); return parameters; @@ -177,15 +177,15 @@ private Map> readParameters(HttpServerExchange exchange) th private Map> readQueryParameters(HttpServerExchange exchange) { return exchange.getQueryParameters().entrySet().stream().collect(Collectors.toMap( - Map.Entry::getKey, e -> new ArrayList<>(e.getValue()))); + Map.Entry::getKey, it -> new ArrayList<>(it.getValue()))); } private Map> readFormParameters(HttpServerExchange exchange) throws IOException { - FormEncodedDataDefinition form = new FormEncodedDataDefinition(); + var form = new FormEncodedDataDefinition(); form.setDefaultEncoding(StandardCharsets.UTF_8.name()); try (FormDataParser parser = form.create(exchange)) { - Map> parameters = new HashMap<>(); + var parameters = new HashMap>(); if (parser == null) return parameters; FormData data = parser.parseBlocking(); @@ -200,7 +200,7 @@ private Map> readFormParameters(HttpServerExchange exchange } private List readParts(HttpServerExchange exchange) throws IOException { - MultiPartParserDefinition multipart = new MultiPartParserDefinition(); + var multipart = new MultiPartParserDefinition(); multipart.setDefaultEncoding(StandardCharsets.UTF_8.name()); try(FormDataParser parser = multipart.create(exchange)) { @@ -210,11 +210,11 @@ private List readParts(HttpServerExchange exchange) throws IOException FormData data = parser.parseBlocking(); for (String name : data) { for (FormData.FormValue param : data.get(name)) { - BodyPart part = new BodyPart().filename(param.getFileName()) - .contentType(contentTypeOf(param)) - .name(name); + var part = new BodyPart().filename(param.getFileName()) + .contentType(contentTypeOf(param)) + .name(name); if (param.isFileItem()) { - final FileInputStream content = new FileInputStream(param.getFileItem().getFile().toFile()); + var content = new FileInputStream(param.getFileItem().getFile().toFile()); part.content(track(content)); } else { part.content(param.getValue()); diff --git a/src/main/java/com/vtence/molecule/session/CookieSessionStore.java b/src/main/java/com/vtence/molecule/session/CookieSessionStore.java index c21a95d..15a0eec 100644 --- a/src/main/java/com/vtence/molecule/session/CookieSessionStore.java +++ b/src/main/java/com/vtence/molecule/session/CookieSessionStore.java @@ -14,7 +14,7 @@ public class CookieSessionStore implements SessionStore { private int timeToLive; public static CookieSessionStore secure(String key, String... oldKeys) { - SecureSessionEncoder secureEncoder = new SecureSessionEncoder(key); + var secureEncoder = new SecureSessionEncoder(key); secureEncoder.acceptAlternateKeys(oldKeys); return new CookieSessionStore(new SecureIdentifierPolicy(), secureEncoder); } @@ -99,7 +99,7 @@ private String sessionId(Session data) { } private Session makeSession(Session data, String sid) { - Session session = new Session(sid); + var session = new Session(sid); session.merge(data); session.maxAge(data.maxAge()); session.updatedAt(data.updatedAt()); diff --git a/src/main/java/com/vtence/molecule/session/Serializer.java b/src/main/java/com/vtence/molecule/session/Serializer.java index 713586b..147111c 100644 --- a/src/main/java/com/vtence/molecule/session/Serializer.java +++ b/src/main/java/com/vtence/molecule/session/Serializer.java @@ -15,8 +15,8 @@ public Serializer(Class type) { } public byte[] marshall(T data) throws IOException { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutputStream output = new ObjectOutputStream(buffer); + var buffer = new ByteArrayOutputStream(); + var output = new ObjectOutputStream(buffer); output.writeObject(data); output.flush(); output.close(); @@ -24,7 +24,7 @@ public byte[] marshall(T data) throws IOException { } public T unmarshall(byte[] data) throws Exception { - ObjectInputStream input = new ObjectInputStream(new ByteArrayInputStream(data)); + var input = new ObjectInputStream(new ByteArrayInputStream(data)); return type.cast(input.readObject()); } } diff --git a/src/main/java/com/vtence/molecule/session/SessionPool.java b/src/main/java/com/vtence/molecule/session/SessionPool.java index 16458c3..ba8e482 100644 --- a/src/main/java/com/vtence/molecule/session/SessionPool.java +++ b/src/main/java/com/vtence/molecule/session/SessionPool.java @@ -100,7 +100,7 @@ private String sessionId(Session data) { } private Session makeSession(String sid, Session data) { - Session session = new Session(sid); + var session = new Session(sid); session.merge(data); session.maxAge(data.maxAge()); session.updatedAt(data.updatedAt()); diff --git a/src/main/java/com/vtence/molecule/ssl/KeyStoreType.java b/src/main/java/com/vtence/molecule/ssl/KeyStoreType.java index 46a9236..b385f63 100644 --- a/src/main/java/com/vtence/molecule/ssl/KeyStoreType.java +++ b/src/main/java/com/vtence/molecule/ssl/KeyStoreType.java @@ -23,19 +23,19 @@ public enum KeyStoreType { } public KeyStore open(InputStream keyStore, String password) throws GeneralSecurityException, IOException { - KeyStore store = KeyStore.getInstance(type); + var store = KeyStore.getInstance(type); store.load(keyStore, password.toCharArray()); return store; } public KeyStore open(File keyStore, String password) throws GeneralSecurityException, IOException { - try (InputStream source = new FileInputStream(keyStore)) { + try (var source = new FileInputStream(keyStore)) { return open(source, password); } } public KeyManager[] loadKeys(KeyStore keyStore, String keyPassword) throws GeneralSecurityException { - KeyManagerFactory keys = KeyManagerFactory.getInstance(algorithm); + var keys = KeyManagerFactory.getInstance(algorithm); keys.init(keyStore, keyPassword.toCharArray()); return keys.getKeyManagers(); } diff --git a/src/main/java/com/vtence/molecule/ssl/SecureProtocol.java b/src/main/java/com/vtence/molecule/ssl/SecureProtocol.java index c8a89d4..eae6100 100644 --- a/src/main/java/com/vtence/molecule/ssl/SecureProtocol.java +++ b/src/main/java/com/vtence/molecule/ssl/SecureProtocol.java @@ -20,7 +20,7 @@ public SSLContext initialize(KeyManager[] keys) throws GeneralSecurityException } public SSLContext initialize(KeyManager[] keys, TrustManager[] trusts) throws GeneralSecurityException { - SSLContext context = SSLContext.getInstance(protocol); + var context = SSLContext.getInstance(protocol); context.init(keys, trusts, null); return context; } diff --git a/src/main/java/com/vtence/molecule/templating/TemplateBody.java b/src/main/java/com/vtence/molecule/templating/TemplateBody.java index b2ba20b..49ee03f 100644 --- a/src/main/java/com/vtence/molecule/templating/TemplateBody.java +++ b/src/main/java/com/vtence/molecule/templating/TemplateBody.java @@ -21,7 +21,7 @@ public TemplateBody(RenderingEngine renderer, String templateName, Object contex } public void writeTo(OutputStream out, Charset charset) throws IOException { - Writer writer = new BufferedWriter(new OutputStreamWriter(out, charset)); + var writer = new BufferedWriter(new OutputStreamWriter(out, charset)); renderer.render(writer, template, context); writer.flush(); } diff --git a/src/main/java/com/vtence/molecule/testing/BodyContent.java b/src/main/java/com/vtence/molecule/testing/BodyContent.java index c5bfd82..058b317 100644 --- a/src/main/java/com/vtence/molecule/testing/BodyContent.java +++ b/src/main/java/com/vtence/molecule/testing/BodyContent.java @@ -10,7 +10,7 @@ public class BodyContent { public static byte[] asBytes(Response response) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); + var out = new ByteArrayOutputStream(); try { response.body().writeTo(out, response.charset()); } catch (IOException e) { diff --git a/src/main/java/com/vtence/molecule/testing/CharsetDetector.java b/src/main/java/com/vtence/molecule/testing/CharsetDetector.java index 34cc37c..748f5ba 100644 --- a/src/main/java/com/vtence/molecule/testing/CharsetDetector.java +++ b/src/main/java/com/vtence/molecule/testing/CharsetDetector.java @@ -5,7 +5,7 @@ public class CharsetDetector { public static String detectCharsetOf(byte[] data) { - UniversalDetector charsetDetector = new UniversalDetector(charset -> {}); + var charsetDetector = new UniversalDetector(charset -> {}); charsetDetector.handleData(data, 0, data.length); charsetDetector.dataEnd(); return charsetDetector.getDetectedCharset(); diff --git a/src/main/java/com/vtence/molecule/testing/http/ByteCountingOutputStream.java b/src/main/java/com/vtence/molecule/testing/http/ByteCountingOutputStream.java index 83f6597..d441cc0 100644 --- a/src/main/java/com/vtence/molecule/testing/http/ByteCountingOutputStream.java +++ b/src/main/java/com/vtence/molecule/testing/http/ByteCountingOutputStream.java @@ -12,12 +12,12 @@ public long byteCount() { } @Override - public void write(int b) throws IOException { + public void write(int b) { count++; } @Override - public void write(byte[] b, int off, int len) throws IOException { + public void write(byte[] b, int off, int len) { count += len; } } \ No newline at end of file diff --git a/src/main/java/com/vtence/molecule/testing/http/MultipartForm.java b/src/main/java/com/vtence/molecule/testing/http/MultipartForm.java index fa5f126..ca8d3c5 100644 --- a/src/main/java/com/vtence/molecule/testing/http/MultipartForm.java +++ b/src/main/java/com/vtence/molecule/testing/http/MultipartForm.java @@ -20,10 +20,10 @@ public class MultipartForm extends Form { @Override public void subscribe(Flow.Subscriber subscriber) { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + var buffer = new ByteArrayOutputStream(); try { writeTo(buffer); - HttpRequest.BodyPublisher delegate = HttpRequest.BodyPublishers.ofByteArray(buffer.toByteArray()); + var delegate = HttpRequest.BodyPublishers.ofByteArray(buffer.toByteArray()); delegate.subscribe(subscriber); } catch (IOException e) { subscriber.onError(e); @@ -32,7 +32,7 @@ public void subscribe(Flow.Subscriber subscriber) { @Override public long contentLength() { - ByteCountingOutputStream out = new ByteCountingOutputStream(); + var out = new ByteCountingOutputStream(); try { writeTo(out); } catch (IOException ignored) { @@ -78,7 +78,7 @@ public MultipartForm addBinaryFile(String name, File file, String contentType) { } public void writeTo(OutputStream out) throws IOException { - Writer writer = new OutputStreamWriter(out, charset); + var writer = new OutputStreamWriter(out, charset); for (Part part : parts) { writer.append("--").append(boundary).append(CRLF); writer.flush(); @@ -104,8 +104,8 @@ public Field(String name, String value) { @Override public void encode(OutputStream out, Charset charset) throws IOException { - Writer writer = new OutputStreamWriter(out, charset); - URLEscaper escaper = URLEscaper.to(charset); + var writer = new OutputStreamWriter(out, charset); + var escaper = URLEscaper.to(charset); writer.append("Content-Disposition: form-data; name=\"").append(escaper.escape(name)).append("\"").append(CRLF); writer.append(CRLF); writer.append(value).append(CRLF); @@ -128,8 +128,8 @@ public FilePart(String name, File file, String contentType, boolean binary) { } public void encode(OutputStream out, Charset charset) throws IOException { - Writer writer = new OutputStreamWriter(out, charset); - URLEscaper escaper = URLEscaper.to(charset); + var writer = new OutputStreamWriter(out, charset); + var escaper = URLEscaper.to(charset); writer.append("Content-Disposition: form-data"); if (name != null) { writer.append("; name=\"").append(escaper.escape(name)).append("\""); @@ -156,7 +156,7 @@ private void writeFileContent(OutputStream output) throws IOException { } private Charset fileCharset() { - ContentType contentType = ContentType.parse(this.contentType); + var contentType = ContentType.parse(this.contentType); return contentType.charset() != null ? contentType.charset() : StandardCharsets.UTF_8; } } diff --git a/src/main/java/com/vtence/molecule/testing/http/UrlEncodedForm.java b/src/main/java/com/vtence/molecule/testing/http/UrlEncodedForm.java index b95de6c..94b67b0 100644 --- a/src/main/java/com/vtence/molecule/testing/http/UrlEncodedForm.java +++ b/src/main/java/com/vtence/molecule/testing/http/UrlEncodedForm.java @@ -16,7 +16,7 @@ public class UrlEncodedForm extends Form { @Override public long contentLength() { - ByteCountingOutputStream out = new ByteCountingOutputStream(); + var out = new ByteCountingOutputStream(); try { writeTo(out); } catch (IOException ignored) { @@ -27,10 +27,10 @@ public long contentLength() { @Override public void subscribe(Flow.Subscriber subscriber) { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + var buffer = new ByteArrayOutputStream(); try { writeTo(buffer); - BodyPublisher delegate = BodyPublishers.ofByteArray(buffer.toByteArray()); + var delegate = BodyPublishers.ofByteArray(buffer.toByteArray()); delegate.subscribe(subscriber); } catch (IOException e) { subscriber.onError(e); @@ -80,8 +80,8 @@ public Field(String name, String value) { } public void encode(OutputStream out, Charset charset) throws IOException { - URLEscaper escaper = URLEscaper.to(charset); - Writer writer = new OutputStreamWriter(out, charset); + var escaper = URLEscaper.to(charset); + var writer = new OutputStreamWriter(out, charset); writer.append(escaper.escape(name)).append("=").append(escaper.escape(value)); writer.flush(); }