From c6b70f31449544bf7190dd359110ab5702fe24f7 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Fri, 2 Mar 2018 20:07:19 +0800 Subject: [PATCH 1/3] controller --- .../xiaomo/website/controller/ChangeLogController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java index cd63ad9d..48eaa7d0 100644 --- a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java +++ b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java @@ -12,7 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -78,7 +82,7 @@ public Result findByName(@PathVariable("name") String name) { if (model == null) { return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } - return new Result(model); + return new Result(model); } /** From 80dc1502cab566f8baa65312fb36eda187ab0de1 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Tue, 3 Apr 2018 21:16:20 +0800 Subject: [PATCH 2/3] controller --- freemarker/src/main/resources/config/banner-girl.txt | 2 +- javase/src/main/resources/config/banner-girl.txt | 2 +- multipleSource/src/main/resources/config/banner-girl.txt | 2 +- mybatis/src/main/resources/config/banner-girl.txt | 2 +- thymeleaf/src/main/resources/config/banner-girl.txt | 2 +- website/src/main/resources/config/banner-girl.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freemarker/src/main/resources/config/banner-girl.txt b/freemarker/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/freemarker/src/main/resources/config/banner-girl.txt +++ b/freemarker/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/javase/src/main/resources/config/banner-girl.txt b/javase/src/main/resources/config/banner-girl.txt index 7e149757..934b7d76 100644 --- a/javase/src/main/resources/config/banner-girl.txt +++ b/javase/src/main/resources/config/banner-girl.txt @@ -17,4 +17,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/multipleSource/src/main/resources/config/banner-girl.txt b/multipleSource/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/multipleSource/src/main/resources/config/banner-girl.txt +++ b/multipleSource/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/mybatis/src/main/resources/config/banner-girl.txt b/mybatis/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/mybatis/src/main/resources/config/banner-girl.txt +++ b/mybatis/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/thymeleaf/src/main/resources/config/banner-girl.txt b/thymeleaf/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/thymeleaf/src/main/resources/config/banner-girl.txt +++ b/thymeleaf/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/website/src/main/resources/config/banner-girl.txt b/website/src/main/resources/config/banner-girl.txt index 7e149757..934b7d76 100644 --- a/website/src/main/resources/config/banner-girl.txt +++ b/website/src/main/resources/config/banner-girl.txt @@ -17,4 +17,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file From a6496f8662c198efa7edac5fcb836a679773fbe7 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Mon, 9 Apr 2018 10:39:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?spring=20boot=20=E5=8D=87=E7=BA=A7=E5=88=B0?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/info/xiaomo/core/base/BaseDao.java | 8 ---- .../java/info/xiaomo/javase/QuestionMain.java | 6 +-- .../info/xiaomo/javase/dao/QuestionDao.java | 8 ---- .../service/impl/QuestionServiceImpl.java | 9 ++-- .../service/impl/MongoUserServiceImpl.java | 10 ++++- .../multiplesource/MultipleSourceMain.java | 2 +- pom.xml | 42 +------------------ redis/pom.xml | 1 - .../java/info/xiaomo/website/XiaomoMain.java | 6 +-- .../website/controller/UserController.java | 20 +++++---- .../xiaomo/website/service/UserService.java | 3 +- .../service/impl/AdminUserServiceImpl.java | 35 +++++++++------- .../service/impl/ChangeLogServiceImpl.java | 28 ++++++++----- .../website/service/impl/LinkServiceImpl.java | 28 ++++++++----- .../service/impl/TechnologyServiceImpl.java | 18 ++++++-- .../website/service/impl/UserServiceImpl.java | 14 ++++--- .../service/impl/WorksServiceImpl.java | 17 +++++--- 17 files changed, 125 insertions(+), 130 deletions(-) diff --git a/core/src/main/java/info/xiaomo/core/base/BaseDao.java b/core/src/main/java/info/xiaomo/core/base/BaseDao.java index 190dcf6e..09067f32 100644 --- a/core/src/main/java/info/xiaomo/core/base/BaseDao.java +++ b/core/src/main/java/info/xiaomo/core/base/BaseDao.java @@ -10,14 +10,6 @@ @Repository public interface BaseDao extends JpaRepository { - /** - * 根据id查 - * - * @param id - * @return - */ - T findById(Long id); - /** * 根据名字查 * diff --git a/javase/src/main/java/info/xiaomo/javase/QuestionMain.java b/javase/src/main/java/info/xiaomo/javase/QuestionMain.java index 34f6f103..6704c6c4 100644 --- a/javase/src/main/java/info/xiaomo/javase/QuestionMain.java +++ b/javase/src/main/java/info/xiaomo/javase/QuestionMain.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -43,9 +43,9 @@ @EnableJpaRepositories("info.xiaomo.*.dao") @EnableSwagger2 @RestController -public class QuestionMain extends WebMvcConfigurerAdapter { +public class QuestionMain implements WebMvcConfigurer { - public static void main(String[] args) throws Exception { + public static void main(String[] args) { SpringApplication.run(QuestionMain.class, args); } diff --git a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java index be27b6b8..c66bf5f5 100644 --- a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java +++ b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java @@ -19,12 +19,4 @@ */ @Repository public interface QuestionDao extends JpaRepository { - - /** - * 根据Id查找 - * - * @param id - * @return - */ - QuestionModel findById(Long id); } diff --git a/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java b/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java index 61683b28..e3d09c51 100644 --- a/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java +++ b/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java @@ -6,6 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Optional; + /** * 把今天最好的表现当作明天最新的起点..〜 * いま 最高の表現 として 明日最新の始発..〜 @@ -32,12 +34,13 @@ public QuestionServiceImpl(QuestionDao questionDao) { @Override public QuestionModel findById(Long id) { - return questionDao.findById(id); + Optional optionalModel = questionDao.findById(id); + return optionalModel.orElse(null); } @Override public boolean add(QuestionModel questionModel) { - QuestionModel save = questionDao.save(questionModel); - return save != null; + questionDao.save(questionModel); + return true; } } diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java b/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java index a82c2c55..9b0f0a60 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -38,7 +39,8 @@ public List findAll() { @Override public MongoUser findById(Long id) { - return dao.findOne(id); + Optional optionalUser = dao.findById(id); + return optionalUser.orElse(null); } @Override @@ -53,7 +55,11 @@ public MongoUser add(MongoUser mongoUser) { @Override public void delete(Long id) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return; + } + dao.delete(optional.get()); } @Override diff --git a/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java b/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java index 90bda5b6..fafbf0db 100644 --- a/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java +++ b/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java @@ -3,8 +3,8 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/pom.xml b/pom.xml index 2606c187..82819a27 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 1.10.1 - 1.5.8.RELEASE + 2.0.0.RELEASE 3.5.1 @@ -103,7 +103,6 @@ 2.6.12 3.10-beta2 - 1.1.51 @@ -215,20 +214,6 @@ - - - org.jetbrains.kotlin - kotlin-stdlib-jre8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - @@ -270,31 +255,6 @@ - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - - - 1.8 - - - \ No newline at end of file diff --git a/redis/pom.xml b/redis/pom.xml index 7b14e167..348bf85a 100644 --- a/redis/pom.xml +++ b/redis/pom.xml @@ -20,7 +20,6 @@ org.springframework.boot spring-boot-starter-data-redis - 1.5.8.RELEASE diff --git a/website/src/main/java/info/xiaomo/website/XiaomoMain.java b/website/src/main/java/info/xiaomo/website/XiaomoMain.java index 001566a6..74186fec 100644 --- a/website/src/main/java/info/xiaomo/website/XiaomoMain.java +++ b/website/src/main/java/info/xiaomo/website/XiaomoMain.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -48,9 +48,9 @@ @EnableCaching @EnableSwagger2 @Controller -public class XiaomoMain extends WebMvcConfigurerAdapter { +public class XiaomoMain implements WebMvcConfigurer { - public static void main(String[] args) throws Exception { + public static void main(String[] args) { SpringApplication.run(XiaomoMain.class, args); } diff --git a/website/src/main/java/info/xiaomo/website/controller/UserController.java b/website/src/main/java/info/xiaomo/website/controller/UserController.java index de2c303f..6a678524 100644 --- a/website/src/main/java/info/xiaomo/website/controller/UserController.java +++ b/website/src/main/java/info/xiaomo/website/controller/UserController.java @@ -19,10 +19,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; -import java.text.ParseException; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -61,12 +65,10 @@ public UserController(UserService service) { @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"), }) + @SuppressWarnings("unchecked") public Result findUserById(@PathVariable("id") Long id) { - UserModel userModel = service.findUserById(id); - if (userModel == null) { - return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); - } - return new Result(userModel); + Optional optional = service.findUserById(id); + return optional.map(Result::new).orElseGet(() -> new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage())); } /** @@ -98,7 +100,7 @@ public Result addUser(@RequestBody UserModel user) { @ApiImplicitParam(name = "密码", required = true, dataType = "String", paramType = "path") }) @RequestMapping(value = "register/{email}/{password}", method = RequestMethod.POST) - public Result register(@PathVariable("email") String email, @PathVariable("password") String password) throws Exception { + public Result register(@PathVariable("email") String email, @PathVariable("password") String password) { UserModel userModel = service.findUserByEmail(email); //邮箱被占用 if (userModel != null) { @@ -221,7 +223,7 @@ public Result deleteUserById(@PathVariable("id") Long id) throws UserNotFoundExc @ApiOperation(value = "处理激活", notes = "处理激活", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "validateEmail", method = RequestMethod.POST) public Result validateEmail(@RequestBody UserModel user - ) throws ServiceException, ParseException, UserNotFoundException { + ) throws ServiceException { //数据访问层,通过email获取用户信息 UserModel userModel = service.findUserByEmail(user.getEmail()); if (userModel != null) { diff --git a/website/src/main/java/info/xiaomo/website/service/UserService.java b/website/src/main/java/info/xiaomo/website/service/UserService.java index ab9a2d47..3d3e204d 100644 --- a/website/src/main/java/info/xiaomo/website/service/UserService.java +++ b/website/src/main/java/info/xiaomo/website/service/UserService.java @@ -6,6 +6,7 @@ import org.springframework.data.domain.Page; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -27,7 +28,7 @@ public interface UserService { * @param id id * @return UserModel */ - UserModel findUserById(Long id); + Optional findUserById(Long id); /** * 根据邮件查用户 diff --git a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java index aa7d1a21..67a4d27c 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * │\__╭╭╭╭╭__/│ @@ -52,7 +53,8 @@ public AdminModel findAdminUserByUserName(String userName) { @Override public AdminModel findAdminUserById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -65,44 +67,47 @@ public AdminModel addAdminUser(AdminModel model) { @Override public AdminModel updateAdminUser(AdminModel model) throws UserNotFoundException { - AdminModel userUpdate = dao.findOne(model.getId()); - if (userUpdate == null) { + Optional optionalModel = dao.findById(model.getId()); + if (!optionalModel.isPresent()) { throw new UserNotFoundException(); } + AdminModel adminModel = optionalModel.get(); if (model.getPassword() != null) { - userUpdate.setPassword(model.getPassword()); + adminModel.setPassword(model.getPassword()); } if (model.getUserName() != null) { - userUpdate.setUserName(model.getUserName()); + adminModel.setUserName(model.getUserName()); } - userUpdate.setUpdateTime(new Date()); - return dao.save(userUpdate); + adminModel.setUpdateTime(new Date()); + return dao.save(adminModel); } @Override public Page getAdminUsers(int start, int pageSize) { Sort sort = new Sort(Sort.Direction.DESC, "createTime"); - return dao.findAll(new PageRequest(start - 1, pageSize, sort)); + return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } @Override public AdminModel deleteAdminUserById(Long id) throws UserNotFoundException { - AdminModel adminModel = dao.findOne(id); - if (adminModel == null) { + Optional optionalModel = dao.findById(id); + if (!optionalModel.isPresent()) { throw new UserNotFoundException(); } - dao.delete(adminModel.getId()); + AdminModel adminModel = optionalModel.get(); + dao.delete(adminModel); return adminModel; } @Override public AdminModel forbidAdminUserById(Long id) throws UserNotFoundException { - AdminModel model = dao.findOne(id); - if (model == null) { + Optional optionalModel = dao.findById(id); + if (!optionalModel.isPresent()) { throw new UserNotFoundException(); } - model.setStatus(2); - return dao.save(model); + AdminModel adminModel = optionalModel.get(); + adminModel.setStatus(2); + return dao.save(adminModel); } @Override diff --git a/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java index c61892b3..62d5648b 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -37,7 +38,8 @@ public ChangeLogServiceImpl(ChangeLogDao dao) { @Override public ChangeLogModel findById(Long id) { - return dao.findOne(id); + Optional changeLogModel = dao.findById(id); + return changeLogModel.orElse(null); } @Override @@ -48,7 +50,7 @@ public ChangeLogModel findByName(String name) { @Override public Page findAll(int start, int pageSize) { Sort sort = new Sort(Sort.Direction.DESC, "createTime"); - return dao.findAll(new PageRequest(start - 1, pageSize, sort)); + return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } @Override @@ -65,20 +67,26 @@ public ChangeLogModel add(ChangeLogModel model) { @Override public ChangeLogModel update(ChangeLogModel model) { - ChangeLogModel updateModel = dao.findOne(model.getId()); + Optional optionalModel = dao.findById(model.getId()); + if (!optionalModel.isPresent()) { + return null; + } + ChangeLogModel changeLogModel = optionalModel.get(); if (model.getName() != null) { - updateModel.setName(model.getName()); + changeLogModel.setName(model.getName()); } - updateModel.setUpdateTime(new Date()); - return dao.save(updateModel); + changeLogModel.setUpdateTime(new Date()); + return dao.save(changeLogModel); } @Override public ChangeLogModel delete(Long id) { - ChangeLogModel model = dao.findOne(id); - if (model != null) { - dao.delete(id); + Optional optionalLogModel = dao.findById(id); + if (!optionalLogModel.isPresent()) { + return null; } - return model; + ChangeLogModel changeLogModel = optionalLogModel.get(); + dao.delete(changeLogModel); + return changeLogModel; } } diff --git a/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java index 8e5fec93..cf04ef9a 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -37,7 +38,8 @@ public LinkServiceImpl(LinkDao dao) { @Override public LinkModel findById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -48,7 +50,7 @@ public LinkModel findByName(String name) { @Override public Page findAll(int start, int pageSize) { Sort sort = new Sort(Sort.Direction.DESC, "order"); - return dao.findAll(new PageRequest(start - 1, pageSize, sort)); + return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } @Override @@ -65,23 +67,29 @@ public LinkModel add(LinkModel model) { @Override public LinkModel update(LinkModel model) { - LinkModel updateModel = dao.findOne(model.getId()); + Optional optional = dao.findById(model.getId()); + if (!optional.isPresent()) { + return null; + } + LinkModel linkModel = optional.get(); if (model.getName() != null) { - updateModel.setName(model.getName()); + linkModel.setName(model.getName()); } if (model.getUrl() != null) { - updateModel.setUrl(model.getUrl()); + linkModel.setUrl(model.getUrl()); } model.setUpdateTime(new Date()); - return dao.save(updateModel); + return dao.save(linkModel); } @Override public LinkModel delete(Long id) { - LinkModel model = dao.findOne(id); - if (model != null) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return null; } - return model; + LinkModel linkModel = optional.get(); + dao.delete(linkModel); + return linkModel; } } diff --git a/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java index 4831368c..debfe08c 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -42,12 +43,13 @@ public List findAll() { @Override public Page findAll(int start, int pageSize) { - return dao.findAll(new PageRequest(start - 1, pageSize)); + return dao.findAll(PageRequest.of(start - 1, pageSize)); } @Override public TechnologyModel findById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -57,7 +59,11 @@ public TechnologyModel findByName(String name) { @Override public TechnologyModel update(TechnologyModel model) { - TechnologyModel result = dao.findOne(model.getId()); + Optional optional = dao.findById(model.getId()); + if (!optional.isPresent()) { + return null; + } + TechnologyModel result = optional.get(); if ("".equals(model.getUrl()) && model.getUrl() != null) { result.setUrl(model.getUrl()); } @@ -84,6 +90,10 @@ public TechnologyModel add(TechnologyModel model) { @Override public void del(Long id) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return; + } + dao.delete(optional.get()); } } diff --git a/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java index c4de2d3f..4265b711 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -38,8 +39,8 @@ public UserServiceImpl(UserDao dao) { } @Override - public UserModel findUserById(Long id) { - return dao.findOne(id); + public Optional findUserById(Long id) { + return dao.findById(id); } @Override @@ -86,7 +87,7 @@ public UserModel updateUser(UserModel model) throws UserNotFoundException { @Override public Page findAll(int start, int pageSize) { Sort sort = new Sort(Sort.Direction.DESC, "createTime"); - return dao.findAll(new PageRequest(start - 1, pageSize, sort)); + return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } @Override @@ -96,11 +97,12 @@ public List findAll() { @Override public UserModel deleteUserById(Long id) throws UserNotFoundException { - UserModel userModel = dao.findOne(id); - if (userModel == null) { + Optional modelOptional = dao.findById(id); + if (!modelOptional.isPresent()) { throw new UserNotFoundException(); } - dao.delete(userModel.getId()); + UserModel userModel = modelOptional.get(); + dao.delete(userModel); return userModel; } diff --git a/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java index 927d9910..6427b09e 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点..〜 @@ -42,12 +43,13 @@ public List findAll() { @Override public Page findAll(int start, int pageSize) { - return dao.findAll(new PageRequest(start - 1, pageSize)); + return dao.findAll(PageRequest.of(start - 1, pageSize)); } @Override public WorksModel findById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -57,10 +59,11 @@ public WorksModel findByName(String name) { @Override public WorksModel update(WorksModel model) { - WorksModel result = dao.findOne(model.getId()); - if (result == null) { + Optional optional = dao.findById(model.getId()); + if (!optional.isPresent()) { return null; } + WorksModel result = optional.get(); if ("".equals(model.getCompleteTime()) && model.getCompleteTime() != null) { result.setCompleteTime(model.getCompleteTime()); } @@ -89,6 +92,10 @@ public WorksModel add(WorksModel model) { @Override public void del(Long id) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return; + } + dao.delete(optional.get()); } }

AltStyle によって変換されたページ (->オリジナル) /