Browse Source

修改方法名称,与当前命名保持一致

Evan Zhai 2 years ago
parent
commit
87e103ae98

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/IService.java

@@ -339,7 +339,7 @@ public interface IService<T> {
      * @return {@link Optional} 返回一个Optional对象
      */
     default Optional<T> getOneOpt(Wrapper<T> queryWrapper) {
-        return getNonNullOne(queryWrapper, true);
+        return getOneOpt(queryWrapper, true);
     }
 
     /**
@@ -357,7 +357,7 @@ public interface IService<T> {
      * @param throwEx      有多个 result 是否抛出异常
      * @return {@link Optional} 返回一个Optional对象
      */
-    Optional<T> getNonNullOne(Wrapper<T> queryWrapper, boolean throwEx);
+    Optional<T> getOneOpt(Wrapper<T> queryWrapper, boolean throwEx);
 
     /**
      * 根据 Wrapper,查询一条记录

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java

@@ -211,7 +211,7 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
     }
 
     @Override
-    public Optional<T> getNonNullOne(Wrapper<T> queryWrapper, boolean throwEx) {
+    public Optional<T> getOneOpt(Wrapper<T> queryWrapper, boolean throwEx) {
         if (throwEx) {
             return Optional.ofNullable(baseMapper.selectOne(queryWrapper));
         }

+ 17 - 6
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -37,7 +37,12 @@ import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
@@ -47,7 +52,13 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.AbstractList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * Mybatis Plus H2 Junit Test
@@ -649,7 +660,7 @@ class H2UserTest extends BaseTest {
     void testServiceGetNullById() {
         H2User user = new H2User(1L, "Evan");
         userService.save(user);
-        Optional<H2User> optional = userService.getNonNullById(1L);
+        Optional<H2User> optional = userService.getOptById(1L);
         optional.ifPresent(u -> log(u.toString()));
     }
 
@@ -658,7 +669,7 @@ class H2UserTest extends BaseTest {
     void testServiceGetNonNullOne() {
         H2User user = new H2User(1L, "David");
         userService.save(user);
-        Optional<H2User> optional = userService.getNonNullOne(
+        Optional<H2User> optional = userService.getOneOpt(
             new LambdaQueryWrapper<H2User>().eq(H2User::getName, "David"));
         optional.ifPresent(u -> log(u.toString()));
     }
@@ -672,9 +683,9 @@ class H2UserTest extends BaseTest {
         userService.saveBatch(h2Users);
 //        Optional<H2User> optional = userService.getNonNullOne(
 //            new LambdaQueryWrapper<H2User>().eq(H2User::getName, "test1"), true);
-        Optional<H2User> optional1 = userService.getNonNullOne(
+        Optional<H2User> optional1 = userService.getOneOpt(
             new LambdaQueryWrapper<H2User>().eq(H2User::getName, "test1"), false);
-        Optional<H2User> optional2 = userService.getNonNullOne(
+        Optional<H2User> optional2 = userService.getOneOpt(
             new LambdaQueryWrapper<H2User>().eq(H2User::getName, "test"), false);
 
 //        optional.ifPresent(u -> log(u.toString()));