Commit 86bbde7f authored by Liang Ding's avatar Liang Ding

#12580

parent 30044297
...@@ -22,11 +22,11 @@ import org.b3log.latke.ioc.Inject; ...@@ -22,11 +22,11 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
...@@ -100,10 +100,10 @@ public class B3ArticleReceiver { ...@@ -100,10 +100,10 @@ public class B3ArticleReceiver {
* } * }
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/apis/symphony/article", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/apis/symphony/article", method = HttpMethod.POST)
public void addArticle(final HTTPRequestContext context, final JSONObject requestJSONObject) public void addArticle(final RequestContext context, final JSONObject requestJSONObject)
throws Exception { throws Exception {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -172,10 +172,10 @@ public class B3ArticleReceiver { ...@@ -172,10 +172,10 @@ public class B3ArticleReceiver {
* } * }
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/apis/symphony/article", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/apis/symphony/article", method = HttpMethod.PUT)
public void updateArticle(final HTTPRequestContext context, final JSONObject requestJSONObject) public void updateArticle(final RequestContext context, final JSONObject requestJSONObject)
throws Exception { throws Exception {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
......
...@@ -26,11 +26,11 @@ import org.b3log.latke.ioc.Inject; ...@@ -26,11 +26,11 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.event.EventTypes; import org.b3log.solo.event.EventTypes;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Comment; import org.b3log.solo.model.Comment;
...@@ -134,10 +134,10 @@ public class B3CommentReceiver { ...@@ -134,10 +134,10 @@ public class B3CommentReceiver {
* } * }
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/apis/symphony/comment", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/apis/symphony/comment", method = HttpMethod.PUT)
public void addComment(final HTTPRequestContext context, final JSONObject requestJSONObject) public void addComment(final RequestContext context, final JSONObject requestJSONObject)
throws Exception { throws Exception {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
......
...@@ -30,11 +30,11 @@ import org.b3log.latke.logging.Logger; ...@@ -30,11 +30,11 @@ import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.TextXMLRenderer; import org.b3log.latke.servlet.renderer.TextXmlRenderer;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.model.Tag; import org.b3log.solo.model.Tag;
...@@ -195,9 +195,9 @@ public class MetaWeblogAPI { ...@@ -195,9 +195,9 @@ public class MetaWeblogAPI {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/apis/metaweblog", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/apis/metaweblog", method = HttpMethod.POST)
public void metaWeblog(final HTTPRequestContext context) { public void metaWeblog(final RequestContext context) {
final TextXMLRenderer renderer = new TextXMLRenderer(); final TextXmlRenderer renderer = new TextXmlRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
String responseContent; String responseContent;
......
...@@ -24,10 +24,10 @@ import org.b3log.latke.ioc.BeanManager; ...@@ -24,10 +24,10 @@ import org.b3log.latke.ioc.BeanManager;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.DispatcherServlet; import org.b3log.latke.servlet.DispatcherServlet;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.HttpControl; import org.b3log.latke.servlet.HttpControl;
import org.b3log.latke.servlet.renderer.HTTP500Renderer; import org.b3log.latke.servlet.renderer.Http500Renderer;
import org.b3log.solo.service.InitService; import org.b3log.solo.service.InitService;
import javax.servlet.*; import javax.servlet.*;
...@@ -116,16 +116,16 @@ public final class InitCheckFilter implements Filter { ...@@ -116,16 +116,16 @@ public final class InitCheckFilter implements Filter {
initReported = true; initReported = true;
} }
final HTTPRequestContext context = new HTTPRequestContext(); final RequestContext context = new RequestContext();
context.setRequest((HttpServletRequest) request); context.setRequest((HttpServletRequest) request);
context.setResponse((HttpServletResponse) response); context.setResponse((HttpServletResponse) response);
request.setAttribute(Keys.HttpRequest.REQUEST_URI, Latkes.getContextPath() + "/init"); request.setAttribute(Keys.HttpRequest.REQUEST_URI, Latkes.getContextPath() + "/init");
request.setAttribute(Keys.HttpRequest.REQUEST_METHOD, HTTPRequestMethod.GET.name()); request.setAttribute(Keys.HttpRequest.REQUEST_METHOD, HttpMethod.GET.name());
final HttpControl httpControl = new HttpControl(DispatcherServlet.HANDLERS.iterator(), context); final HttpControl httpControl = new HttpControl(DispatcherServlet.HANDLERS.iterator(), context);
try { try {
httpControl.nextHandler(); httpControl.nextHandler();
} catch (final Exception e) { } catch (final Exception e) {
context.setRenderer(new HTTP500Renderer(e)); context.setRenderer(new Http500Renderer(e));
} }
DispatcherServlet.result(context); DispatcherServlet.result(context);
} }
......
...@@ -25,10 +25,10 @@ import org.b3log.latke.logging.Level; ...@@ -25,10 +25,10 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.RepositoryException; import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.servlet.DispatcherServlet; import org.b3log.latke.servlet.DispatcherServlet;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.HttpControl; import org.b3log.latke.servlet.HttpControl;
import org.b3log.latke.servlet.renderer.HTTP500Renderer; import org.b3log.latke.servlet.renderer.Http500Renderer;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Page; import org.b3log.solo.model.Page;
import org.b3log.solo.repository.ArticleRepository; import org.b3log.solo.repository.ArticleRepository;
...@@ -47,9 +47,9 @@ import java.io.IOException; ...@@ -47,9 +47,9 @@ import java.io.IOException;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.8, Oct 5, 2018 * @version 1.0.1.8, Oct 5, 2018
* @see org.b3log.solo.processor.ArticleProcessor#showArticle(org.b3log.latke.servlet.HTTPRequestContext, * @see org.b3log.solo.processor.ArticleProcessor#showArticle(org.b3log.latke.servlet.RequestContext,
* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
* @see org.b3log.solo.processor.PageProcessor#showPage(org.b3log.latke.servlet.HTTPRequestContext) * @see org.b3log.solo.processor.PageProcessor#showPage(org.b3log.latke.servlet.RequestContext)
* @since 0.3.1 * @since 0.3.1
*/ */
public final class PermalinkFilter implements Filter { public final class PermalinkFilter implements Filter {
...@@ -140,11 +140,11 @@ public final class PermalinkFilter implements Filter { ...@@ -140,11 +140,11 @@ public final class PermalinkFilter implements Filter {
* @param response the specified response * @param response the specified response
* @param article the specified article * @param article the specified article
* @param page the specified page * @param page the specified page
* @see DispatcherServlet#result(HTTPRequestContext) * @see DispatcherServlet#result(RequestContext)
*/ */
private void dispatchToArticleOrPageProcessor(final ServletRequest request, final ServletResponse response, private void dispatchToArticleOrPageProcessor(final ServletRequest request, final ServletResponse response,
final JSONObject article, final JSONObject page) { final JSONObject article, final JSONObject page) {
final HTTPRequestContext context = new HTTPRequestContext(); final RequestContext context = new RequestContext();
context.setRequest((HttpServletRequest) request); context.setRequest((HttpServletRequest) request);
context.setResponse((HttpServletResponse) response); context.setResponse((HttpServletResponse) response);
...@@ -156,13 +156,13 @@ public final class PermalinkFilter implements Filter { ...@@ -156,13 +156,13 @@ public final class PermalinkFilter implements Filter {
request.setAttribute(Keys.HttpRequest.REQUEST_URI, Latkes.getContextPath() + "/page"); request.setAttribute(Keys.HttpRequest.REQUEST_URI, Latkes.getContextPath() + "/page");
} }
request.setAttribute(Keys.HttpRequest.REQUEST_METHOD, HTTPRequestMethod.GET.name()); request.setAttribute(Keys.HttpRequest.REQUEST_METHOD, HttpMethod.GET.name());
final HttpControl httpControl = new HttpControl(DispatcherServlet.HANDLERS.iterator(), context); final HttpControl httpControl = new HttpControl(DispatcherServlet.HANDLERS.iterator(), context);
try { try {
httpControl.nextHandler(); httpControl.nextHandler();
} catch (final Exception e) { } catch (final Exception e) {
context.setRenderer(new HTTP500Renderer(e)); context.setRenderer(new Http500Renderer(e));
} }
DispatcherServlet.result(context); DispatcherServlet.result(context);
......
...@@ -30,14 +30,14 @@ import org.b3log.latke.model.Pagination; ...@@ -30,14 +30,14 @@ import org.b3log.latke.model.Pagination;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.URIPatternMode; import org.b3log.latke.servlet.URIPatternMode;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.servlet.renderer.TextHTMLRenderer; import org.b3log.latke.servlet.renderer.TextHtmlRenderer;
import org.b3log.latke.util.*; import org.b3log.latke.util.*;
import org.b3log.solo.SoloServletListener; import org.b3log.solo.SoloServletListener;
import org.b3log.solo.event.EventTypes; import org.b3log.solo.event.EventTypes;
...@@ -143,8 +143,8 @@ public class ArticleProcessor { ...@@ -143,8 +143,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/console/article-pwd", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/article-pwd", method = HttpMethod.GET)
public void showArticlePwdForm(final HTTPRequestContext context) { public void showArticlePwdForm(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
final String articleId = request.getParameter("articleId"); final String articleId = request.getParameter("articleId");
...@@ -194,8 +194,8 @@ public class ArticleProcessor { ...@@ -194,8 +194,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/console/article-pwd", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/article-pwd", method = HttpMethod.POST)
public void onArticlePwdForm(final HTTPRequestContext context) { public void onArticlePwdForm(final RequestContext context) {
try { try {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
...@@ -234,8 +234,8 @@ public class ArticleProcessor { ...@@ -234,8 +234,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/articles/random", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/articles/random", method = HttpMethod.POST)
public void getRandomArticles(final HTTPRequestContext context) { public void getRandomArticles(final RequestContext context) {
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
final JSONObject preference = preferenceQueryService.getPreference(); final JSONObject preference = preferenceQueryService.getPreference();
...@@ -243,7 +243,7 @@ public class ArticleProcessor { ...@@ -243,7 +243,7 @@ public class ArticleProcessor {
if (0 == displayCnt) { if (0 == displayCnt) {
jsonObject.put(Common.RANDOM_ARTICLES, new ArrayList<JSONObject>()); jsonObject.put(Common.RANDOM_ARTICLES, new ArrayList<JSONObject>());
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -255,7 +255,7 @@ public class ArticleProcessor { ...@@ -255,7 +255,7 @@ public class ArticleProcessor {
jsonObject.put(Common.RANDOM_ARTICLES, randomArticles); jsonObject.put(Common.RANDOM_ARTICLES, randomArticles);
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -267,8 +267,8 @@ public class ArticleProcessor { ...@@ -267,8 +267,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/article/id/*/relevant/articles", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/article/id/*/relevant/articles", method = HttpMethod.GET)
public void getRelevantArticles(final HTTPRequestContext context) { public void getRelevantArticles(final RequestContext context) {
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
final JSONObject preference = preferenceQueryService.getPreference(); final JSONObject preference = preferenceQueryService.getPreference();
...@@ -277,7 +277,7 @@ public class ArticleProcessor { ...@@ -277,7 +277,7 @@ public class ArticleProcessor {
if (0 == displayCnt) { if (0 == displayCnt) {
jsonObject.put(Common.RANDOM_ARTICLES, new ArrayList<JSONObject>()); jsonObject.put(Common.RANDOM_ARTICLES, new ArrayList<JSONObject>());
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -305,7 +305,7 @@ public class ArticleProcessor { ...@@ -305,7 +305,7 @@ public class ArticleProcessor {
final List<JSONObject> relevantArticles = articleQueryService.getRelevantArticles(article, preference); final List<JSONObject> relevantArticles = articleQueryService.getRelevantArticles(article, preference);
jsonObject.put(Common.RELEVANT_ARTICLES, relevantArticles); jsonObject.put(Common.RELEVANT_ARTICLES, relevantArticles);
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -317,15 +317,15 @@ public class ArticleProcessor { ...@@ -317,15 +317,15 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/get-article-content", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/get-article-content", method = HttpMethod.GET)
public void getArticleContent(final HTTPRequestContext context) { public void getArticleContent(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final String articleId = context.param("id"); final String articleId = context.param("id");
if (StringUtils.isBlank(articleId)) { if (StringUtils.isBlank(articleId)) {
return; return;
} }
final TextHTMLRenderer renderer = new TextHTMLRenderer(); final TextHtmlRenderer renderer = new TextHtmlRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
String content; String content;
...@@ -348,8 +348,8 @@ public class ArticleProcessor { ...@@ -348,8 +348,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/articles/\\d+", uriPatternsMode = URIPatternMode.REGEX, method = HTTPRequestMethod.GET) @RequestProcessing(value = "/articles/\\d+", uriPatternsMode = URIPatternMode.REGEX, method = HttpMethod.GET)
public void getArticlesByPage(final HTTPRequestContext context) { public void getArticlesByPage(final RequestContext context) {
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final int currentPageNum = getArticlesPagedCurrentPageNum(request.getRequestURI()); final int currentPageNum = getArticlesPagedCurrentPageNum(request.getRequestURI());
...@@ -380,7 +380,7 @@ public class ArticleProcessor { ...@@ -380,7 +380,7 @@ public class ArticleProcessor {
Stopwatchs.end(); Stopwatchs.end();
} }
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
} }
...@@ -390,8 +390,8 @@ public class ArticleProcessor { ...@@ -390,8 +390,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/articles/tags/.+/\\d+", uriPatternsMode = URIPatternMode.REGEX, method = HTTPRequestMethod.GET) @RequestProcessing(value = "/articles/tags/.+/\\d+", uriPatternsMode = URIPatternMode.REGEX, method = HttpMethod.GET)
public void getTagArticlesByPage(final HTTPRequestContext context) { public void getTagArticlesByPage(final RequestContext context) {
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
...@@ -438,7 +438,7 @@ public class ArticleProcessor { ...@@ -438,7 +438,7 @@ public class ArticleProcessor {
Stopwatchs.end(); Stopwatchs.end();
} }
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
} }
...@@ -448,8 +448,8 @@ public class ArticleProcessor { ...@@ -448,8 +448,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/articles/archives/.+/\\d+", uriPatternsMode = URIPatternMode.REGEX, method = HTTPRequestMethod.GET) @RequestProcessing(value = "/articles/archives/.+/\\d+", uriPatternsMode = URIPatternMode.REGEX, method = HttpMethod.GET)
public void getArchivesArticlesByPage(final HTTPRequestContext context) { public void getArchivesArticlesByPage(final RequestContext context) {
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
...@@ -490,7 +490,7 @@ public class ArticleProcessor { ...@@ -490,7 +490,7 @@ public class ArticleProcessor {
Stopwatchs.end(); Stopwatchs.end();
} }
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
} }
...@@ -501,8 +501,8 @@ public class ArticleProcessor { ...@@ -501,8 +501,8 @@ public class ArticleProcessor {
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/articles/authors/\\d+/\\d+", uriPatternsMode = URIPatternMode.REGEX, @RequestProcessing(value = "/articles/authors/\\d+/\\d+", uriPatternsMode = URIPatternMode.REGEX,
method = HTTPRequestMethod.GET) method = HttpMethod.GET)
public void getAuthorsArticlesByPage(final HTTPRequestContext context) { public void getAuthorsArticlesByPage(final RequestContext context) {
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
...@@ -544,7 +544,7 @@ public class ArticleProcessor { ...@@ -544,7 +544,7 @@ public class ArticleProcessor {
Stopwatchs.end(); Stopwatchs.end();
} }
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
} }
...@@ -554,8 +554,8 @@ public class ArticleProcessor { ...@@ -554,8 +554,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/authors/**", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/authors/**", method = HttpMethod.GET)
public void showAuthorArticles(final HTTPRequestContext context) { public void showAuthorArticles(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -629,8 +629,8 @@ public class ArticleProcessor { ...@@ -629,8 +629,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/archives/**", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/archives/**", method = HttpMethod.GET)
public void showArchiveArticles(final HTTPRequestContext context) { public void showArchiveArticles(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -695,8 +695,8 @@ public class ArticleProcessor { ...@@ -695,8 +695,8 @@ public class ArticleProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/article", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/article", method = HttpMethod.GET)
public void showArticle(final HTTPRequestContext context) { public void showArticle(final RequestContext context) {
// See PermalinkFilter#dispatchToArticleOrPageProcessor() // See PermalinkFilter#dispatchToArticleOrPageProcessor()
final JSONObject article = (JSONObject) context.attr(Article.ARTICLE); final JSONObject article = (JSONObject) context.attr(Article.ARTICLE);
if (null == article) { if (null == article) {
......
...@@ -24,11 +24,11 @@ import org.b3log.latke.Latkes; ...@@ -24,11 +24,11 @@ import org.b3log.latke.Latkes;
import org.b3log.latke.ioc.Inject; import org.b3log.latke.ioc.Inject;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.SoloServletListener; import org.b3log.solo.SoloServletListener;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
...@@ -102,9 +102,9 @@ public class BlogProcessor { ...@@ -102,9 +102,9 @@ public class BlogProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/blog/info", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/blog/info", method = HttpMethod.GET)
public void getBlogInfo(final HTTPRequestContext context) { public void getBlogInfo(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -152,8 +152,8 @@ public class BlogProcessor { ...@@ -152,8 +152,8 @@ public class BlogProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/blog/articles-tags", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/blog/articles-tags", method = HttpMethod.GET)
public void getArticlesTags(final HTTPRequestContext context) { public void getArticlesTags(final RequestContext context) {
final String pwd = context.param("pwd"); final String pwd = context.param("pwd");
if (StringUtils.isBlank(pwd)) { if (StringUtils.isBlank(pwd)) {
context.sendError(HttpServletResponse.SC_UNAUTHORIZED); context.sendError(HttpServletResponse.SC_UNAUTHORIZED);
...@@ -193,7 +193,7 @@ public class BlogProcessor { ...@@ -193,7 +193,7 @@ public class BlogProcessor {
final JSONObject result = articleQueryService.getArticles(requestJSONObject); final JSONObject result = articleQueryService.getArticles(requestJSONObject);
final JSONArray articles = result.optJSONArray(Article.ARTICLES); final JSONArray articles = result.optJSONArray(Article.ARTICLES);
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
......
...@@ -20,11 +20,11 @@ package org.b3log.solo.processor; ...@@ -20,11 +20,11 @@ package org.b3log.solo.processor;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.PNGRenderer; import org.b3log.latke.servlet.renderer.PngRenderer;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.patchca.color.GradientColorFactory; import org.patchca.color.GradientColorFactory;
import org.patchca.color.RandomColorFactory; import org.patchca.color.RandomColorFactory;
...@@ -90,9 +90,9 @@ public class CaptchaProcessor { ...@@ -90,9 +90,9 @@ public class CaptchaProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/captcha", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/captcha", method = HttpMethod.GET)
public void get(final HTTPRequestContext context) { public void get(final RequestContext context) {
final PNGRenderer renderer = new PNGRenderer(); final PngRenderer renderer = new PngRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
......
...@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger; ...@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
...@@ -142,8 +142,8 @@ public class CategoryProcessor { ...@@ -142,8 +142,8 @@ public class CategoryProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/category/**", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/category/**", method = HttpMethod.GET)
public void showCategoryArticles(final HTTPRequestContext context) { public void showCategoryArticles(final RequestContext context) {
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context.getRequest()); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context.getRequest());
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setTemplateName("category-articles.ftl"); renderer.setTemplateName("category-articles.ftl");
......
...@@ -24,11 +24,11 @@ import org.b3log.latke.logging.Level; ...@@ -24,11 +24,11 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.model.*; import org.b3log.solo.model.*;
import org.b3log.solo.service.CommentMgmtService; import org.b3log.solo.service.CommentMgmtService;
import org.b3log.solo.service.PreferenceQueryService; import org.b3log.solo.service.PreferenceQueryService;
...@@ -124,8 +124,8 @@ public class CommentProcessor { ...@@ -124,8 +124,8 @@ public class CommentProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/page/comments", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/page/comments", method = HttpMethod.POST)
public void addPageComment(final HTTPRequestContext context) { public void addPageComment(final RequestContext context) {
final HttpServletRequest httpServletRequest = context.getRequest(); final HttpServletRequest httpServletRequest = context.getRequest();
final HttpServletResponse httpServletResponse = context.getResponse(); final HttpServletResponse httpServletResponse = context.getResponse();
final JSONObject requestJSONObject = context.requestJSON(); final JSONObject requestJSONObject = context.requestJSON();
...@@ -134,7 +134,7 @@ public class CommentProcessor { ...@@ -134,7 +134,7 @@ public class CommentProcessor {
fillCommenter(requestJSONObject, httpServletRequest, httpServletResponse); fillCommenter(requestJSONObject, httpServletRequest, httpServletResponse);
final JSONObject jsonObject = commentMgmtService.checkAddCommentRequest(requestJSONObject); final JSONObject jsonObject = commentMgmtService.checkAddCommentRequest(requestJSONObject);
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -227,8 +227,8 @@ public class CommentProcessor { ...@@ -227,8 +227,8 @@ public class CommentProcessor {
* *
* @param context the specified context, including a request json object * @param context the specified context, including a request json object
*/ */
@RequestProcessing(value = "/article/comments", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/article/comments", method = HttpMethod.POST)
public void addArticleComment(final HTTPRequestContext context) { public void addArticleComment(final RequestContext context) {
final HttpServletRequest httpServletRequest = context.getRequest(); final HttpServletRequest httpServletRequest = context.getRequest();
final HttpServletResponse httpServletResponse = context.getResponse(); final HttpServletResponse httpServletResponse = context.getResponse();
final JSONObject requestJSONObject = context.requestJSON(); final JSONObject requestJSONObject = context.requestJSON();
...@@ -237,7 +237,7 @@ public class CommentProcessor { ...@@ -237,7 +237,7 @@ public class CommentProcessor {
fillCommenter(requestJSONObject, httpServletRequest, httpServletResponse); fillCommenter(requestJSONObject, httpServletRequest, httpServletResponse);
final JSONObject jsonObject = commentMgmtService.checkAddCommentRequest(requestJSONObject); final JSONObject jsonObject = commentMgmtService.checkAddCommentRequest(requestJSONObject);
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
......
...@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject; ...@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
...@@ -83,8 +83,8 @@ public class ErrorProcessor { ...@@ -83,8 +83,8 @@ public class ErrorProcessor {
* @param context the specified context * @param context the specified context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/error/{statusCode}", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/error/{statusCode}", method = HttpMethod.GET)
public void showErrorPage(final HTTPRequestContext context, final String statusCode) { public void showErrorPage(final RequestContext context, final String statusCode) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
if (StringUtils.equals("GET", request.getMethod())) { if (StringUtils.equals("GET", request.getMethod())) {
......
...@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Logger; ...@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.repository.*; import org.b3log.latke.repository.*;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AtomRenderer; import org.b3log.latke.servlet.renderer.AtomRenderer;
...@@ -93,8 +93,8 @@ public class FeedProcessor { ...@@ -93,8 +93,8 @@ public class FeedProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/atom.xml", method = {HTTPRequestMethod.GET, HTTPRequestMethod.HEAD}) @RequestProcessing(value = "/atom.xml", method = {HttpMethod.GET, HttpMethod.HEAD})
public void blogArticlesAtom(final HTTPRequestContext context) { public void blogArticlesAtom(final RequestContext context) {
final AtomRenderer renderer = new AtomRenderer(); final AtomRenderer renderer = new AtomRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -166,8 +166,8 @@ public class FeedProcessor { ...@@ -166,8 +166,8 @@ public class FeedProcessor {
* @param context the specified context * @param context the specified context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/rss.xml", method = {HTTPRequestMethod.GET, HTTPRequestMethod.HEAD}) @RequestProcessing(value = "/rss.xml", method = {HttpMethod.GET, HttpMethod.HEAD})
public void blogArticlesRSS(final HTTPRequestContext context) { public void blogArticlesRSS(final RequestContext context) {
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
final RssRenderer renderer = new RssRenderer(); final RssRenderer renderer = new RssRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
......
...@@ -36,8 +36,8 @@ import org.b3log.latke.logging.Level; ...@@ -36,8 +36,8 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.util.URLs; import org.b3log.latke.util.URLs;
...@@ -94,8 +94,8 @@ public class FileUploadProcessor { ...@@ -94,8 +94,8 @@ public class FileUploadProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/upload/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/upload/*", method = HttpMethod.GET)
public void getFile(final HTTPRequestContext context) { public void getFile(final RequestContext context) {
if (QN_ENABLED) { if (QN_ENABLED) {
return; return;
} }
...@@ -154,8 +154,8 @@ public class FileUploadProcessor { ...@@ -154,8 +154,8 @@ public class FileUploadProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/upload", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/upload", method = HttpMethod.POST)
public void uploadFile(final HTTPRequestContext context) { public void uploadFile(final RequestContext context) {
context.renderJSON(); context.renderJSON();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
......
...@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger; ...@@ -26,8 +26,8 @@ import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.URIPatternMode; import org.b3log.latke.servlet.URIPatternMode;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
...@@ -94,8 +94,8 @@ public class IndexProcessor { ...@@ -94,8 +94,8 @@ public class IndexProcessor {
* @param context the specified context * @param context the specified context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = {"/\\d*", ""}, uriPatternsMode = URIPatternMode.REGEX, method = HTTPRequestMethod.GET) @RequestProcessing(value = {"/\\d*", ""}, uriPatternsMode = URIPatternMode.REGEX, method = HttpMethod.GET)
public void showIndex(final HTTPRequestContext context) { public void showIndex(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
...@@ -147,8 +147,8 @@ public class IndexProcessor { ...@@ -147,8 +147,8 @@ public class IndexProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/kill-browser", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/kill-browser", method = HttpMethod.GET)
public void showKillBrowser(final HTTPRequestContext context) { public void showKillBrowser(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
...@@ -176,8 +176,8 @@ public class IndexProcessor { ...@@ -176,8 +176,8 @@ public class IndexProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/register", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/register", method = HttpMethod.GET)
public void register(final HTTPRequestContext context) { public void register(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
......
...@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level; ...@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Locales; import org.b3log.latke.util.Locales;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.b3log.solo.SoloServletListener; import org.b3log.solo.SoloServletListener;
...@@ -93,8 +93,8 @@ public class InitProcessor { ...@@ -93,8 +93,8 @@ public class InitProcessor {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/init", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/init", method = HttpMethod.GET)
public void showInit(final HTTPRequestContext context) { public void showInit(final RequestContext context) {
if (initService.isInited()) { if (initService.isInited()) {
context.sendRedirect("/"); context.sendRedirect("/");
...@@ -132,15 +132,15 @@ public class InitProcessor { ...@@ -132,15 +132,15 @@ public class InitProcessor {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/init", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/init", method = HttpMethod.POST)
public void initSolo(final HTTPRequestContext context) { public void initSolo(final RequestContext context) {
if (initService.isInited()) { if (initService.isInited()) {
context.sendRedirect("/"); context.sendRedirect("/");
return; return;
} }
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject().put(Keys.STATUS_CODE, false); final JSONObject ret = new JSONObject().put(Keys.STATUS_CODE, false);
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
......
...@@ -21,11 +21,11 @@ import org.apache.commons.io.IOUtils; ...@@ -21,11 +21,11 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.math.RandomUtils; import org.apache.commons.lang.math.RandomUtils;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.SoloServletListener; import org.b3log.solo.SoloServletListener;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -51,9 +51,9 @@ public class KanBanNiangProcessor { ...@@ -51,9 +51,9 @@ public class KanBanNiangProcessor {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/plugins/kanbanniang/assert/model", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/plugins/kanbanniang/assert/model", method = HttpMethod.GET)
public void randomModel(final HTTPRequestContext context) { public void randomModel(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
final int i = RandomUtils.nextInt(MODEL_NAMES.length); final int i = RandomUtils.nextInt(MODEL_NAMES.length);
......
...@@ -31,12 +31,12 @@ import org.b3log.latke.repository.RepositoryException; ...@@ -31,12 +31,12 @@ import org.b3log.latke.repository.RepositoryException;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.solo.SoloServletListener; import org.b3log.solo.SoloServletListener;
import org.b3log.solo.mail.MailService; import org.b3log.solo.mail.MailService;
...@@ -131,8 +131,8 @@ public class LoginProcessor { ...@@ -131,8 +131,8 @@ public class LoginProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/login", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/login", method = HttpMethod.GET)
public void showLogin(final HTTPRequestContext context) { public void showLogin(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
String destinationURL = request.getParameter(Common.GOTO); String destinationURL = request.getParameter(Common.GOTO);
...@@ -166,11 +166,11 @@ public class LoginProcessor { ...@@ -166,11 +166,11 @@ public class LoginProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/login", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/login", method = HttpMethod.POST)
public void login(final HTTPRequestContext context) { public void login(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final JSONObject requestJSONObject = context.requestJSON(); final JSONObject requestJSONObject = context.requestJSON();
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -217,8 +217,8 @@ public class LoginProcessor { ...@@ -217,8 +217,8 @@ public class LoginProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/logout", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/logout", method = HttpMethod.GET)
public void logout(final HTTPRequestContext context) { public void logout(final RequestContext context) {
final HttpServletRequest httpServletRequest = context.getRequest(); final HttpServletRequest httpServletRequest = context.getRequest();
Solos.logout(httpServletRequest, context.getResponse()); Solos.logout(httpServletRequest, context.getResponse());
...@@ -236,8 +236,8 @@ public class LoginProcessor { ...@@ -236,8 +236,8 @@ public class LoginProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/forgot", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/forgot", method = HttpMethod.GET)
public void showForgot(final HTTPRequestContext context) { public void showForgot(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
String destinationURL = request.getParameter(Common.GOTO); String destinationURL = request.getParameter(Common.GOTO);
...@@ -264,9 +264,9 @@ public class LoginProcessor { ...@@ -264,9 +264,9 @@ public class LoginProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/forgot", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/forgot", method = HttpMethod.POST)
public void forgot(final HTTPRequestContext context) { public void forgot(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -313,9 +313,9 @@ public class LoginProcessor { ...@@ -313,9 +313,9 @@ public class LoginProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/reset", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/reset", method = HttpMethod.POST)
public void reset(final HTTPRequestContext context) { public void reset(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
...@@ -413,7 +413,7 @@ public class LoginProcessor { ...@@ -413,7 +413,7 @@ public class LoginProcessor {
* @param destinationURL the destination URL * @param destinationURL the destination URL
* @param request for reset password page * @param request for reset password page
*/ */
private void renderPage(final HTTPRequestContext context, final String pageTemplate, final String destinationURL, private void renderPage(final RequestContext context, final String pageTemplate, final String destinationURL,
final HttpServletRequest request) { final HttpServletRequest request) {
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
renderer.setTemplateName(pageTemplate); renderer.setTemplateName(pageTemplate);
......
...@@ -28,8 +28,8 @@ import org.b3log.latke.logging.Level; ...@@ -28,8 +28,8 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.util.CollectionUtils; import org.b3log.latke.util.CollectionUtils;
...@@ -119,8 +119,8 @@ public class OAuthGitHubProcessor { ...@@ -119,8 +119,8 @@ public class OAuthGitHubProcessor {
* @param context the specified context * @param context the specified context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/oauth/github/redirect", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/oauth/github/redirect", method = HttpMethod.GET)
public void redirectGitHub(final HTTPRequestContext context) { public void redirectGitHub(final RequestContext context) {
final String state = Latkes.getServePath() + ":::" + RandomStringUtils.randomAlphanumeric(16); final String state = Latkes.getServePath() + ":::" + RandomStringUtils.randomAlphanumeric(16);
STATES.put(state, URLs.encode(state)); STATES.put(state, URLs.encode(state));
...@@ -135,8 +135,8 @@ public class OAuthGitHubProcessor { ...@@ -135,8 +135,8 @@ public class OAuthGitHubProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/oauth/github", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/oauth/github", method = HttpMethod.GET)
public synchronized void showGitHubCallback(final HTTPRequestContext context) { public synchronized void showGitHubCallback(final RequestContext context) {
final String state = context.param("state"); final String state = context.param("state");
String referer = STATES.get(state); String referer = STATES.get(state);
if (StringUtils.isBlank(referer)) { if (StringUtils.isBlank(referer)) {
......
...@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject; ...@@ -22,8 +22,8 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
...@@ -95,8 +95,8 @@ public class PageProcessor { ...@@ -95,8 +95,8 @@ public class PageProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/page", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/page", method = HttpMethod.GET)
public void showPage(final HTTPRequestContext context) { public void showPage(final RequestContext context) {
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context.getRequest()); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context.getRequest());
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setTemplateName("page.ftl"); renderer.setTemplateName("page.ftl");
......
...@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level; ...@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.latke.servlet.renderer.TextXMLRenderer; import org.b3log.latke.servlet.renderer.TextXmlRenderer;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
...@@ -101,9 +101,9 @@ public class SearchProcessor { ...@@ -101,9 +101,9 @@ public class SearchProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/opensearch.xml", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/opensearch.xml", method = HttpMethod.GET)
public void showOpensearchXML(final HTTPRequestContext context) { public void showOpensearchXML(final RequestContext context) {
final TextXMLRenderer renderer = new TextXMLRenderer(); final TextXmlRenderer renderer = new TextXmlRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -125,8 +125,8 @@ public class SearchProcessor { ...@@ -125,8 +125,8 @@ public class SearchProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/search", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/search", method = HttpMethod.GET)
public void search(final HTTPRequestContext context) { public void search(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
context.setRenderer(renderer); context.setRenderer(renderer);
......
...@@ -28,11 +28,11 @@ import org.b3log.latke.repository.FilterOperator; ...@@ -28,11 +28,11 @@ import org.b3log.latke.repository.FilterOperator;
import org.b3log.latke.repository.PropertyFilter; import org.b3log.latke.repository.PropertyFilter;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.SortDirection; import org.b3log.latke.repository.SortDirection;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.TextXMLRenderer; import org.b3log.latke.servlet.renderer.TextXmlRenderer;
import org.b3log.latke.util.XMLs; import org.b3log.latke.util.XMLs;
import org.b3log.solo.model.ArchiveDate; import org.b3log.solo.model.ArchiveDate;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
...@@ -101,9 +101,9 @@ public class SitemapProcessor { ...@@ -101,9 +101,9 @@ public class SitemapProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/sitemap.xml", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/sitemap.xml", method = HttpMethod.GET)
public void sitemap(final HTTPRequestContext context) { public void sitemap(final RequestContext context) {
final TextXMLRenderer renderer = new TextXMLRenderer(); final TextXmlRenderer renderer = new TextXmlRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
......
...@@ -21,7 +21,7 @@ import freemarker.template.Template; ...@@ -21,7 +21,7 @@ import freemarker.template.Template;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.solo.util.Skins; import org.b3log.solo.util.Skins;
...@@ -104,11 +104,11 @@ public final class SkinRenderer extends AbstractFreeMarkerRenderer { ...@@ -104,11 +104,11 @@ public final class SkinRenderer extends AbstractFreeMarkerRenderer {
} }
@Override @Override
protected void beforeRender(final HTTPRequestContext context) { protected void beforeRender(final RequestContext context) {
} }
@Override @Override
protected void afterRender(final HTTPRequestContext context) { protected void afterRender(final RequestContext context) {
} }
/** /**
......
...@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Level; ...@@ -25,8 +25,8 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Pagination; import org.b3log.latke.model.Pagination;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
...@@ -109,8 +109,8 @@ public class TagProcessor { ...@@ -109,8 +109,8 @@ public class TagProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/tags/**", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/tags/**", method = HttpMethod.GET)
public void showTagArticles(final HTTPRequestContext context) { public void showTagArticles(final RequestContext context) {
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context.getRequest()); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context.getRequest());
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setTemplateName("tag-articles.ftl"); renderer.setTemplateName("tag-articles.ftl");
......
...@@ -24,8 +24,8 @@ import org.b3log.latke.ioc.Inject; ...@@ -24,8 +24,8 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
...@@ -89,8 +89,8 @@ public class UserTemplateProcessor { ...@@ -89,8 +89,8 @@ public class UserTemplateProcessor {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/*.html", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/*.html", method = HttpMethod.GET)
public void showPage(final HTTPRequestContext context) { public void showPage(final RequestContext context) {
final String requestURI = context.requestURI(); final String requestURI = context.requestURI();
String templateName = StringUtils.substringAfterLast(requestURI, "/"); String templateName = StringUtils.substringAfterLast(requestURI, "/");
......
...@@ -35,7 +35,7 @@ import org.b3log.latke.model.User; ...@@ -35,7 +35,7 @@ import org.b3log.latke.model.User;
import org.b3log.latke.plugin.ViewLoadEventData; import org.b3log.latke.plugin.ViewLoadEventData;
import org.b3log.latke.repository.jdbc.util.Connections; import org.b3log.latke.repository.jdbc.util.Connections;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.latke.util.Execs; import org.b3log.latke.util.Execs;
...@@ -131,7 +131,7 @@ public class AdminConsole { ...@@ -131,7 +131,7 @@ public class AdminConsole {
* @param context the specified context * @param context the specified context
*/ */
@Before(adviceClass = ConsoleAuthAdvice.class) @Before(adviceClass = ConsoleAuthAdvice.class)
public void showAdminIndex(final HTTPRequestContext context) { public void showAdminIndex(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
final AbstractFreeMarkerRenderer renderer = new ConsoleRenderer(); final AbstractFreeMarkerRenderer renderer = new ConsoleRenderer();
...@@ -182,7 +182,7 @@ public class AdminConsole { ...@@ -182,7 +182,7 @@ public class AdminConsole {
* *
* @param context the specified context * @param context the specified context
*/ */
public void showAdminFunctions(final HTTPRequestContext context) { public void showAdminFunctions(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final AbstractFreeMarkerRenderer renderer = new ConsoleRenderer(); final AbstractFreeMarkerRenderer renderer = new ConsoleRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
...@@ -210,7 +210,7 @@ public class AdminConsole { ...@@ -210,7 +210,7 @@ public class AdminConsole {
* *
* @param context the specified context * @param context the specified context
*/ */
public void showAdminPreferenceFunction(final HTTPRequestContext context) { public void showAdminPreferenceFunction(final RequestContext context) {
final AbstractFreeMarkerRenderer renderer = new ConsoleRenderer(); final AbstractFreeMarkerRenderer renderer = new ConsoleRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final String templateName = "admin-preference.ftl"; final String templateName = "admin-preference.ftl";
...@@ -247,7 +247,7 @@ public class AdminConsole { ...@@ -247,7 +247,7 @@ public class AdminConsole {
* *
* @param context the specified HTTP request context * @param context the specified HTTP request context
*/ */
public void exportSQL(final HTTPRequestContext context) { public void exportSQL(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
...@@ -365,7 +365,7 @@ public class AdminConsole { ...@@ -365,7 +365,7 @@ public class AdminConsole {
* *
* @param context the specified HTTP request context * @param context the specified HTTP request context
*/ */
public void exportJSON(final HTTPRequestContext context) { public void exportJSON(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
if (!Solos.isAdminLoggedIn(request, response)) { if (!Solos.isAdminLoggedIn(request, response)) {
...@@ -420,7 +420,7 @@ public class AdminConsole { ...@@ -420,7 +420,7 @@ public class AdminConsole {
* *
* @param context the specified HTTP request context * @param context the specified HTTP request context
*/ */
public void exportHexo(final HTTPRequestContext context) { public void exportHexo(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
if (!Solos.isAdminLoggedIn(request, response)) { if (!Solos.isAdminLoggedIn(request, response)) {
......
...@@ -27,9 +27,9 @@ import org.b3log.latke.logging.Level; ...@@ -27,9 +27,9 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
...@@ -108,8 +108,8 @@ public class ArticleConsole { ...@@ -108,8 +108,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void getArticleThumbs(final HTTPRequestContext context) { public void getArticleThumbs(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject result = new JSONObject(); final JSONObject result = new JSONObject();
renderer.setJSONObject(result); renderer.setJSONObject(result);
...@@ -139,8 +139,8 @@ public class ArticleConsole { ...@@ -139,8 +139,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void markdown2HTML(final HTTPRequestContext context) { public void markdown2HTML(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject result = new JSONObject(); final JSONObject result = new JSONObject();
renderer.setJSONObject(result); renderer.setJSONObject(result);
...@@ -195,8 +195,8 @@ public class ArticleConsole { ...@@ -195,8 +195,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void getArticle(final HTTPRequestContext context) { public void getArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -247,8 +247,8 @@ public class ArticleConsole { ...@@ -247,8 +247,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void getArticles(final HTTPRequestContext context) { public void getArticles(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -310,8 +310,8 @@ public class ArticleConsole { ...@@ -310,8 +310,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void removeArticle(final HTTPRequestContext context) { public void removeArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -357,8 +357,8 @@ public class ArticleConsole { ...@@ -357,8 +357,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void cancelPublishArticle(final HTTPRequestContext context) { public void cancelPublishArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -404,8 +404,8 @@ public class ArticleConsole { ...@@ -404,8 +404,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void cancelTopArticle(final HTTPRequestContext context) { public void cancelTopArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -448,8 +448,8 @@ public class ArticleConsole { ...@@ -448,8 +448,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void putTopArticle(final HTTPRequestContext context) { public void putTopArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -511,8 +511,8 @@ public class ArticleConsole { ...@@ -511,8 +511,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void updateArticle(final HTTPRequestContext context) { public void updateArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -579,8 +579,8 @@ public class ArticleConsole { ...@@ -579,8 +579,8 @@ public class ArticleConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
public void addArticle(final HTTPRequestContext context) { public void addArticle(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
......
...@@ -26,12 +26,12 @@ import org.b3log.latke.logging.Level; ...@@ -26,12 +26,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.latke.util.URLs; import org.b3log.latke.util.URLs;
import org.b3log.solo.model.Category; import org.b3log.solo.model.Category;
...@@ -113,9 +113,9 @@ public class CategoryConsole { ...@@ -113,9 +113,9 @@ public class CategoryConsole {
* @param context the specified http request context * @param context the specified http request context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/console/category/order/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/category/order/", method = HttpMethod.PUT)
public void changeOrder(final HTTPRequestContext context) { public void changeOrder(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -159,9 +159,9 @@ public class CategoryConsole { ...@@ -159,9 +159,9 @@ public class CategoryConsole {
* @param context the specified http request context * @param context the specified http request context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/console/category/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/category/*", method = HttpMethod.GET)
public void getCategory(final HTTPRequestContext context) { public void getCategory(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
...@@ -209,9 +209,9 @@ public class CategoryConsole { ...@@ -209,9 +209,9 @@ public class CategoryConsole {
* @param context the specified http request context * @param context the specified http request context
* @throws Exception exception * @throws Exception exception
*/ */
@RequestProcessing(value = "/console/category/*", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/category/*", method = HttpMethod.DELETE)
public void removeCategory(final HTTPRequestContext context) { public void removeCategory(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -256,9 +256,9 @@ public class CategoryConsole { ...@@ -256,9 +256,9 @@ public class CategoryConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/category/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/category/", method = HttpMethod.PUT)
public void updateCategory(final HTTPRequestContext context) { public void updateCategory(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -390,9 +390,9 @@ public class CategoryConsole { ...@@ -390,9 +390,9 @@ public class CategoryConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/category/", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/category/", method = HttpMethod.POST)
public void addCategory(final HTTPRequestContext context) { public void addCategory(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -522,9 +522,9 @@ public class CategoryConsole { ...@@ -522,9 +522,9 @@ public class CategoryConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/categories/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/categories/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, method = HttpMethod.GET)
public void getCategories(final HTTPRequestContext context) { public void getCategories(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
......
...@@ -23,12 +23,12 @@ import org.b3log.latke.ioc.Inject; ...@@ -23,12 +23,12 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.solo.model.Comment; import org.b3log.solo.model.Comment;
import org.b3log.solo.service.CommentMgmtService; import org.b3log.solo.service.CommentMgmtService;
...@@ -88,9 +88,9 @@ public class CommentConsole { ...@@ -88,9 +88,9 @@ public class CommentConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/page/comment/*", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/page/comment/*", method = HttpMethod.DELETE)
public void removePageComment(final HTTPRequestContext context) { public void removePageComment(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -134,9 +134,9 @@ public class CommentConsole { ...@@ -134,9 +134,9 @@ public class CommentConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/article/comment/*", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/article/comment/*", method = HttpMethod.DELETE)
public void removeArticleComment(final HTTPRequestContext context) { public void removeArticleComment(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -199,9 +199,9 @@ public class CommentConsole { ...@@ -199,9 +199,9 @@ public class CommentConsole {
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/comments/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, @RequestProcessing(value = "/console/comments/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */,
method = HTTPRequestMethod.GET) method = HttpMethod.GET)
public void getComments(final HTTPRequestContext context) { public void getComments(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -248,9 +248,9 @@ public class CommentConsole { ...@@ -248,9 +248,9 @@ public class CommentConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/comments/article/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/comments/article/*", method = HttpMethod.GET)
public void getArticleComments(final HTTPRequestContext context) { public void getArticleComments(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -297,9 +297,9 @@ public class CommentConsole { ...@@ -297,9 +297,9 @@ public class CommentConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/comments/page/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/comments/page/*", method = HttpMethod.GET)
public void getPageComments(final HTTPRequestContext context) { public void getPageComments(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
......
...@@ -19,15 +19,14 @@ package org.b3log.solo.processor.console; ...@@ -19,15 +19,14 @@ package org.b3log.solo.processor.console;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.ioc.Singleton; import org.b3log.latke.ioc.Singleton;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.advice.BeforeRequestProcessAdvice; import org.b3log.latke.servlet.advice.ProcessAdvice;
import org.b3log.latke.servlet.advice.RequestProcessAdviceException; import org.b3log.latke.servlet.advice.RequestProcessAdviceException;
import org.b3log.solo.util.Solos; import org.b3log.solo.util.Solos;
import org.json.JSONObject; import org.json.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/** /**
* The common auth check before advice for admin console. * The common auth check before advice for admin console.
...@@ -37,10 +36,10 @@ import java.util.Map; ...@@ -37,10 +36,10 @@ import java.util.Map;
* @since 2.9.5 * @since 2.9.5
*/ */
@Singleton @Singleton
public class ConsoleAdminAuthAdvice extends BeforeRequestProcessAdvice { public class ConsoleAdminAuthAdvice extends ProcessAdvice {
@Override @Override
public void doAdvice(final HTTPRequestContext context, final Map<String, Object> args) throws RequestProcessAdviceException { public void doAdvice(final RequestContext context) throws RequestProcessAdviceException {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
if (!Solos.isAdminLoggedIn(request, response)) { if (!Solos.isAdminLoggedIn(request, response)) {
......
...@@ -21,15 +21,14 @@ import org.b3log.latke.Keys; ...@@ -21,15 +21,14 @@ import org.b3log.latke.Keys;
import org.b3log.latke.ioc.Singleton; import org.b3log.latke.ioc.Singleton;
import org.b3log.latke.model.Role; import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.advice.BeforeRequestProcessAdvice; import org.b3log.latke.servlet.advice.ProcessAdvice;
import org.b3log.latke.servlet.advice.RequestProcessAdviceException; import org.b3log.latke.servlet.advice.RequestProcessAdviceException;
import org.b3log.solo.util.Solos; import org.b3log.solo.util.Solos;
import org.json.JSONObject; import org.json.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/** /**
* The common auth check before advice for admin console. * The common auth check before advice for admin console.
...@@ -39,10 +38,10 @@ import java.util.Map; ...@@ -39,10 +38,10 @@ import java.util.Map;
* @since 2.9.5 * @since 2.9.5
*/ */
@Singleton @Singleton
public class ConsoleAuthAdvice extends BeforeRequestProcessAdvice { public class ConsoleAuthAdvice extends ProcessAdvice {
@Override @Override
public void doAdvice(final HTTPRequestContext context, final Map<String, Object> args) throws RequestProcessAdviceException { public void doAdvice(final RequestContext context) throws RequestProcessAdviceException {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
if (!Solos.isLoggedIn(request, response)) { if (!Solos.isLoggedIn(request, response)) {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import freemarker.template.Template; import freemarker.template.Template;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer; import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.solo.util.Skins; import org.b3log.solo.util.Skins;
...@@ -37,10 +37,10 @@ public final class ConsoleRenderer extends AbstractFreeMarkerRenderer { ...@@ -37,10 +37,10 @@ public final class ConsoleRenderer extends AbstractFreeMarkerRenderer {
} }
@Override @Override
protected void beforeRender(final HTTPRequestContext context) { protected void beforeRender(final RequestContext context) {
} }
@Override @Override
protected void afterRender(final HTTPRequestContext context) { protected void afterRender(final RequestContext context) {
} }
} }
...@@ -24,12 +24,12 @@ import org.b3log.latke.ioc.Inject; ...@@ -24,12 +24,12 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
import org.b3log.solo.model.Link; import org.b3log.solo.model.Link;
...@@ -88,9 +88,9 @@ public class LinkConsole { ...@@ -88,9 +88,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/*", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/link/*", method = HttpMethod.DELETE)
public void removeLink(final HTTPRequestContext context) { public void removeLink(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -138,9 +138,9 @@ public class LinkConsole { ...@@ -138,9 +138,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/link/", method = HttpMethod.PUT)
public void updateLink(final HTTPRequestContext context) { public void updateLink(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -185,9 +185,9 @@ public class LinkConsole { ...@@ -185,9 +185,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/order/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/link/order/", method = HttpMethod.PUT)
public void changeOrder(final HTTPRequestContext context) { public void changeOrder(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -236,9 +236,9 @@ public class LinkConsole { ...@@ -236,9 +236,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/link/", method = HttpMethod.POST)
public void addLink(final HTTPRequestContext context) { public void addLink(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -287,9 +287,9 @@ public class LinkConsole { ...@@ -287,9 +287,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/links/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/links/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, method = HttpMethod.GET)
public void getLinks(final HTTPRequestContext context) { public void getLinks(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -336,9 +336,9 @@ public class LinkConsole { ...@@ -336,9 +336,9 @@ public class LinkConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/link/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/link/*", method = HttpMethod.GET)
public void getLink(final HTTPRequestContext context) { public void getLink(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
......
...@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level; ...@@ -25,12 +25,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
import org.b3log.solo.model.Page; import org.b3log.solo.model.Page;
...@@ -115,9 +115,9 @@ public class PageConsole { ...@@ -115,9 +115,9 @@ public class PageConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/page/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/page/", method = HttpMethod.PUT)
public void updatePage(final HTTPRequestContext context) { public void updatePage(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -151,9 +151,9 @@ public class PageConsole { ...@@ -151,9 +151,9 @@ public class PageConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/page/*", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/page/*", method = HttpMethod.DELETE)
public void removePage(final HTTPRequestContext context) { public void removePage(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -206,9 +206,9 @@ public class PageConsole { ...@@ -206,9 +206,9 @@ public class PageConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/page/", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/page/", method = HttpMethod.POST)
public void addPage(final HTTPRequestContext context) { public void addPage(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -253,9 +253,9 @@ public class PageConsole { ...@@ -253,9 +253,9 @@ public class PageConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/page/order/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/page/order/", method = HttpMethod.PUT)
public void changeOrder(final HTTPRequestContext context) { public void changeOrder(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -301,9 +301,9 @@ public class PageConsole { ...@@ -301,9 +301,9 @@ public class PageConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/page/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/page/*", method = HttpMethod.GET)
public void getPage(final HTTPRequestContext context) { public void getPage(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -357,9 +357,9 @@ public class PageConsole { ...@@ -357,9 +357,9 @@ public class PageConsole {
* @see Requests#PAGINATION_PATH_PATTERN * @see Requests#PAGINATION_PATH_PATTERN
*/ */
@RequestProcessing(value = "/console/pages/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, @RequestProcessing(value = "/console/pages/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */,
method = HTTPRequestMethod.GET) method = HttpMethod.GET)
public void getPages(final HTTPRequestContext context) { public void getPages(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
......
...@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level; ...@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Plugin; import org.b3log.latke.model.Plugin;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.solo.service.PluginMgmtService; import org.b3log.solo.service.PluginMgmtService;
import org.b3log.solo.service.PluginQueryService; import org.b3log.solo.service.PluginQueryService;
...@@ -87,9 +87,9 @@ public class PluginConsole { ...@@ -87,9 +87,9 @@ public class PluginConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/plugin/status/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/plugin/status/", method = HttpMethod.PUT)
public void setPluginStatus(final HTTPRequestContext context) { public void setPluginStatus(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject requestJSONObject = context.requestJSON(); final JSONObject requestJSONObject = context.requestJSON();
...@@ -131,9 +131,9 @@ public class PluginConsole { ...@@ -131,9 +131,9 @@ public class PluginConsole {
* @see Requests#PAGINATION_PATH_PATTERN * @see Requests#PAGINATION_PATH_PATTERN
*/ */
@RequestProcessing(value = "/console/plugins/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, @RequestProcessing(value = "/console/plugins/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */,
method = HTTPRequestMethod.GET) method = HttpMethod.GET)
public void getPlugins(final HTTPRequestContext context) { public void getPlugins(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -159,8 +159,8 @@ public class PluginConsole { ...@@ -159,8 +159,8 @@ public class PluginConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/plugin/toSetting", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/plugin/toSetting", method = HttpMethod.POST)
public void toSetting(final HTTPRequestContext context) { public void toSetting(final RequestContext context) {
final ConsoleRenderer renderer = new ConsoleRenderer(); final ConsoleRenderer renderer = new ConsoleRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setTemplateName("admin-plugin-setting.ftl"); renderer.setTemplateName("admin-plugin-setting.ftl");
...@@ -177,8 +177,8 @@ public class PluginConsole { ...@@ -177,8 +177,8 @@ public class PluginConsole {
LOGGER.log(Level.ERROR, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
final JSONObject jsonObject = new JSONObject().put(Keys.STATUS_CODE, false); final JSONObject jsonObject = new JSONObject().put(Keys.STATUS_CODE, false);
final JSONRenderer jsonRenderer = new JSONRenderer(); final JsonRenderer JsonRenderer = new JsonRenderer();
jsonRenderer.setJSONObject(jsonObject); JsonRenderer.setJSONObject(jsonObject);
jsonObject.put(Keys.MSG, langPropsService.get("getFailLabel")); jsonObject.put(Keys.MSG, langPropsService.get("getFailLabel"));
} }
} }
...@@ -188,9 +188,9 @@ public class PluginConsole { ...@@ -188,9 +188,9 @@ public class PluginConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/plugin/updateSetting", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/plugin/updateSetting", method = HttpMethod.POST)
public void updateSetting(final HTTPRequestContext context) { public void updateSetting(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject requestJSONObject = context.requestJSON(); final JSONObject requestJSONObject = context.requestJSON();
......
...@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level; ...@@ -24,12 +24,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.model.Sign; import org.b3log.solo.model.Sign;
import org.b3log.solo.model.Skin; import org.b3log.solo.model.Skin;
...@@ -112,9 +112,9 @@ public class PreferenceConsole { ...@@ -112,9 +112,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/reply/notification/template", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/reply/notification/template", method = HttpMethod.GET)
public void getReplyNotificationTemplate(final HTTPRequestContext context) { public void getReplyNotificationTemplate(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -150,9 +150,9 @@ public class PreferenceConsole { ...@@ -150,9 +150,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/reply/notification/template", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/reply/notification/template", method = HttpMethod.PUT)
public void updateReplyNotificationTemplate(final HTTPRequestContext context) { public void updateReplyNotificationTemplate(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -190,9 +190,9 @@ public class PreferenceConsole { ...@@ -190,9 +190,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/signs/", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/signs/", method = HttpMethod.GET)
public void getSigns(final HTTPRequestContext context) { public void getSigns(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -271,9 +271,9 @@ public class PreferenceConsole { ...@@ -271,9 +271,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX, method = HTTPRequestMethod.GET) @RequestProcessing(value = PREFERENCE_URI_PREFIX, method = HttpMethod.GET)
public void getPreference(final HTTPRequestContext context) { public void getPreference(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -350,9 +350,9 @@ public class PreferenceConsole { ...@@ -350,9 +350,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX, method = HTTPRequestMethod.PUT) @RequestProcessing(value = PREFERENCE_URI_PREFIX, method = HttpMethod.PUT)
public void updatePreference(final HTTPRequestContext context) { public void updatePreference(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -400,9 +400,9 @@ public class PreferenceConsole { ...@@ -400,9 +400,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX + "qiniu", method = HTTPRequestMethod.GET) @RequestProcessing(value = PREFERENCE_URI_PREFIX + "qiniu", method = HttpMethod.GET)
public void getQiniuPreference(final HTTPRequestContext context) { public void getQiniuPreference(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -443,9 +443,9 @@ public class PreferenceConsole { ...@@ -443,9 +443,9 @@ public class PreferenceConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = PREFERENCE_URI_PREFIX + "qiniu", method = HTTPRequestMethod.PUT) @RequestProcessing(value = PREFERENCE_URI_PREFIX + "qiniu", method = HttpMethod.PUT)
public void updateQiniu(final HTTPRequestContext context) { public void updateQiniu(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
......
...@@ -23,12 +23,12 @@ import org.b3log.latke.logging.Level; ...@@ -23,12 +23,12 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.Query; import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.annotation.Transactional; import org.b3log.latke.repository.annotation.Transactional;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.TextHTMLRenderer; import org.b3log.latke.servlet.renderer.TextHtmlRenderer;
import org.b3log.solo.mail.MailService; import org.b3log.solo.mail.MailService;
import org.b3log.solo.mail.MailServiceFactory; import org.b3log.solo.mail.MailServiceFactory;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
...@@ -115,9 +115,9 @@ public class RepairConsole { ...@@ -115,9 +115,9 @@ public class RepairConsole {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/fix/restore-signs.do", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/fix/restore-signs.do", method = HttpMethod.GET)
public void restoreSigns(final HTTPRequestContext context) { public void restoreSigns(final RequestContext context) {
final TextHTMLRenderer renderer = new TextHTMLRenderer(); final TextHtmlRenderer renderer = new TextHtmlRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -153,10 +153,10 @@ public class RepairConsole { ...@@ -153,10 +153,10 @@ public class RepairConsole {
* *
* @param context the specified context * @param context the specified context
*/ */
@RequestProcessing(value = "/fix/tag-article-counter-repair.do", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/fix/tag-article-counter-repair.do", method = HttpMethod.GET)
@Transactional @Transactional
public void repairTagArticleCounter(final HTTPRequestContext context) { public void repairTagArticleCounter(final RequestContext context) {
final TextHTMLRenderer renderer = new TextHTMLRenderer(); final TextHtmlRenderer renderer = new TextHtmlRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
......
...@@ -22,12 +22,12 @@ import org.b3log.latke.ioc.Inject; ...@@ -22,12 +22,12 @@ import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
import org.b3log.solo.model.Tag; import org.b3log.solo.model.Tag;
import org.b3log.solo.service.TagMgmtService; import org.b3log.solo.service.TagMgmtService;
...@@ -89,10 +89,10 @@ public class TagConsole { ...@@ -89,10 +89,10 @@ public class TagConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/tags", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/tags", method = HttpMethod.GET)
@Before(adviceClass = ConsoleAuthAdvice.class) @Before(adviceClass = ConsoleAuthAdvice.class)
public void getTags(final HTTPRequestContext context) { public void getTags(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -124,10 +124,10 @@ public class TagConsole { ...@@ -124,10 +124,10 @@ public class TagConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/tag/unused", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/tag/unused", method = HttpMethod.GET)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void getUnusedTags(final HTTPRequestContext context) { public void getUnusedTags(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
...@@ -168,10 +168,10 @@ public class TagConsole { ...@@ -168,10 +168,10 @@ public class TagConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/tag/unused", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/tag/unused", method = HttpMethod.DELETE)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void removeUnusedTags(final HTTPRequestContext context) { public void removeUnusedTags(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
renderer.setJSONObject(jsonObject); renderer.setJSONObject(jsonObject);
......
...@@ -27,12 +27,12 @@ import org.b3log.latke.model.Role; ...@@ -27,12 +27,12 @@ import org.b3log.latke.model.Role;
import org.b3log.latke.model.User; import org.b3log.latke.model.User;
import org.b3log.latke.service.LangPropsService; import org.b3log.latke.service.LangPropsService;
import org.b3log.latke.service.ServiceException; import org.b3log.latke.service.ServiceException;
import org.b3log.latke.servlet.HTTPRequestContext; import org.b3log.latke.servlet.RequestContext;
import org.b3log.latke.servlet.HTTPRequestMethod; import org.b3log.latke.servlet.HttpMethod;
import org.b3log.latke.servlet.annotation.Before; import org.b3log.latke.servlet.annotation.Before;
import org.b3log.latke.servlet.annotation.RequestProcessing; import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor; import org.b3log.latke.servlet.annotation.RequestProcessor;
import org.b3log.latke.servlet.renderer.JSONRenderer; import org.b3log.latke.servlet.renderer.JsonRenderer;
import org.b3log.latke.util.Requests; import org.b3log.latke.util.Requests;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.service.PreferenceQueryService; import org.b3log.solo.service.PreferenceQueryService;
...@@ -114,10 +114,10 @@ public class UserConsole { ...@@ -114,10 +114,10 @@ public class UserConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/user/", method = HTTPRequestMethod.PUT) @RequestProcessing(value = "/console/user/", method = HttpMethod.PUT)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void updateUser(final HTTPRequestContext context) { public void updateUser(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
...@@ -166,9 +166,9 @@ public class UserConsole { ...@@ -166,9 +166,9 @@ public class UserConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/user/", method = HTTPRequestMethod.POST) @RequestProcessing(value = "/console/user/", method = HttpMethod.POST)
public void addUser(final HTTPRequestContext context) { public void addUser(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject(); final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
...@@ -222,10 +222,10 @@ public class UserConsole { ...@@ -222,10 +222,10 @@ public class UserConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/user/*", method = HTTPRequestMethod.DELETE) @RequestProcessing(value = "/console/user/*", method = HttpMethod.DELETE)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void removeUser(final HTTPRequestContext context) { public void removeUser(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
...@@ -273,10 +273,10 @@ public class UserConsole { ...@@ -273,10 +273,10 @@ public class UserConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/users/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/users/*/*/*"/* Requests.PAGINATION_PATH_PATTERN */, method = HttpMethod.GET)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void getUsers(final HTTPRequestContext context) { public void getUsers(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
try { try {
...@@ -324,10 +324,10 @@ public class UserConsole { ...@@ -324,10 +324,10 @@ public class UserConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/user/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/user/*", method = HttpMethod.GET)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void getUser(final HTTPRequestContext context) { public void getUser(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final String requestURI = request.getRequestURI(); final String requestURI = request.getRequestURI();
...@@ -360,10 +360,10 @@ public class UserConsole { ...@@ -360,10 +360,10 @@ public class UserConsole {
* *
* @param context the specified http request context * @param context the specified http request context
*/ */
@RequestProcessing(value = "/console/changeRole/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/console/changeRole/*", method = HttpMethod.GET)
@Before(adviceClass = ConsoleAdminAuthAdvice.class) @Before(adviceClass = ConsoleAdminAuthAdvice.class)
public void changeUserRole(final HTTPRequestContext context) { public void changeUserRole(final RequestContext context) {
final JSONRenderer renderer = new JSONRenderer(); final JsonRenderer renderer = new JsonRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject jsonObject = new JSONObject(); final JSONObject jsonObject = new JSONObject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment