From b9023a7b2693803ae4ad7844bc8afffecded0594 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 9 May 2018 16:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9@Deprecated=E7=9A=84PageReque?= =?UTF-8?q?st=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/ryanc/halo/web/controller/admin/AdminController.java | 2 +- .../ryanc/halo/web/controller/admin/AttachmentController.java | 4 ++-- .../cc/ryanc/halo/web/controller/admin/CommentController.java | 2 +- .../cc/ryanc/halo/web/controller/admin/PageController.java | 2 +- .../cc/ryanc/halo/web/controller/admin/PostController.java | 4 ++-- .../ryanc/halo/web/controller/front/ArchivesController.java | 4 ++-- .../ryanc/halo/web/controller/front/CategoriesController.java | 2 +- .../ryanc/halo/web/controller/front/CommentsController.java | 2 +- .../cc/ryanc/halo/web/controller/front/IndexController.java | 4 ++-- .../cc/ryanc/halo/web/controller/front/OthersController.java | 4 ++-- .../cc/ryanc/halo/web/controller/front/PagesController.java | 2 +- .../cc/ryanc/halo/web/controller/front/TagsController.java | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java index 1b4f344d4..93ff32500 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java @@ -182,7 +182,7 @@ public class AdminController extends BaseController { @RequestParam(value = "page", defaultValue = "0") Integer page, @RequestParam(value = "size", defaultValue = "10") Integer size) { Sort sort = new Sort(Sort.Direction.DESC, "logId"); - Pageable pageable = new PageRequest(page, size, sort); + Pageable pageable = PageRequest.of(page, size, sort); Page logs = logsService.findAllLogs(pageable); model.addAttribute("logs", logs); return "admin/widget/_logs-all"; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java index 6bf51740c..ddd70d731 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java @@ -65,7 +65,7 @@ public class AttachmentController { @RequestParam(value = "page", defaultValue = "0") Integer page, @RequestParam(value = "size", defaultValue = "18") Integer size) { Sort sort = new Sort(Sort.Direction.DESC, "attachId"); - Pageable pageable = new PageRequest(page, size, sort); + Pageable pageable = PageRequest.of(page, size, sort); Page attachments = attachmentService.findAllAttachments(pageable); model.addAttribute("attachments", attachments); @@ -84,7 +84,7 @@ public class AttachmentController { @RequestParam(value = "page", defaultValue = "0") Integer page, @RequestParam(value = "id") String id) { Sort sort = new Sort(Sort.Direction.DESC, "attachId"); - Pageable pageable = new PageRequest(page, 18, sort); + Pageable pageable = PageRequest.of(page, 18, sort); Page attachments = attachmentService.findAllAttachments(pageable); model.addAttribute("attachments", attachments); model.addAttribute("id", id); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java index 2ac399285..c66a9d931 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java @@ -71,7 +71,7 @@ public class CommentController extends BaseController{ @RequestParam(value = "page",defaultValue = "0") Integer page, @RequestParam(value = "size",defaultValue = "10") Integer size){ Sort sort = new Sort(Sort.Direction.DESC,"commentDate"); - Pageable pageable = new PageRequest(page,size,sort); + Pageable pageable = PageRequest.of(page,size,sort); Page comments = commentService.findAllComments(status,pageable); model.addAttribute("comments",comments); model.addAttribute("publicCount",commentService.findAllComments(0,pageable).getTotalElements()); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java index 043444c4b..05279126f 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java @@ -142,7 +142,7 @@ public class PageController { @RequestParam(value = "page", defaultValue = "0") Integer page, @RequestParam(value = "size", defaultValue = "18") Integer size) { Sort sort = new Sort(Sort.Direction.DESC, "galleryId"); - Pageable pageable = new PageRequest(page, size, sort); + Pageable pageable = PageRequest.of(page, size, sort); Page galleries = galleryService.findAllGalleries(pageable); model.addAttribute("galleries", galleries); return "admin/admin_page_gallery"; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index c43200706..74b9a5041 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java @@ -66,7 +66,7 @@ public class PostController extends BaseController{ @RequestParam(value = "page",defaultValue = "0") Integer page, @RequestParam(value = "size",defaultValue = "10") Integer size){ Sort sort = new Sort(Sort.Direction.DESC,"postDate"); - Pageable pageable = new PageRequest(page,size,sort); + Pageable pageable = PageRequest.of(page,size,sort); Page posts = postService.findPostByStatus(status,HaloConst.POST_TYPE_POST,pageable); model.addAttribute("posts",posts); model.addAttribute("publishCount",postService.findPostByStatus(0,HaloConst.POST_TYPE_POST,pageable).getTotalElements()); @@ -93,7 +93,7 @@ public class PostController extends BaseController{ try { //排序规则 Sort sort = new Sort(Sort.Direction.DESC,"postId"); - Pageable pageable = new PageRequest(page,size,sort); + Pageable pageable = PageRequest.of(page,size,sort); model.addAttribute("posts",postService.searchPosts(keyword,pageable)); }catch (Exception e){ log.error("未知错误：{0}",e.getMessage()); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/ArchivesController.java b/src/main/java/cc/ryanc/halo/web/controller/front/ArchivesController.java index 1a903ad9d..c462b164e 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/ArchivesController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/ArchivesController.java @@ -61,7 +61,7 @@ public class ArchivesController extends BaseController { //所有文章数据，分页，material主题适用 Sort sort = new Sort(Sort.Direction.DESC, "postDate"); - Pageable pageable = new PageRequest(page - 1, 5, sort); + Pageable pageable = PageRequest.of(page - 1, 5, sort); Page posts = postService.findPostByStatus(0, HaloConst.POST_TYPE_POST, pageable); model.addAttribute("posts", posts); return this.render("archives"); @@ -109,7 +109,7 @@ public class ArchivesController extends BaseController { model.addAttribute("afterPost", afterPosts.get(afterPosts.size() - 1)); } Sort sort = new Sort(Sort.Direction.DESC,"commentDate"); - Pageable pageable = new PageRequest(0,999,sort); + Pageable pageable = PageRequest.of(0,999,sort); Page comments = commentService.findCommentsByPostAndCommentStatus(post,pageable,2); model.addAttribute("post", post); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/CategoriesController.java b/src/main/java/cc/ryanc/halo/web/controller/front/CategoriesController.java index 895c3bc40..f1e5ff785 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/CategoriesController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/CategoriesController.java @@ -71,7 +71,7 @@ public class CategoriesController extends BaseController { if(!StringUtils.isBlank(HaloConst.OPTIONS.get("index_posts"))){ size = Integer.parseInt(HaloConst.OPTIONS.get("index_posts")); } - Pageable pageable = new PageRequest(page-1,size,sort); + Pageable pageable = PageRequest.of(page-1,size,sort); Page posts = postService.findPostByCategories(category,pageable); model.addAttribute("posts",posts); model.addAttribute("category",category); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/CommentsController.java b/src/main/java/cc/ryanc/halo/web/controller/front/CommentsController.java index ad8af4378..09926a1d5 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/CommentsController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/CommentsController.java @@ -53,7 +53,7 @@ public class CommentsController { public List getComment(@PathVariable Long postId) { Optional post = postService.findByPostId(postId); Sort sort = new Sort(Sort.Direction.DESC, "commentDate"); - Pageable pageable = new PageRequest(0, 10, sort); + Pageable pageable = PageRequest.of(0, 10, sort); List comments = commentService.findCommentsByPostAndCommentStatus(post.get(), pageable, 2).getContent(); if (null == comments) { return null; diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/IndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/IndexController.java index 56334718c..ccef10f56 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/IndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/IndexController.java @@ -66,7 +66,7 @@ public class IndexController extends BaseController { size = Integer.parseInt(HaloConst.OPTIONS.get("index_posts")); } //所有文章数据，分页 - Pageable pageable = new PageRequest(page - 1, size, sort); + Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostByStatus(0, HaloConst.POST_TYPE_POST, pageable); model.addAttribute("posts", posts); return this.render("index"); @@ -90,7 +90,7 @@ public class IndexController extends BaseController { } //文章数据，只获取文章，没有分页 - Pageable pageable = new PageRequest(page - 1, size, sort); + Pageable pageable = PageRequest.of(page - 1, size, sort); List posts = postService.findPostByStatus(0, HaloConst.POST_TYPE_POST, pageable).getContent(); return posts; } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/OthersController.java b/src/main/java/cc/ryanc/halo/web/controller/front/OthersController.java index 40df87c2f..4a03ca476 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/OthersController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/OthersController.java @@ -40,7 +40,7 @@ public class OthersController { } //获取文章列表并根据时间排序 Sort sort = new Sort(Sort.Direction.DESC, "postDate"); - Pageable pageable = new PageRequest(0, Integer.parseInt(rssPosts), sort); + Pageable pageable = PageRequest.of(0, Integer.parseInt(rssPosts), sort); Page postsPage = postService.findPostByStatus(0, HaloConst.POST_TYPE_POST, pageable); List posts = postsPage.getContent(); return postService.buildRss(posts); @@ -56,7 +56,7 @@ public class OthersController { public String siteMap() { //获取文章列表并根据时间排序 Sort sort = new Sort(Sort.Direction.DESC, "postDate"); - Pageable pageable = new PageRequest(0, 999, sort); + Pageable pageable = PageRequest.of(0, 999, sort); Page postsPage = postService.findPostByStatus(0, HaloConst.POST_TYPE_POST, pageable); List posts = postsPage.getContent(); return postService.buildSiteMap(posts); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/PagesController.java b/src/main/java/cc/ryanc/halo/web/controller/front/PagesController.java index 4ab0e5c24..bfc656754 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/PagesController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/PagesController.java @@ -80,7 +80,7 @@ public class PagesController extends BaseController { Post post = postService.findByPostUrl(postUrl, HaloConst.POST_TYPE_PAGE); Sort sort = new Sort(Sort.Direction.DESC,"commentDate"); - Pageable pageable = new PageRequest(0,999,sort); + Pageable pageable = PageRequest.of(0,999,sort); Page comments = commentService.findCommentsByPostAndCommentStatus(post,pageable,2); model.addAttribute("comments",comments); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/TagsController.java b/src/main/java/cc/ryanc/halo/web/controller/front/TagsController.java index 3fafd271c..e1c0d1c60 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/TagsController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/TagsController.java @@ -80,7 +80,7 @@ public class TagsController extends BaseController { if (!StringUtils.isBlank(HaloConst.OPTIONS.get("index_posts"))) { size = Integer.parseInt(HaloConst.OPTIONS.get("index_posts")); } - Pageable pageable = new PageRequest(page - 1, size, sort); + Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostsByTags(tag, pageable); model.addAttribute("posts", posts); model.addAttribute("tag", tag);