♻ #12515 合并工具方法

src/main/java/org/b3log/solo/cache/ArticleCache.java

@@ -21,7 +21,7 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.ioc.inject.Named;
 import org.b3log.latke.ioc.inject.Singleton;
 import org.b3log.solo.model.Article;
-import org.b3log.solo.util.JSONs;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import java.util.Map;
@@ -60,7 +60,7 @@ public class ArticleCache {
             return null;
         }
 
-        return JSONs.clone(article);
+        return Solos.clone(article);
     }
 
     /**
@@ -75,7 +75,7 @@ public class ArticleCache {
             return null;
         }
 
-        return JSONs.clone(article);
+        return Solos.clone(article);
     }
 
     /**
@@ -84,8 +84,8 @@ public class ArticleCache {
      * @param article the specified article
      */
     public void putArticle(final JSONObject article) {
-        idCache.put(article.optString(Keys.OBJECT_ID), JSONs.clone(article));
-        permalinkCache.put(article.optString(Article.ARTICLE_PERMALINK), JSONs.clone(article));
+        idCache.put(article.optString(Keys.OBJECT_ID), Solos.clone(article));
+        permalinkCache.put(article.optString(Article.ARTICLE_PERMALINK), Solos.clone(article));
     }
 
     /**

src/main/java/org/b3log/solo/cache/CommentCache.java

@@ -20,7 +20,7 @@ package org.b3log.solo.cache;
 import org.b3log.latke.Keys;
 import org.b3log.latke.ioc.inject.Named;
 import org.b3log.latke.ioc.inject.Singleton;
-import org.b3log.solo.util.JSONs;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import java.util.Map;
@@ -54,7 +54,7 @@ public class CommentCache {
             return null;
         }
 
-        return JSONs.clone(comment);
+        return Solos.clone(comment);
     }
 
     /**
@@ -63,7 +63,7 @@ public class CommentCache {
      * @param comment the specified comment
      */
     public void putComment(final JSONObject comment) {
-        cache.put(comment.optString(Keys.OBJECT_ID), JSONs.clone(comment));
+        cache.put(comment.optString(Keys.OBJECT_ID), Solos.clone(comment));
     }
 
     /**

src/main/java/org/b3log/solo/cache/OptionCache.java

@@ -21,7 +21,7 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.ioc.inject.Named;
 import org.b3log.latke.ioc.inject.Singleton;
 import org.b3log.solo.model.Option;
-import org.b3log.solo.util.JSONs;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import java.util.Map;
@@ -69,7 +69,7 @@ public class OptionCache {
             return null;
         }
 
-        return JSONs.clone(ret);
+        return Solos.clone(ret);
     }
 
     /**
@@ -94,7 +94,7 @@ public class OptionCache {
             return null;
         }
 
-        return JSONs.clone(option);
+        return Solos.clone(option);
     }
 
     /**
@@ -103,7 +103,7 @@ public class OptionCache {
      * @param option the specified option
      */
     public void putOption(final JSONObject option) {
-        cache.put(option.optString(Keys.OBJECT_ID), JSONs.clone(option));
+        cache.put(option.optString(Keys.OBJECT_ID), Solos.clone(option));
 
         final String category = option.optString(Option.OPTION_CATEGORY);
         removeCategory(category);

src/main/java/org/b3log/solo/cache/PageCache.java

@@ -20,7 +20,7 @@ package org.b3log.solo.cache;
 import org.b3log.latke.Keys;
 import org.b3log.latke.ioc.inject.Named;
 import org.b3log.latke.ioc.inject.Singleton;
-import org.b3log.solo.util.JSONs;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import java.util.Map;
@@ -54,7 +54,7 @@ public class PageCache {
             return null;
         }
 
-        return JSONs.clone(page);
+        return Solos.clone(page);
     }
 
     /**
@@ -65,7 +65,7 @@ public class PageCache {
     public void putPage(final JSONObject page) {
         final String pageId = page.optString(Keys.OBJECT_ID);
 
-        cache.put(pageId, JSONs.clone(page));
+        cache.put(pageId, Solos.clone(page));
     }
 
     /**

src/main/java/org/b3log/solo/cache/UserCache.java

@@ -22,7 +22,7 @@ import org.b3log.latke.ioc.inject.Named;
 import org.b3log.latke.ioc.inject.Singleton;
 import org.b3log.latke.model.Role;
 import org.b3log.latke.model.User;
-import org.b3log.solo.util.JSONs;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import java.util.Map;
@@ -84,7 +84,7 @@ public class UserCache {
             return null;
         }
 
-        return JSONs.clone(user);
+        return Solos.clone(user);
     }
 
     /**
@@ -99,7 +99,7 @@ public class UserCache {
             return null;
         }
 
-        return JSONs.clone(user);
+        return Solos.clone(user);
     }
 
     /**
@@ -108,8 +108,8 @@ public class UserCache {
      * @param user the specified user
      */
     public void putUser(final JSONObject user) {
-        idCache.put(user.optString(Keys.OBJECT_ID), JSONs.clone(user));
-        emailCache.put(user.optString(User.USER_EMAIL), JSONs.clone(user));
+        idCache.put(user.optString(Keys.OBJECT_ID), Solos.clone(user));
+        emailCache.put(user.optString(User.USER_EMAIL), Solos.clone(user));
     }
 
     /**

src/main/java/org/b3log/solo/event/ArticleCommentReplyNotifier.java

@@ -38,7 +38,7 @@ import org.b3log.solo.model.Option;
 import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.impl.CommentRepositoryImpl;
 import org.b3log.solo.service.PreferenceQueryService;
-import org.b3log.solo.util.Mails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 /**
@@ -84,7 +84,7 @@ public class ArticleCommentReplyNotifier extends AbstractEventListener<JSONObjec
             return;
         }
 
-        if (!Mails.isConfigured()) {
+        if (!Solos.isConfigured()) {
             return;
         }
 

src/main/java/org/b3log/solo/event/PageCommentReplyNotifier.java

@@ -39,7 +39,7 @@ import org.b3log.solo.model.Page;
 import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.impl.CommentRepositoryImpl;
 import org.b3log.solo.service.PreferenceQueryService;
-import org.b3log.solo.util.Mails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 /**
@@ -78,7 +78,7 @@ public class PageCommentReplyNotifier extends AbstractEventListener<JSONObject>
             return;
         }
 
-        if (!Mails.isConfigured()) {
+        if (!Solos.isConfigured()) {
             return;
         }
 

src/main/java/org/b3log/solo/processor/ArticleProcessor.java

@@ -47,7 +47,7 @@ import org.b3log.solo.processor.console.ConsoleRenderer;
 import org.b3log.solo.service.DataModelService;
 import org.b3log.solo.service.*;
 import org.b3log.solo.util.Skins;
-import org.b3log.solo.util.Thumbnails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 import org.jsoup.Jsoup;
 
@@ -768,7 +768,7 @@ public class ArticleProcessor {
             if (StringUtils.isNotBlank(userAvatar)) {
                 article.put(Common.AUTHOR_THUMBNAIL_URL, userAvatar);
             } else {
-                final String thumbnailURL = Thumbnails.getGravatarURL(author.optString(User.USER_EMAIL), "128");
+                final String thumbnailURL = Solos.getGravatarURL(author.optString(User.USER_EMAIL), "128");
                 article.put(Common.AUTHOR_THUMBNAIL_URL, thumbnailURL);
             }
 
@@ -864,7 +864,7 @@ public class ArticleProcessor {
         if (StringUtils.isNotBlank(userAvatar)) {
             dataModel.put(Common.AUTHOR_THUMBNAIL_URL, userAvatar);
         } else {
-            final String thumbnailURL = Thumbnails.getGravatarURL(author.optString(User.USER_EMAIL), "128");
+            final String thumbnailURL = Solos.getGravatarURL(author.optString(User.USER_EMAIL), "128");
             dataModel.put(Common.AUTHOR_THUMBNAIL_URL, thumbnailURL);
         }
 

src/main/java/org/b3log/solo/processor/InitProcessor.java

@@ -41,7 +41,7 @@ import org.b3log.solo.model.UserExt;
 import org.b3log.solo.processor.console.ConsoleRenderer;
 import org.b3log.solo.service.DataModelService;
 import org.b3log.solo.service.InitService;
-import org.b3log.solo.util.Thumbnails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;
@@ -172,7 +172,7 @@ public class InitProcessor {
             admin.put(User.USER_PASSWORD, userPassword);
             String avatar = requestJSONObject.optString(UserExt.USER_AVATAR);
             if (StringUtils.isBlank(avatar)) {
-                avatar = Thumbnails.getGravatarURL(userEmail, "128");
+                avatar = Solos.getGravatarURL(userEmail, "128");
             }
             admin.put(UserExt.USER_AVATAR, avatar);
 

src/main/java/org/b3log/solo/processor/LoginProcessor.java

@@ -48,7 +48,7 @@ import org.b3log.solo.processor.console.ConsoleRenderer;
 import org.b3log.solo.service.DataModelService;
 import org.b3log.solo.repository.OptionRepository;
 import org.b3log.solo.service.*;
-import org.b3log.solo.util.Mails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -402,7 +402,7 @@ public class LoginProcessor {
         message.setSubject(mailSubject);
         message.setHtmlBody(mailBody);
 
-        if (Mails.isConfigured()) {
+        if (Solos.isConfigured()) {
             mailService.send(message);
         } else {
             LOGGER.log(Level.INFO, "Do not send mail caused by not configure mail.properties");

src/main/java/org/b3log/solo/processor/RepairProcessor.java

@@ -44,7 +44,7 @@ import org.b3log.solo.service.PreferenceMgmtService;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.b3log.solo.service.StatisticMgmtService;
 import org.b3log.solo.service.StatisticQueryService;
-import org.b3log.solo.util.Mails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -139,7 +139,7 @@ public class RepairProcessor {
             renderer.setContent("Restores signs succeeded.");
 
             // Sends the sample signs to developer
-            if (!Mails.isConfigured()) {
+            if (!Solos.isConfigured()) {
                 return;
             }
 

src/main/java/org/b3log/solo/processor/console/AdminConsole.java

@@ -54,7 +54,7 @@ import org.b3log.solo.service.ExportService;
 import org.b3log.solo.service.OptionQueryService;
 import org.b3log.solo.service.PreferenceQueryService;
 import org.b3log.solo.service.UserQueryService;
-import org.b3log.solo.util.Thumbnails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONObject;
 
 import javax.servlet.ServletOutputStream;
@@ -158,7 +158,7 @@ public class AdminConsole {
         if (StringUtils.isNotBlank(userAvatar)) {
             dataModel.put(Common.GRAVATAR, userAvatar);
         } else {
-            final String gravatar = Thumbnails.getGravatarURL(email, "128");
+            final String gravatar = Solos.getGravatarURL(email, "128");
             dataModel.put(Common.GRAVATAR, gravatar);
         }
 

src/main/java/org/b3log/solo/service/CommentMgmtService.java

@@ -171,7 +171,7 @@ public class CommentMgmtService {
                                      final JSONObject comment,
                                      final JSONObject originalComment,
                                      final JSONObject preference) throws Exception {
-        if (!Mails.isConfigured()) {
+        if (!Solos.isConfigured()) {
             return;
         }
 
@@ -777,7 +777,7 @@ public class CommentMgmtService {
         }
 
         // 2. Gravatar
-        String thumbnailURL = Thumbnails.getGravatarURL(commentEmail.toLowerCase(), "128");
+        String thumbnailURL = Solos.getGravatarURL(commentEmail.toLowerCase(), "128");
         final URL gravatarURL = new URL(thumbnailURL);
 
         int statusCode = HttpServletResponse.SC_OK;

src/main/java/org/b3log/solo/service/CommentQueryService.java

@@ -37,7 +37,7 @@ import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.PageRepository;
 import org.b3log.solo.util.Emotions;
 import org.b3log.solo.util.Markdowns;
-import org.b3log.solo.util.Thumbnails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jsoup.Jsoup;
@@ -246,7 +246,7 @@ public class CommentQueryService {
 
                 final String thumbnailURL = comment.optString(Comment.COMMENT_THUMBNAIL_URL);
                 if (StringUtils.isBlank(thumbnailURL)) {
-                    comment.put(Comment.COMMENT_THUMBNAIL_URL, Thumbnails.getGravatarURL(email, "128"));
+                    comment.put(Comment.COMMENT_THUMBNAIL_URL, Solos.getGravatarURL(email, "128"));
                 }
 
                 if (StringUtils.isNotBlank(comment.optString(Comment.COMMENT_ORIGINAL_COMMENT_ID))) {

src/main/java/org/b3log/solo/service/DataModelService.java

@@ -514,7 +514,7 @@ public class DataModelService {
                 final String email = comment.optString(Comment.COMMENT_EMAIL);
                 final String thumbnailURL = comment.optString(Comment.COMMENT_THUMBNAIL_URL);
                 if (StringUtils.isBlank(thumbnailURL)) {
-                    comment.put(Comment.COMMENT_THUMBNAIL_URL, Thumbnails.getGravatarURL(email, "128"));
+                    comment.put(Comment.COMMENT_THUMBNAIL_URL, Solos.getGravatarURL(email, "128"));
                 }
             }
 
@@ -580,7 +580,7 @@ public class DataModelService {
                     dataModel.put(Common.GRAVATAR, userAvatar);
                 } else {
                     final String email = currentUser.optString(User.USER_EMAIL);
-                    final String gravatar = Thumbnails.getGravatarURL(email, "128");
+                    final String gravatar = Solos.getGravatarURL(email, "128");
                     dataModel.put(Common.GRAVATAR, gravatar);
                 }
 
@@ -878,7 +878,7 @@ public class DataModelService {
             if (StringUtils.isNotBlank(userAvatar)) {
                 article.put(Common.AUTHOR_THUMBNAIL_URL, userAvatar);
             } else {
-                final String thumbnailURL = Thumbnails.getGravatarURL(author.optString(User.USER_EMAIL), "128");
+                final String thumbnailURL = Solos.getGravatarURL(author.optString(User.USER_EMAIL), "128");
                 article.put(Common.AUTHOR_THUMBNAIL_URL, thumbnailURL);
             }
 

src/main/java/org/b3log/solo/service/InitService.java

@@ -45,7 +45,6 @@ import org.b3log.solo.repository.*;
 import org.b3log.solo.util.Images;
 import org.b3log.solo.util.Skins;
 import org.b3log.solo.util.Solos;
-import org.b3log.solo.util.Thumbnails;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -479,7 +478,7 @@ public class InitService {
         admin.put(UserExt.USER_PUBLISHED_ARTICLE_COUNT, 0);
         String avatar = requestJSONObject.optString(UserExt.USER_AVATAR);
         if (StringUtils.isBlank(avatar)) {
-            avatar = Thumbnails.getGravatarURL(requestJSONObject.getString(User.USER_EMAIL), "128");
+            avatar = Solos.getGravatarURL(requestJSONObject.getString(User.USER_EMAIL), "128");
         }
         admin.put(UserExt.USER_AVATAR, avatar);
 

src/main/java/org/b3log/solo/service/UpgradeService.java

@@ -43,8 +43,7 @@ import org.b3log.solo.repository.ArticleRepository;
 import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.OptionRepository;
 import org.b3log.solo.repository.UserRepository;
-import org.b3log.solo.util.Mails;
-import org.b3log.solo.util.Thumbnails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -263,7 +262,7 @@ public class UpgradeService {
         for (int i = 0; i < users.length(); i++) {
             final JSONObject user = users.getJSONObject(i);
             final String email = user.optString(User.USER_EMAIL);
-            user.put(UserExt.USER_AVATAR, Thumbnails.getGravatarURL(email, "128"));
+            user.put(UserExt.USER_AVATAR, Solos.getGravatarURL(email, "128"));
 
             userRepository.update(user.optString(Keys.OBJECT_ID), user);
             LOGGER.log(Level.INFO, "Updated user[email={0}]", email);
@@ -387,7 +386,7 @@ public class UpgradeService {
      * @throws Exception exception
      */
     private void notifyUserByEmail() throws Exception {
-        if (!Mails.isConfigured()) {
+        if (!Solos.isConfigured()) {
             return;
         }
 

src/main/java/org/b3log/solo/service/UserMgmtService.java

@@ -40,7 +40,7 @@ import org.b3log.latke.util.Strings;
 import org.b3log.solo.model.Option;
 import org.b3log.solo.model.UserExt;
 import org.b3log.solo.repository.UserRepository;
-import org.b3log.solo.util.Thumbnails;
+import org.b3log.solo.util.Solos;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -344,7 +344,7 @@ public class UserMgmtService {
 
             String userAvatar = requestJSONObject.optString(UserExt.USER_AVATAR);
             if (StringUtils.isBlank(userAvatar)) {
-                userAvatar = Thumbnails.getGravatarURL(userEmail, "128");
+                userAvatar = Solos.getGravatarURL(userEmail, "128");
             }
             user.put(UserExt.USER_AVATAR, userAvatar);
 

src/main/java/org/b3log/solo/util/JSONs.java

-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2018, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.b3log.solo.util;
-
-import org.b3log.latke.util.CollectionUtils;
-import org.json.JSONObject;
-
-/**
- * JSON utilities.
- *
- * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.0, Jul 16, 2017
- * @since 2.3.0
- */
-public final class JSONs {
-
-    /**
-     * Private constructor.
-     */
-    private JSONs() {
-    }
-
-    /**
-     * Clones a JSON object from the specified source object.
-     *
-     * @param src the specified source object
-     * @return cloned object
-     */
-    public static JSONObject clone(final JSONObject src) {
-        return new JSONObject(src, CollectionUtils.jsonArrayToArray(src.names(), String[].class));
-    }
-}
\ No newline at end of file

src/main/java/org/b3log/solo/util/Mails.java

-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2018, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.b3log.solo.util;
-
-import org.apache.commons.lang.StringUtils;
-
-import java.util.ResourceBundle;
-
-/**
- * Mail utilities.
- *
- * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.0, Jul 20, 2017
- * @since 2.3.0
- */
-public final class Mails {
-
-    /**
-     * Mail configuration (mail.properties).
-     */
-    private static final ResourceBundle mailConf = ResourceBundle.getBundle("mail");
-
-    /**
-     * Private constructor.
-     */
-    private Mails() {
-    }
-
-    /**
-     * Whether user configures the mail.properties.
-     *
-     * @return {@code true} if user configured, returns {@code false} otherwise
-     */
-    public static boolean isConfigured() {
-        try {
-            return StringUtils.isNotBlank(mailConf.getString("mail.user")) &&
-                    StringUtils.isNotBlank(mailConf.getString("mail.password")) &&
-                    StringUtils.isNotBlank(mailConf.getString("mail.smtp.host")) &&
-                    StringUtils.isNotBlank(mailConf.getString("mail.smtp.port"));
-        } catch (final Exception e) {
-            return false;
-        }
-    }
-}

src/main/java/org/b3log/solo/util/Solos.java

@@ -17,10 +17,13 @@
  */
 package org.b3log.solo.util;
 
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
+import org.b3log.latke.util.CollectionUtils;
 import org.b3log.solo.SoloServletListener;
+import org.json.JSONObject;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -29,7 +32,7 @@ import java.util.ResourceBundle;
  * Solo utilities.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.0.1, Sep 28, 2018
+ * @version 1.3.0.0, Sep 28, 2018
  * @since 2.8.0
  */
 public final class Solos {
@@ -39,6 +42,11 @@ public final class Solos {
      */
     private static final Logger LOGGER = Logger.getLogger(Solos.class);
 
+    /**
+     * Mail configuration (mail.properties).
+     */
+    private static final ResourceBundle mailConf = ResourceBundle.getBundle("mail");
+
     /**
      * B3log Rhythm address.
      */
@@ -74,6 +82,7 @@ public final class Solos {
      */
     public static final String USER_AGENT = "Solo/" + SoloServletListener.VERSION + "; +https://github.com/b3log/solo";
 
+
     static {
         ResourceBundle solo;
         try {
@@ -101,6 +110,43 @@ public final class Solos {
         MOBILE_SKIN = mobileSkin;
     }
 
+    /**
+     * Whether user configures the mail.properties.
+     *
+     * @return {@code true} if user configured, returns {@code false} otherwise
+     */
+    public static boolean isConfigured() {
+        try {
+            return StringUtils.isNotBlank(mailConf.getString("mail.user")) &&
+                    StringUtils.isNotBlank(mailConf.getString("mail.password")) &&
+                    StringUtils.isNotBlank(mailConf.getString("mail.smtp.host")) &&
+                    StringUtils.isNotBlank(mailConf.getString("mail.smtp.port"));
+        } catch (final Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Gets the Gravatar URL for the specified email with the specified size.
+     *
+     * @param email the specified email
+     * @param size  the specified size
+     * @return the Gravatar URL
+     */
+    public static String getGravatarURL(final String email, final String size) {
+        return GRAVATAR + DigestUtils.md5Hex(email) + "?s=" + size;
+    }
+
+    /**
+     * Clones a JSON object from the specified source object.
+     *
+     * @param src the specified source object
+     * @return cloned object
+     */
+    public static JSONObject clone(final JSONObject src) {
+        return new JSONObject(src, CollectionUtils.jsonArrayToArray(src.names(), String[].class));
+    }
+
     /**
      * Private constructor.
      */

src/main/java/org/b3log/solo/util/Thumbnails.java

-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2018, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.b3log.solo.util;
-
-import org.apache.commons.codec.digest.DigestUtils;
-
-/**
- * Thumbnail utilities.
- * <p>
- * By using <a href="http://gravatar.com">Gravatar</a> for user thumbnail.
- * </p>
- *
- * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.1.0.2, Aug 2, 2018
- * @since 0.6.1
- */
-public final class Thumbnails {
-
-    /**
-     * Gets the Gravatar URL for the specified email with the specified size.
-     *
-     * @param email the specified email
-     * @param size  the specified size
-     * @return the Gravatar URL
-     */
-    public static String getGravatarURL(final String email, final String size) {
-        return Solos.GRAVATAR + DigestUtils.md5Hex(email) + "?s=" + size;
-    }
-
-    /**
-     * Private constructor.
-     */
-    private Thumbnails() {
-    }
-}

src/test/java/org/b3log/solo/util/ThumbnailsTestCase.java

@@ -33,7 +33,7 @@ import java.util.Locale;
 public final class ThumbnailsTestCase {
 
     /**
-     * Test method for {@linkplain Thumbnails#getGravatarURL(java.lang.String, java.lang.String)}.
+     * Test method for {@linkplain Solos#getGravatarURL(String, String)}.
      *
      * @throws Exception exception
      */
@@ -42,7 +42,7 @@ public final class ThumbnailsTestCase {
         Latkes.initRuntimeEnv();
         Latkes.setLocale(Locale.SIMPLIFIED_CHINESE);
 
-        final String gravatarURL = Thumbnails.getGravatarURL("test@b3log.org", "128");
+        final String gravatarURL = Solos.getGravatarURL("test@b3log.org", "128");
 
         Assert.assertEquals(gravatarURL, Solos.GRAVATAR + "bd7e4673cf7fa4b4777353008c86e093?s=128");
     }