Merge remote-tracking branch 'origin/2.9.9-dev' into 2.9.9-dev

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

@@ -118,13 +118,4 @@ public class ArchiveDateQueryService {
             throw new ServiceException("Gets archive date[string=" + archiveDateString + "] failed");
         }
     }
-
-    /**
-     * Sets archive date repository with the specified archive date repository.
-     *
-     * @param archiveDateRepository the specified archive date repository
-     */
-    public void setArchiveDateRepository(final ArchiveDateRepository archiveDateRepository) {
-        this.archiveDateRepository = archiveDateRepository;
-    }
 }

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

@@ -925,130 +925,4 @@ public class ArticleMgmtService {
 
         return ret.replaceAll(" ", "-");
     }
-
-    /**
-     * Sets archive date article repository with the specified archive date article repository.
-     *
-     * @param archiveDateArticleRepository the specified archive date article repository
-     */
-    public void setArchiveDateArticleRepository(final ArchiveDateArticleRepository archiveDateArticleRepository) {
-        this.archiveDateArticleRepository = archiveDateArticleRepository;
-    }
-
-    /**
-     * Sets archive date repository with the specified archive date repository.
-     *
-     * @param archiveDateRepository the specified archive date repository
-     */
-    public void setArchiveDateRepository(final ArchiveDateRepository archiveDateRepository) {
-        this.archiveDateRepository = archiveDateRepository;
-    }
-
-    /**
-     * Sets the article repository with the specified article repository.
-     *
-     * @param articleRepository the specified article repository
-     */
-    public void setArticleRepository(final ArticleRepository articleRepository) {
-        this.articleRepository = articleRepository;
-    }
-
-    /**
-     * Sets the article query service with the specified article query service.
-     *
-     * @param articleQueryService the specified article query service
-     */
-    public void setArticleQueryService(final ArticleQueryService articleQueryService) {
-        this.articleQueryService = articleQueryService;
-    }
-
-    /**
-     * Sets the permalink query service with the specified permalink query service.
-     *
-     * @param permalinkQueryService the specified permalink query service
-     */
-    public void setPermalinkQueryService(final PermalinkQueryService permalinkQueryService) {
-        this.permalinkQueryService = permalinkQueryService;
-    }
-
-    /**
-     * Sets the user repository with the specified user repository.
-     *
-     * @param userRepository the specified user repository
-     */
-    public void setUserRepository(final UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    /**
-     * Sets the preference query service with the specified preference query service.
-     *
-     * @param preferenceQueryService the specified preference query service
-     */
-    public void setPreferenceQueryService(final PreferenceQueryService preferenceQueryService) {
-        this.preferenceQueryService = preferenceQueryService;
-    }
-
-    /**
-     * Sets the statistic management service with the specified statistic management service.
-     *
-     * @param statisticMgmtService the specified statistic management service
-     */
-    public void setStatisticMgmtService(final StatisticMgmtService statisticMgmtService) {
-        this.statisticMgmtService = statisticMgmtService;
-    }
-
-    /**
-     * Sets the statistic query service with the specified statistic query service.
-     *
-     * @param statisticQueryService the specified statistic query service
-     */
-    public void setStatisticQueryService(final StatisticQueryService statisticQueryService) {
-        this.statisticQueryService = statisticQueryService;
-    }
-
-    /**
-     * Sets the tag repository with the specified tag repository.
-     *
-     * @param tagRepository the specified tag repository
-     */
-    public void setTagRepository(final TagRepository tagRepository) {
-        this.tagRepository = tagRepository;
-    }
-
-    /**
-     * Sets the tag article repository with the specified tag article repository.
-     *
-     * @param tagArticleRepository the specified tag article repository
-     */
-    public void setTagArticleRepository(final TagArticleRepository tagArticleRepository) {
-        this.tagArticleRepository = tagArticleRepository;
-    }
-
-    /**
-     * Sets tag management service with the specified tag management service.
-     *
-     * @param tagMgmtService the specified tag management service
-     */
-    public void setTagMgmtService(final TagMgmtService tagMgmtService) {
-        this.tagMgmtService = tagMgmtService;
-    }
-
-    /**
-     * Sets the comment repository with the specified comment repository.
-     *
-     * @param commentRepository the specified comment repository
-     */
-    public void setCommentRepository(final CommentRepository commentRepository) {
-        this.commentRepository = commentRepository;
-    }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -1089,67 +1089,4 @@ public class ArticleQueryService {
         article.remove(Article.ARTICLE_PUT_TOP);
         article.remove(Article.ARTICLE_HAD_BEEN_PUBLISHED);
     }
-
-    /**
-     * Sets archive date article repository with the specified archive date article repository.
-     *
-     * @param archiveDateArticleRepository the specified archive date article repository
-     */
-    public void setArchiveDateArticleRepository(final ArchiveDateArticleRepository archiveDateArticleRepository) {
-        this.archiveDateArticleRepository = archiveDateArticleRepository;
-    }
-
-    /**
-     * Sets the article repository with the specified article repository.
-     *
-     * @param articleRepository the specified article repository
-     */
-    public void setArticleRepository(final ArticleRepository articleRepository) {
-        this.articleRepository = articleRepository;
-    }
-
-    /**
-     * Sets the user repository with the specified user repository.
-     *
-     * @param userRepository the specified user repository
-     */
-    public void setUserRepository(final UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    /**
-     * Sets the preference query service with the specified preference query service.
-     *
-     * @param preferenceQueryService the specified preference query service
-     */
-    public void setPreferenceQueryService(final PreferenceQueryService preferenceQueryService) {
-        this.preferenceQueryService = preferenceQueryService;
-    }
-
-    /**
-     * Sets the statistic query service with the specified statistic query service.
-     *
-     * @param statisticQueryService the specified statistic query service
-     */
-    public void setStatisticQueryService(final StatisticQueryService statisticQueryService) {
-        this.statisticQueryService = statisticQueryService;
-    }
-
-    /**
-     * Sets the tag repository with the specified tag repository.
-     *
-     * @param tagRepository the specified tag repository
-     */
-    public void setTagRepository(final TagRepository tagRepository) {
-        this.tagRepository = tagRepository;
-    }
-
-    /**
-     * Sets the tag article repository with the specified tag article repository.
-     *
-     * @param tagArticleRepository the specified tag article repository
-     */
-    public void setTagArticleRepository(final TagArticleRepository tagArticleRepository) {
-        this.tagArticleRepository = tagArticleRepository;
-    }
 }

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

@@ -763,67 +763,4 @@ public class CommentMgmtService {
 
         comment.put(Comment.COMMENT_THUMBNAIL_URL, thumbnailURL);
     }
-
-    /**
-     * Sets the article repository with the specified article repository.
-     *
-     * @param articleRepository the specified article repository
-     */
-    public void setArticleRepository(final ArticleRepository articleRepository) {
-        this.articleRepository = articleRepository;
-    }
-
-    /**
-     * Sets the article management service with the specified article management service.
-     *
-     * @param articleMgmtService the specified article management service
-     */
-    public void setArticleMgmtService(final ArticleMgmtService articleMgmtService) {
-        this.articleMgmtService = articleMgmtService;
-    }
-
-    /**
-     * Set the page repository with the specified page repository.
-     *
-     * @param pageRepository the specified page repository
-     */
-    public void setPageRepository(final PageRepository pageRepository) {
-        this.pageRepository = pageRepository;
-    }
-
-    /**
-     * Sets the preference query service with the specified preference query service.
-     *
-     * @param preferenceQueryService the specified preference query service
-     */
-    public void setPreferenceQueryService(final PreferenceQueryService preferenceQueryService) {
-        this.preferenceQueryService = preferenceQueryService;
-    }
-
-    /**
-     * Sets the statistic management service with the specified statistic management service.
-     *
-     * @param statisticMgmtService the specified statistic management service
-     */
-    public void setStatisticMgmtService(final StatisticMgmtService statisticMgmtService) {
-        this.statisticMgmtService = statisticMgmtService;
-    }
-
-    /**
-     * Sets the comment repository with the specified comment repository.
-     *
-     * @param commentRepository the specified comment repository
-     */
-    public void setCommentRepository(final CommentRepository commentRepository) {
-        this.commentRepository = commentRepository;
-    }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -278,31 +278,4 @@ public class CommentQueryService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Sets the article repository with the specified article repository.
-     *
-     * @param articleRepository the specified article repository
-     */
-    public void setArticleRepository(final ArticleRepository articleRepository) {
-        this.articleRepository = articleRepository;
-    }
-
-    /**
-     * Set the page repository with the specified page repository.
-     *
-     * @param pageRepository the specified page repository
-     */
-    public void setPageRepository(final PageRepository pageRepository) {
-        this.pageRepository = pageRepository;
-    }
-
-    /**
-     * Sets the comment repository with the specified comment repository.
-     *
-     * @param commentRepository the specified comment repository
-     */
-    public void setCommentRepository(final CommentRepository commentRepository) {
-        this.commentRepository = commentRepository;
-    }
 }

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

@@ -199,13 +199,4 @@ public class LinkMgmtService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Sets the link repository with the specified link repository.
-     *
-     * @param linkRepository the specified link repository
-     */
-    public void setLinkRepository(final LinkRepository linkRepository) {
-        this.linkRepository = linkRepository;
-    }
 }

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

@@ -147,13 +147,4 @@ public class LinkQueryService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Sets the link repository with the specified link repository.
-     *
-     * @param linkRepository the specified link repository
-     */
-    public void setLinkRepository(final LinkRepository linkRepository) {
-        this.linkRepository = linkRepository;
-    }
 }

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

@@ -104,13 +104,4 @@ public class OptionMgmtService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Sets the option repository with the specified option repository.
-     *
-     * @param optionRepository the specified option repository
-     */
-    public void setOptionRepository(final OptionRepository optionRepository) {
-        this.optionRepository = optionRepository;
-    }
 }

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

@@ -75,13 +75,4 @@ public class OptionQueryService {
             return null;
         }
     }
-
-    /**
-     * Sets the option repository with the specified option repository.
-     *
-     * @param optionRepository the specified option repository
-     */
-    public void setOptionRepository(final OptionRepository optionRepository) {
-        this.optionRepository = optionRepository;
-    }
 }

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

@@ -473,67 +473,4 @@ public class PageMgmtService {
             commentRepository.update(commentId, comment);
         }
     }
-
-    /**
-     * Sets the permalink query service with the specified permalink query service.
-     *
-     * @param permalinkQueryService the specified permalink query service
-     */
-    public void setPermalinkQueryService(final PermalinkQueryService permalinkQueryService) {
-        this.permalinkQueryService = permalinkQueryService;
-    }
-
-    /**
-     * Set the page repository with the specified page repository.
-     *
-     * @param pageRepository the specified page repository
-     */
-    public void setPageRepository(final PageRepository pageRepository) {
-        this.pageRepository = pageRepository;
-    }
-
-    /**
-     * Sets the preference query service with the specified preference query service.
-     *
-     * @param preferenceQueryService the specified preference query service
-     */
-    public void setPreferenceQueryService(final PreferenceQueryService preferenceQueryService) {
-        this.preferenceQueryService = preferenceQueryService;
-    }
-
-    /**
-     * Sets the statistic query service with the specified statistic query service.
-     *
-     * @param statisticQueryService the specified statistic query service
-     */
-    public void setStatisticQueryService(final StatisticQueryService statisticQueryService) {
-        this.statisticQueryService = statisticQueryService;
-    }
-
-    /**
-     * Sets the statistic management service with the specified statistic management service.
-     *
-     * @param statisticMgmtService the specified statistic management service
-     */
-    public void setStatisticMgmtService(final StatisticMgmtService statisticMgmtService) {
-        this.statisticMgmtService = statisticMgmtService;
-    }
-
-    /**
-     * Sets the comment repository with the specified comment repository.
-     *
-     * @param commentRepository the specified comment repository
-     */
-    public void setCommentRepository(final CommentRepository commentRepository) {
-        this.commentRepository = commentRepository;
-    }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -163,13 +163,4 @@ public class PageQueryService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Set the page repository with the specified page repository.
-     *
-     * @param pageRepository the specified page repository
-     */
-    public void setPageRepository(final PageRepository pageRepository) {
-        this.pageRepository = pageRepository;
-    }
 }

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

@@ -217,22 +217,4 @@ public class PermalinkQueryService {
             return true;
         }
     }
-
-    /**
-     * Sets the article repository with the specified article repository.
-     *
-     * @param articleRepository the specified article repository
-     */
-    public void setArticleRepository(final ArticleRepository articleRepository) {
-        this.articleRepository = articleRepository;
-    }
-
-    /**
-     * Set the page repository with the specified page repository.
-     *
-     * @param pageRepository the specified page repository
-     */
-    public void setPageRepository(final PageRepository pageRepository) {
-        this.pageRepository = pageRepository;
-    }
 }

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

@@ -250,22 +250,4 @@ public class PluginMgmtService {
         return ret;
 
     }
-
-    /**
-     * Sets the plugin repository with the specified plugin repository.
-     *
-     * @param pluginRepository the specified plugin repository
-     */
-    public void setPluginRepository(final PluginRepository pluginRepository) {
-        this.pluginRepository = pluginRepository;
-    }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -156,13 +156,4 @@ public class PluginQueryService {
 
         return ret.optString(Plugin.PLUGIN_SETTING);
     }
-
-    /**
-     * Sets the plugin repository with the specified plugin repository.
-     *
-     * @param pluginRepository the specified plugin repository
-     */
-    public void setPluginRepository(final PluginRepository pluginRepository) {
-        this.pluginRepository = pluginRepository;
-    }
 }

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

@@ -373,13 +373,4 @@ public class PreferenceMgmtService {
 
         LOGGER.log(Level.DEBUG, "Updates preference successfully");
     }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -279,31 +279,4 @@ public class StatisticMgmtService {
         optionRepository.update(id, statistic);
         statisticCache.clear();
     }
-
-    /**
-     * Sets the article repository with the specified article repository.
-     *
-     * @param articleRepository the specified article repository
-     */
-    public void setArticleRepository(final ArticleRepository articleRepository) {
-        this.articleRepository = articleRepository;
-    }
-
-    /**
-     * Sets the option repository with the specified option repository.
-     *
-     * @param optionRepository the specified option repository
-     */
-    public void setOptionRepository(final OptionRepository optionRepository) {
-        this.optionRepository = optionRepository;
-    }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -92,13 +92,4 @@ public class StatisticQueryService {
             return null;
         }
     }
-
-    /**
-     * Sets the option query service with the specified option query service.
-     *
-     * @param optionQueryService the specified option query service
-     */
-    public void setOptionQueryService(final OptionQueryService optionQueryService) {
-        this.optionQueryService = optionQueryService;
-    }
 }

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

@@ -101,22 +101,4 @@ public class TagMgmtService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Sets the tag repository with the specified tag repository.
-     *
-     * @param tagRepository the specified tag repository
-     */
-    public void setTagRepository(final TagRepository tagRepository) {
-        this.tagRepository = tagRepository;
-    }
-
-    /**
-     * Sets the tag query service with the specified tag query service.
-     *
-     * @param tagQueryService the specified tag query service
-     */
-    public void setTagQueryService(final TagQueryService tagQueryService) {
-        this.tagQueryService = tagQueryService;
-    }
 }

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

@@ -137,13 +137,4 @@ public class TagQueryService {
             throw new ServiceException(e);
         }
     }
-
-    /**
-     * Sets the tag repository with the specified tag repository.
-     *
-     * @param tagRepository the specified tag repository
-     */
-    public void setTagRepository(final TagRepository tagRepository) {
-        this.tagRepository = tagRepository;
-    }
 }

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

@@ -327,22 +327,4 @@ public class UserMgmtService {
             }
         }
     }
-
-    /**
-     * Sets the user repository with the specified user repository.
-     *
-     * @param userRepository the specified user repository
-     */
-    public void setUserRepository(final UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    /**
-     * Sets the language service with the specified language service.
-     *
-     * @param langPropsService the specified language service
-     */
-    public void setLangPropsService(final LangPropsService langPropsService) {
-        this.langPropsService = langPropsService;
-    }
 }

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

@@ -215,22 +215,4 @@ public class UserQueryService {
 
         return Latkes.getContextPath() + "/login?goto=" + to;
     }
-
-    /**
-     * Sets the user management service with the specified user management service.
-     *
-     * @param userMgmtService the specified user management service
-     */
-    public void setUserMgmtService(final UserMgmtService userMgmtService) {
-        this.userMgmtService = userMgmtService;
-    }
-
-    /**
-     * Sets the user repository with the specified user repository.
-     *
-     * @param userRepository the specified user repository
-     */
-    public void setUserRepository(final UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
 }

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

@@ -56,7 +56,7 @@ import java.util.ResourceBundle;
  * Solo utilities.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.6.0.1, Jan 29, 2019
+ * @version 1.6.0.2, Jan 30, 2019
  * @since 2.8.0
  */
 public final class Solos {
@@ -177,7 +177,7 @@ public final class Solos {
      */
     public static JSONArray getGitHubRepos(final String githubUserId) {
         try {
-            final HttpResponse res = HttpRequest.get("https://hacpai.com/github/repos?id=" + githubUserId).
+            final HttpResponse res = HttpRequest.get("https://hacpai.com/github/repos?id=" + githubUserId).trustAllCerts(true).
                     connectionTimeout(3000).timeout(7000).header("User-Agent", Solos.USER_AGENT).send();
             if (HttpServletResponse.SC_OK != res.statusCode()) {
                 return null;

src/test/resources/admin-article.ftl

@@ -38,7 +38,7 @@
         </div>
         <div>
             <textarea id="articleContent" name="articleContent"
-                  style="height: 500px;width:100%;"></textarea>
+                      style="height: 500px;width:100%;"></textarea>
         </div>
     </div>
     <div>
@@ -80,7 +80,7 @@
             <span id="postToCommunityPanel">
                 <label class="checkbox">
                     <input id="postToCommunity" type="checkbox" />
-                    <a href="https://hacpai.com/article/1546941897596" target="_blank">${syncToCommunity}</a>
+                    <a href="https://hacpai.com/article/1546941897596" target="_blank">${syncToCommunityLabel}</a>
                 </label>
             </span>
         </div>