From f462d7335567960978e16c5e042c99b54daa94b6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 12 Dec 2019 11:28:12 +0300
Subject: Cleanup IDEA code issues

---
 src/main/java/com/juick/util/DateFormatter.java       |  1 -
 src/main/java/com/juick/util/MessageUtils.java        | 13 +++++--------
 src/main/java/com/juick/util/PrettyTimeFormatter.java | 14 ++++++--------
 3 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'src/main/java/com/juick/util')

diff --git a/src/main/java/com/juick/util/DateFormatter.java b/src/main/java/com/juick/util/DateFormatter.java
index 8f569562..0a14f3dc 100644
--- a/src/main/java/com/juick/util/DateFormatter.java
+++ b/src/main/java/com/juick/util/DateFormatter.java
@@ -20,7 +20,6 @@ package com.juick.util;
 import org.apache.commons.lang3.StringUtils;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/juick/util/MessageUtils.java b/src/main/java/com/juick/util/MessageUtils.java
index 9b668b7c..b922d980 100644
--- a/src/main/java/com/juick/util/MessageUtils.java
+++ b/src/main/java/com/juick/util/MessageUtils.java
@@ -28,6 +28,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -270,16 +271,12 @@ public class MessageUtils {
 
     // TODO: check if it is really needed
     public static String percentEncode(final String s) {
-        String ret = StringUtils.EMPTY;
-        try {
-            ret = URLEncoder.encode(s, CharEncoding.UTF_8).replace("+", "%20").replace("*", "%2A").replace("%7E", "~");
-        } catch (UnsupportedEncodingException e) {
-        }
-        return ret;
+        return URLEncoder.encode(s, StandardCharsets.UTF_8).replace("+", "%20")
+                .replace("*", "%2A").replace("%7E", "~");
     }
     public static String formatMarkdownText(final Message msg) {
-        String s = StringUtils.defaultString(msg.getText()).replaceAll(replyNumberRegex, String.format("$1[/$2](https://juick.com/m/%d#$2)$3", msg.getMid()));
-        return escapeMarkdown(s);
+        return StringUtils.defaultString(msg.getText())
+                .replaceAll(replyNumberRegex, String.format("$1[/$2](https://juick.com/m/%d#$2)$3", msg.getMid()));
     }
     public static String escapeMarkdown(final String s) {
         return s.replace("_", "\\_").replace("*", "\\*")
diff --git a/src/main/java/com/juick/util/PrettyTimeFormatter.java b/src/main/java/com/juick/util/PrettyTimeFormatter.java
index 383f4d9a..792d185d 100644
--- a/src/main/java/com/juick/util/PrettyTimeFormatter.java
+++ b/src/main/java/com/juick/util/PrettyTimeFormatter.java
@@ -32,14 +32,12 @@ public class PrettyTimeFormatter {
 
     // Cache PrettyTime per locale. LRU cache to prevent memory leak.
     private static final Map<Locale, PrettyTime> PRETTY_TIME_LOCALE_MAP =
-            new LinkedHashMap<Locale, PrettyTime>(MAX_CACHE_SIZE + 1, 1.1F, true)
-    {
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<Locale, PrettyTime> eldest)
-        {
-            return size() > MAX_CACHE_SIZE;
-        }
-    };
+            new LinkedHashMap<>(MAX_CACHE_SIZE + 1, 1.1F, true) {
+                @Override
+                protected boolean removeEldestEntry(Map.Entry<Locale, PrettyTime> eldest) {
+                    return size() > MAX_CACHE_SIZE;
+                }
+            };
 
     public String format(final Locale locale, final Date value)
     {
-- 
cgit v1.2.3